Merge "Remove technical debt when testing config-download"

roles/overcloud-deploy/README.md

@@ -36,9 +36,6 @@ A description of the settable variables for this role should go here, including
 * `ansible_steps_log`: Sets the TripleO Ansible steps log file path.
 * `config_download_args`: Sets the arguments to load config-download
   environment in THT.
-* `step_tripleo_config_download`: false/true - whether to enable config-download.
-* `deploy_steps_ansible`: false/true - whether to deploy the overcloud with
-  config-download Ansible steps. This parameter will be removed soon.
 * `deploy_steps_ansible_workflow`: false/true - whether to deploy the overcloud with
   config-download Ansible steps from a Mistral workflow.
 

roles/overcloud-deploy/defaults/main.yml

@@ -133,9 +133,6 @@ deploy_multinode: false
 
 step_deploy_overcloud: true
 
-# TODO(emilien) cleanup the parameters once https://review.openstack.org/#/c/514736/ is merged
-step_tripleo_config_download: false
-deploy_steps_ansible: false
 deploy_steps_ansible_workflow: false
 
 step_validate_overcloud: true

roles/overcloud-deploy/tasks/create-scripts.yml

@@ -20,7 +20,7 @@
     dest: "{{ working_dir }}/neutronl3ha.yaml"
 
 - name: Create config-downlad environment
-  when: (deploy_steps_ansible_workflow|bool) or (deploy_steps_ansible|bool)
+  when: deploy_steps_ansible_workflow|bool
   template:
     src: "config-download.yaml.j2"
     dest: "{{ working_dir }}/config-download.yaml"

roles/overcloud-deploy/tasks/deploy-overcloud.yml

@@ -1,4 +1,4 @@
-- when: (deploy_steps_ansible_workflow|bool) or (deploy_steps_ansible|bool)
+- when: deploy_steps_ansible_workflow|bool
   block:
     - name: Add subnodes to known hosts
       shell: |
@@ -16,32 +16,3 @@
   set_fact:
     # deploy_args end with a newline, remove to make deploy_args_used easier to use
     deploy_args_used: "{{ deploy_args | replace('\n', ' ') }}"
-
-# TODO(emilien) remove the next 2 blocks once https://review.openstack.org/#/c/514736/ is merged
-- when: step_tripleo_config_download|bool
-  block:
-    # The config-download workflow is temporary until we have a Mistral workflow,
-    # then we won't need these steps.
-    - name: Cleanup TripleO configuration
-      file:
-        path: "{{ working_dir }}/tripleo-config-download"
-        state: absent
-    - name: Download TripleO configuration
-      shell: >
-        set -o pipefail &&
-        source {{ working_dir }}/stackrc &&
-        tripleo-config-download 2>&1 {{ timestamper_cmd }} > {{ tripleo_config_download_log }}
-
-- when: deploy_steps_ansible|bool
-  block:
-    - name: Add subnodes to known hosts
-      shell: |
-        ssh-keyscan 192.168.24.3 >> ~/.ssh/known_hosts
-    - name: Deploy steps with Ansible
-      shell: >
-        set -o pipefail &&
-        source {{ working_dir }}/stackrc &&
-        tripleo-ansible-inventory --ansible_ssh_user $(whoami) --static-inventory {{ working_dir }}/inventory &&
-        ansible-playbook -i {{ working_dir }}/inventory {{ working_dir }}/tripleo-config-download/tripleo-*-config/deploy_steps_playbook.yaml 2>&1 {{ timestamper_cmd }} > {{ ansible_steps_log }}
-  environment:
-    ANSIBLE_SSH_ARGS: ""