diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml index f55b326b..56e9930c 100644 --- a/molecule/test-local/converge.yml +++ b/molecule/test-local/converge.yml @@ -66,7 +66,7 @@ kind: Namespace api_version: v1 - - name: Create the tower.ansible.com/Tower Resource + - name: Create the Tower Custom Resource k8s: state: present namespace: '{{ custom_resource.metadata.namespace }}' diff --git a/molecule/test-minikube/converge.yml b/molecule/test-minikube/converge.yml index fd1ce06d..fe9c38b7 100644 --- a/molecule/test-minikube/converge.yml +++ b/molecule/test-minikube/converge.yml @@ -73,7 +73,7 @@ kind: Namespace api_version: v1 - - name: Create the tower.ansible.com Tower Resource + - name: Create the Tower Custom Resource k8s: state: present namespace: '{{ custom_resource.metadata.namespace }}' diff --git a/roles/tower/templates/launch_awx.yaml.j2 b/roles/tower/templates/launch_awx.yaml.j2 index e9e0409e..07d1e7d0 100644 --- a/roles/tower/templates/launch_awx.yaml.j2 +++ b/roles/tower/templates/launch_awx.yaml.j2 @@ -20,7 +20,6 @@ data: ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$DATABASE_HOST port=$DATABASE_PORT" all ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "path=/var/run/redis/redis.sock" all - if [ -z "$AWX_SKIP_MIGRATIONS" ]; then awx-manage migrate --noinput fi