Merge pull request #1131 from IBM/refactor

Refactor and CP4D 5.4.0 support

Author: fketelaars

ansible-vault.cfg

@@ -3,12 +3,12 @@ forks=50
 timeout=30
 host_key_checking=False
 callbacks_enabled=profile_tasks
-callback_whitelist=profile_tasks
 interpreter_python=auto_legacy_silent
 ssh_args='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
 
 # Use the YAML callback plugin.
-stdout_callback = yaml
+stdout_callback = default
+callback_result_format = yaml
 
 # Ansible log path
 log_path=/tmp/ansible.log

ansible.cfg

@@ -13,13 +13,12 @@
     generator_validation_error_message: |
       Validation errors:
 
-- name: filter the vault variables from ansible variables
+- name: Filter the vault variables from ansible variables
   set_fact:
-    vault_var: "{{ vault_var|default({}) | combine({var_item.key : var_item.value}) }}"
-  loop: "{{ vars | dict2items}}"
+    vault_var: "{{ vault_var | default({}) | combine({var_item: lookup('vars', var_item)}) }}"
+  loop: "{{ lookup('varnames', '^_').split(',') | select() | list }}"
   loop_control:
     loop_var: var_item
-  when: var_item.key | regex_search ('^(_*)')    # the variable name is start with _
 
 - name: Lint and pre-process all object types
   include_tasks: pre-process-object-type.yaml

automation-roles/10-validation/lint-config/tasks/main.yaml

@@ -1,39 +1,39 @@
 ---
 - name: Run generators for IBM Cloud
-  include_tasks: "{{_generator_dir}}/{{ GENERATOR_NAME }}/main.yaml"
+  include_tasks: "{{ _generator_dir }}/{{ GENERATOR_NAME }}/main.yaml"
   vars:
     generator:
       name: "{{ GENERATOR_NAME }}"
       path: "{{ _generator_dir }}/{{ GENERATOR_NAME }}"
       attributes: "{{ OBJECT_ELEMENT_ATTRIBUTES }}"
       config: "{{ all_config }}"
-    PATH_TO_TERRAFORM_WORK_DIR: "{{status_dir}}/terraform"
+    PATH_TO_TERRAFORM_WORK_DIR: "{{ status_dir }}/terraform"
   when: cloud_platform == 'ibm-cloud'
 
 - name: Run generators for vSphere
-  include_tasks: "{{_generator_dir}}/{{ GENERATOR_NAME }}/main.yaml"
+  include_tasks: "{{ _generator_dir }}/{{ GENERATOR_NAME }}/main.yaml"
   vars:
     generator:
       name: "{{ GENERATOR_NAME }}"
       path: "{{ _generator_dir }}/{{ GENERATOR_NAME }}"
       attributes: "{{ OBJECT_ELEMENT_ATTRIBUTES }}"
       config: "{{ all_config }}"
-    PATH_TO_OUTPUT_DIR: "{{status_dir}}/vsphere-ipi"
+    PATH_TO_OUTPUT_DIR: "{{ status_dir }}/vsphere-ipi"
   when: cloud_platform == 'vsphere'
 
 - name: Run generators for Microsoft Azure
-  include_tasks: "{{_generator_dir}}/{{ GENERATOR_NAME }}/main.yaml"
+  include_tasks: "{{ _generator_dir }}/{{ GENERATOR_NAME }}/main.yaml"
   vars:
     generator:
       name: "{{ GENERATOR_NAME }}"
       path: "{{ _generator_dir }}/{{ GENERATOR_NAME }}"
       attributes: "{{ OBJECT_ELEMENT_ATTRIBUTES }}"
       config: "{{ all_config }}"
-    PATH_TO_OUTPUT_DIR: "{{status_dir}}/azure"
+    PATH_TO_OUTPUT_DIR: "{{ status_dir }}/azure"
   when: cloud_platform == 'azure'
 
 - name: Run generators for AWS
-  include_tasks: "{{_generator_dir}}/{{ GENERATOR_NAME }}/main.yaml"
+  include_tasks: "{{ _generator_dir }}/{{ GENERATOR_NAME }}/main.yaml"
   loop: "{{ all_config.openshift | default([]) }}"
   loop_control:
     loop_var: _current_openshift_cluster
@@ -43,5 +43,5 @@
       path: "{{ _generator_dir }}/{{ GENERATOR_NAME }}"
       attributes: "{{ OBJECT_ELEMENT_ATTRIBUTES }}"
       config: "{{ all_config }}"
-    PATH_TO_OUTPUT_DIR: "{{status_dir}}/aws-ipi"
+    PATH_TO_OUTPUT_DIR: "{{ status_dir }}/aws-ipi"
   when: cloud_platform == 'aws'

automation-roles/20-prepare/generators/tasks/run-generator.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure the status log folder exists
   file:
-    path: "{{status_dir}}/log"
+    path: "{{ status_dir }}/log"
     state: directory
 
 - name: Delete file servers associated with OpenShift cluster

automation-roles/30-provision-infra/destroy-aws/tasks/destroy-aws-ipi.yml

@@ -24,7 +24,7 @@
 
 - name: Ensure the status log folder exists
   file:
-    path: "{{status_dir}}/log"
+    path: "{{ status_dir }}/log"
     state: directory
 
 - name: Delete ROSA cluster, logs can be found in {{ status_dir }}/log/{{ _current_openshift_cluster.name }}-delete-cluster.log

automation-roles/30-provision-infra/destroy-aws/tasks/destroy-aws-rosa.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure the status log folder exists
   file:
-    path: "{{status_dir}}/log"
+    path: "{{ status_dir }}/log"
     state: directory
 
 - name: Download OpenShift installer for version {{ current_openshift_cluster.ocp_version }}

automation-roles/30-provision-infra/destroy-azure/tasks/destroy-azure-ipi.yml

@@ -17,12 +17,12 @@
     vars:
       path_to_config_dir: "{{ config_dir }}"
       path_to_generators_dir: "{{ generators_dir | default([(playbook_dir | dirname),'/automation-generators'] | join) }}"
-      path_to_terraform_work_dir: "{{status_dir}}/terraform"
+      path_to_terraform_work_dir: "{{ status_dir }}/terraform"
 
-  - name: "Copy variables to Terraform directory {{status_dir}}/terraform"
+  - name: "Copy variables to Terraform directory {{ status_dir }}/terraform"
     template:
       src: 'variables.auto.tfvars.j2'
-      dest: '{{status_dir}}/terraform/variables.auto.tfvars'
+      dest: '{{ status_dir }}/terraform/variables.auto.tfvars'
 
   - name: Retrieve Terraform tfstate from the vault
     include_role: 
@@ -55,18 +55,18 @@
       content: "{{ secret_value }}"
       dest: "{{ status_dir }}/terraform/terraform.tfstate"
 
-  - name: "Run terraform init in Terraform directory {{status_dir}}/terraform"
+  - name: "Run terraform init in Terraform directory {{ status_dir }}/terraform"
     shell: 
-      chdir: '{{status_dir}}/terraform'
+      chdir: '{{ status_dir }}/terraform'
       cmd: 'terraform init'
 
-  - name: "Run terraform plan in Terraform directory {{status_dir}}/terraform, check {{status_dir}}/terraform/plan.log"
+  - name: "Run terraform plan in Terraform directory {{ status_dir }}/terraform, check {{ status_dir }}/terraform/plan.log"
     shell: |
       set -o pipefail
       terraform plan -destroy -no-color -detailed-exitcode 2>&1 \
-        | tee {{status_dir}}/terraform/plan.log
+        | tee {{ status_dir }}/terraform/plan.log
     args:
-      chdir: "{{status_dir}}/terraform"
+      chdir: "{{ status_dir }}/terraform"
     register: _terraform_plan_result
     failed_when: "_terraform_plan_result.rc == 1"
 
@@ -103,13 +103,13 @@
       - _number_to_destroy != '0'
       - _confirm_destroy | bool != True
 
-  - name: "Run terraform destroy in Terraform directory {{status_dir}}/terraform, check {{status_dir}}/terraform/destroy.log"
+  - name: "Run terraform destroy in Terraform directory {{ status_dir }}/terraform, check {{ status_dir }}/terraform/destroy.log"
     shell: |
       set -o pipefail
       terraform destroy -auto-approve -no-color 2>&1 \
-        | tee {{status_dir}}/terraform/destroy.log
+        | tee {{ status_dir }}/terraform/destroy.log
     args:
-      chdir: "{{status_dir}}/terraform"
+      chdir: "{{ status_dir }}/terraform"
     environment:
       TF_LOG: "info"
       TF_LOG_PATH: "{{ status_dir }}/terraform/tf_destroy.log"

automation-roles/30-provision-infra/destroy-terraform/tasks/main.yml

@@ -21,7 +21,7 @@
 
 - name: Ensure the status log folder exists
   file:
-    path: "{{status_dir}}/log"
+    path: "{{ status_dir }}/log"
     state: directory
 
 - name: Create ROSA cluster, logs can be found in {{ status_dir }}/log/{{ _current_openshift_cluster.name }}-create-cluster.log

automation-roles/30-provision-infra/provision-aws/tasks/provision-rosa.yml

@@ -52,12 +52,12 @@
   - name: Add API address and oauth-openshift to /etc/hosts
     shell:
       grep -q "^{{ _current_openshift_cluster.api_vip }}" /etc/hosts || \
-        echo "{{ _current_openshift_cluster.api_vip }} api.{{ _current_openshift_cluster.name }}.{{_current_openshift_cluster.domain_name }}" >> /etc/hosts
+        echo "{{ _current_openshift_cluster.api_vip }} api.{{ _current_openshift_cluster.name }}.{{ _current_openshift_cluster.domain_name }}" >> /etc/hosts
 
   - name: Add ingress address and oauth-openshift to /etc/hosts
     shell:
       grep -q "^{{ _current_openshift_cluster.ingress_vip }}" /etc/hosts || \
-        echo "{{ _current_openshift_cluster.ingress_vip }} oauth-openshift.apps.{{ _current_openshift_cluster.name }}.{{_current_openshift_cluster.domain_name }}" >> /etc/hosts
+        echo "{{ _current_openshift_cluster.ingress_vip }} oauth-openshift.apps.{{ _current_openshift_cluster.name }}.{{ _current_openshift_cluster.domain_name }}" >> /etc/hosts
 
   - name: Download OpenShift installer for version {{ _current_openshift_cluster.ocp_version }}
     include_role: