From afb267cee9474a1d45ce9dbf3bc99706d4640942 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 8 Aug 2017 15:18:07 -0400 Subject: [PATCH] update awx-manage command to new name --- Makefile | 4 ++-- installer/openshift/launch_awx_task.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 59d306b622..a4d2bbe680 100644 --- a/Makefile +++ b/Makefile @@ -208,10 +208,10 @@ init: if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - $(MANAGEMENT_COMMAND) register_instance --hostname=$(COMPOSE_HOST); \ + $(MANAGEMENT_COMMAND) provision_instance --hostname=$(COMPOSE_HOST); \ $(MANAGEMENT_COMMAND) register_queue --queuename=tower --hostnames=$(COMPOSE_HOST);\ if [ "$(EXTRA_GROUP_QUEUES)" == "thepentagon" ]; then \ - $(MANAGEMENT_COMMAND) register_instance --hostname=isolated; \ + $(MANAGEMENT_COMMAND) provision_instance --hostname=isolated; \ $(MANAGEMENT_COMMAND) register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \ $(MANAGEMENT_COMMAND) generate_isolated_key | ssh -o "StrictHostKeyChecking no" root@isolated 'cat > /root/.ssh/authorized_keys'; \ elif [ "$(EXTRA_GROUP_QUEUES)" != "" ]; then \ diff --git a/installer/openshift/launch_awx_task.sh b/installer/openshift/launch_awx_task.sh index c0a5871e77..bc3dd24ff5 100755 --- a/installer/openshift/launch_awx_task.sh +++ b/installer/openshift/launch_awx_task.sh @@ -8,6 +8,6 @@ ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c loca awx-manage migrate --noinput --fake-initial echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'root@localhost', 'password')" | awx-manage shell awx-manage create_preload_data -awx-manage register_instance --hostname=$(hostname) +awx-manage provision_instance --hostname=$(hostname) awx-manage register_queue --queuename=tower --hostnames=$(hostname) supervisord -c /supervisor_task.conf