Merge branch 'devel' into devel

installer/roles/kubernetes/defaults/main.yml

@@ -9,10 +9,10 @@ admin_password: ''
 kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config"
 
 kubernetes_task_version: "{{ tower_package_version | default(dockerhub_version) }}"
-kubernetes_task_image: "{{ tower_package_name | default('ansible/awx_task') }}"
-
 kubernetes_web_version: "{{ tower_package_version | default(dockerhub_version) }}"
-kubernetes_web_image: "{{ tower_package_name | default('ansible/awx_web') }}"
+kubernetes_awx_image: "{{ tower_package_name | default('ansible/awx') }}"
+kubernetes_web_image: "{{ kubernetes_awx_image }}"
+kubernetes_task_image: "{{ kubernetes_awx_image }}"
 
 awx_psp_create: false
 awx_psp_name: 'awx'

installer/roles/kubernetes/tasks/main.yml

@@ -190,15 +190,10 @@
 
 - name: Set image names if using custom registry
   block:
-    - name: Set task image name
+    - name: Set awx image name
       set_fact:
-        kubernetes_task_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ task_image }}"
-      when: kubernetes_task_image is not defined
-
-    - name: Set web image name
-      set_fact:
-        kubernetes_web_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ web_image }}"
-      when: kubernetes_web_image is not defined
+        kubernetes_awx_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ awx_image }}"
+      when: kubernetes_awx_image is not defined
   when: docker_registry is defined
 
 - name: Determine Deployment api version
@@ -292,7 +287,5 @@
 
 - name: Scale up deployment
   shell: |
-    {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
-      scale {{ deployment_object }} {{ kubernetes_deployment_name }} --replicas=0
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
       scale {{ deployment_object }} {{ kubernetes_deployment_name }} --replicas={{ replicas | default(kubernetes_deployment_replica_size) }}

installer/roles/kubernetes/tasks/openshift_auth.yml

@@ -1,12 +1,4 @@
 ---
-- name: Determine version of oc
-  shell: oc version | sed -n 's/oc v//p'
-  register: oc_version
-
-- name: Use correct cli option for kubeconfig
-  set_fact:
-    oc_kubeconfig_option: "{{ '--kubeconfig' if oc_version.stdout is version('3.11', '>=') else '--config' }}"
-
 - include_vars: openshift.yml
 
 - name: Set kubernetes_namespace

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

@@ -35,7 +35,7 @@ data:
 
     unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
 
-    supervisord -c /supervisor_task.conf
+    supervisord -c /etc/supervisord_task.conf
 
   launch-awx-web: |
     #!/usr/bin/env bash
@@ -54,5 +54,5 @@ data:
 
     unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
 
-    supervisord -c /supervisor.conf
+    supervisord -c /etc/supervisord.conf
 

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

@@ -8,6 +8,9 @@ data:
     [supervisord]
     nodaemon = True
     umask = 022
+    logfile = /dev/stdout
+    logfile_maxbytes = 0
+    pidfile = /var/run/supervisor/supervisor.web.pid
 
     [program:nginx]
     command = nginx -g "daemon off;"
@@ -93,6 +96,9 @@ data:
     [supervisord]
     nodaemon = True
     umask = 022
+    logfile = /dev/stdout
+    logfile_maxbytes = 0
+    pidfile = /var/run/supervisor/supervisor.pid
 
     [program:dispatcher]
     command = awx-manage run_dispatcher
@@ -133,10 +139,10 @@ data:
     priority=0
 
     [unix_http_server]
-    file=/tmp/supervisor.sock
+    file=/var/run/supervisor/supervisor.sock
 
     [supervisorctl]
-    serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
+    serverurl=unix:///var/run/supervisor/supervisor.sock ; use a unix:// URL  for a unix socket
 
     [rpcinterface:supervisor]
     supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

installer/roles/kubernetes/vars/openshift.yml

@@ -1,3 +1,3 @@
 ---
 openshift_oc_config_file: "{{ kubernetes_base_path }}/.kube/config"
-openshift_oc_bin: "oc {{ oc_kubeconfig_option }}={{ openshift_oc_config_file }}"
+openshift_oc_bin: "oc --kubeconfig={{ openshift_oc_config_file }}"