Merge pull request #5227 from shanemcd/more-downstream-k8s-fallout-sorry-folks

More downstream k8s fallout, sorry folks

installer/roles/kubernetes/defaults/main.yml

@@ -55,3 +55,4 @@ custom_venvs_python: "python2"
 ca_trust_bundle: "/etc/pki/tls/certs/ca-bundle.crt"
 rabbitmq_use_ssl: False
 
+container_groups_image: "ansible/ansible-runner"

installer/roles/kubernetes/tasks/main.yml

@@ -113,14 +113,15 @@
     seconds: "{{ postgress_activate_wait }}"
   when: openshift_pg_activate.changed or kubernetes_pg_activate.changed
 
-- name: Check if Postgres 9.6 is being used
+- name: Check postgres version and upgrade Postgres if necessary
+  block:
+    - name: Check if Postgres 9.6 is being used
       shell: |
         POD=$({{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
           get pods -l=name=postgresql --field-selector status.phase=Running -o jsonpath="{.items[0].metadata.name}")
-    {{ kubectl_or_oc }} exec -ti $POD -n {{ kubernetes_namespace }} -- bash -c "psql -U {{ pg_username }} -tAc 'select version()'"
+        oc exec $POD -n {{ kubernetes_namespace }} -- bash -c "psql -tAc 'select version()'"
       register: pg_version
-
+    - name: Upgrade postgres if necessary
-- name: Upgrade Postgres if necessary
       block:
         - name: Set new pg image
           shell: |
@@ -165,6 +166,8 @@
           pause:
             seconds: "{{ postgress_activate_wait }}"
       when: "pg_version is success and '9.6' in pg_version.stdout"
+  when:
+    - pg_hostname is not defined or pg_hostname == ''
 
 - name: Set image names if using custom registry
   block:

installer/roles/kubernetes/templates/configmap.yml.j2

@@ -202,3 +202,5 @@ data:
     }
 
     USE_X_FORWARDED_PORT = True
+
+    AWX_CONTAINER_GROUP_DEFAULT_IMAGE = "{{ container_groups_image }}"