Merge "config-download: use workflow supported in Queens"

roles/overcloud-deploy/README.md

@@ -38,7 +38,9 @@ A description of the settable variables for this role should go here, including
   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.
+  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.
 
 
 Dependencies

roles/overcloud-deploy/defaults/main.yml

@@ -131,8 +131,10 @@ 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
 prepare_tempest: false

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

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

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

@@ -1,3 +1,9 @@
+- when: (deploy_steps_ansible_workflow|bool) or (deploy_steps_ansible|bool)
+  block:
+    - name: Add subnodes to known hosts
+      shell: |
+        ssh-keyscan 192.168.24.3 >> ~/.ssh/known_hosts
+
 - name: Deploy the overcloud
   shell: >
     set -o pipefail &&
@@ -11,6 +17,7 @@
     # 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,