Generalize variable names in installer

secret_key

installer/roles/kubernetes/tasks/kubernetes.yml

@@ -2,15 +2,15 @@
   shell: "kubectl config set-context {{ kubernetes_context }}"
 
 - name: Get Namespace Detail
-  shell: "kubectl get namespace {{ awx_kubernetes_namespace }}"
+  shell: "kubectl get namespace {{ kubernetes_namespace }}"
   register: namespace_details
   ignore_errors: yes
 
 - name: Create AWX Kubernetes Project
-  shell: "kubectl create namespace {{ awx_kubernetes_namespace }}"
+  shell: "kubectl create namespace {{ kubernetes_namespace }}"
   when: namespace_details.rc != 0
 
 - name: Set postgresql service name
   set_fact:
-    postgresql_service_name: "{{ awx_kubernetes_namespace }}-postgresql"
+    postgresql_service_name: "{{ kubernetes_namespace }}-postgresql"
   when: "pg_hostname is not defined or pg_hostname == ''"

installer/roles/kubernetes/tasks/main.yml

@@ -5,7 +5,7 @@
 
 - name: Set kubernetes base path
   set_fact:
-    kubernetes_base_path: "{{ awx_local_base_config_path|default('/tmp') }}/awx-config"
+    kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config"
 
 - include_tasks: openshift.yml
   when: openshift_host is defined
@@ -18,7 +18,7 @@
     kubectl_or_oc: "{{ openshift_oc_bin if openshift_oc_bin is defined else 'kubectl' }}"
 
 - name: Get Postgres Service Detail
-  shell: "{{ kubectl_or_oc }} describe svc {{ postgresql_service_name }} -n {{ awx_kubernetes_namespace }}"
+  shell: "{{ kubectl_or_oc }} describe svc {{ postgresql_service_name }} -n {{ kubernetes_namespace }}"
   register: postgres_svc_details
   ignore_errors: yes
   when: "pg_hostname is not defined or pg_hostname == ''"
@@ -31,24 +31,24 @@
 - name: Set image names
   block:
     - name: Enable image stream lookups for awx images
-      shell: "{{ openshift_oc_bin }} set image-lookup --all -n {{ awx_kubernetes_namespace }}"
+      shell: "{{ openshift_oc_bin }} set image-lookup --all -n {{ kubernetes_namespace }}"
       when: openshift_host is defined
 
     - name: Set full web image path
       set_fact:
-        awx_web_kubernetes_image: "{{ awx_web_image }}:{{ awx_version }}"
-      when: awx_web_kubernetes_image is not defined
+        web_kubernetes_image: "{{ web_image }}:{{ version }}"
+      when: web_kubernetes_image is not defined
 
     - name: Set full task image path
       set_fact:
-        awx_task_kubernetes_image: "{{ awx_task_image }}:{{ awx_version }}"
-      when: awx_task_kubernetes_image is not defined
+        task_kubernetes_image: "{{ task_image }}:{{ version }}"
+      when: task_kubernetes_image is not defined
   when: dockerhub_base is not defined
 
 - name: Set DockerHub Image Paths
   set_fact:
-    awx_web_kubernetes_image: "{{ dockerhub_base }}/awx_web:{{ dockerhub_version }}"
-    awx_task_kubernetes_image: "{{ dockerhub_base }}/awx_task:{{ dockerhub_version }}"
+    web_kubernetes_image: "{{ dockerhub_base }}/awx_web:{{ dockerhub_version }}"
+    task_kubernetes_image: "{{ dockerhub_base }}/awx_task:{{ dockerhub_version }}"
   when: dockerhub_base is defined
 
 - name: Deploy PostgreSQL (OpenShift)
@@ -69,7 +69,7 @@
           -e POSTGRESQL_PASSWORD={{ pg_password }} \
           -e POSTGRESQL_DATABASE={{ pg_database }} \
           -e POSTGRESQL_VERSION=9.5 \
-          -n {{ awx_kubernetes_namespace }}
+          -n {{ kubernetes_namespace }}
       register: openshift_pg_activate
   when:
     - pg_hostname is not defined or pg_hostname == ''
@@ -78,7 +78,7 @@
 
 - name: Deploy and Activate Postgres (Kubernetes)
   shell: |
-    helm install --name awx --namespace {{ awx_kubernetes_namespace }} \
+    helm install --name awx --namespace {{ kubernetes_namespace }} \
       --set postgresUser={{ pg_username }} \
       --set postgresPassword={{ pg_password }} \
       --set postgresDatabase={{ pg_database }} \
@@ -92,7 +92,7 @@
 
 - name: Set postgresql hostname to helm package service
   set_fact:
-    pg_hostname: awx-postgresql
+    pg_hostname: "{{ kubernetes_deployment_name }}-postgresql"
   when:
     - pg_hostname is not defined or pg_hostname == ''
     - kubernetes_context is defined
@@ -107,7 +107,6 @@
     path: "{{ kubernetes_base_path }}"
     state: directory
 
-
 - name: Template Kubernetes AWX Config
   template:
     src: configmap.yml.j2

installer/roles/kubernetes/tasks/openshift.yml

@@ -3,7 +3,7 @@
 
 - name: Set kubernetes_namespace
   set_fact:
-    kubernetes_namespace: "{{ awx_openshift_project }}"
+    kubernetes_namespace: "{{ openshift_project }}"
 
 - name: Ensure workspace directories exist
   file:
@@ -34,18 +34,18 @@
   no_log: true
 
 - name: Get Project Detail
-  shell: "{{ openshift_oc_bin }} get project {{ awx_openshift_project }}"
+  shell: "{{ openshift_oc_bin }} get project {{ openshift_project }}"
   register: project_details
   ignore_errors: yes
 
 - name: Create AWX Openshift Project
-  shell: "{{ openshift_oc_bin }} new-project {{ awx_openshift_project }}"
+  shell: "{{ openshift_oc_bin }} new-project {{ openshift_project }}"
   when: project_details.rc != 0
 
 - name: Ensure PostgreSQL PVC is available
   block:
     - name: Check PVC status
-      command: "{{ openshift_oc_bin }} get pvc {{ openshift_pg_pvc_name }} -n {{ awx_openshift_project }} -o=jsonpath='{.status.phase}'"
+      command: "{{ openshift_oc_bin }} get pvc {{ openshift_pg_pvc_name }} -n {{ openshift_project }} -o=jsonpath='{.status.phase}'"
       register: pg_pvc_status
       ignore_errors: yes
 
@@ -53,7 +53,7 @@
       assert:
         that:
           - pg_pvc_status.stdout == "Bound"
-        msg: "Ensure a PVC named '{{ openshift_pg_pvc_name }}' is created and bound in the '{{ awx_openshift_project }}' namespace."
+        msg: "Ensure a PVC named '{{ openshift_pg_pvc_name }}' is created and bound in the '{{ openshift_project }}' namespace."
   when:
     - pg_hostname is not defined or pg_hostname == ''
     - openshift_pg_emptydir is defined and (openshift_pg_emptydir | bool) != true