Merge "fs032: activate config-download"

config/general_config/featureset032.yml

@@ -31,3 +31,14 @@ multinode_args: >-
     -r {{ overcloud_templates_path }}/ci/environments/multinode-3nodes.yaml
     -e {{ overcloud_templates_path }}/environments/deployed-server-bootstrap-environment-centos.yaml
     --overcloud-ssh-user {{ undercloud_user }}
+
+deploy_steps_ansible_workflow: true
+config_download_args: >-
+  {% if release not in ['newton','ocata','pike'] -%}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
+  -e {{ working_dir }}/config-download.yaml
+  --deployed-server
+  --config-download
+  --disable-validations
+  --verbose
+  {%- endif -%}

config/nodes/2ctlr.yml

@@ -2,8 +2,12 @@
 overcloud_nodes:
   - name: control_0
     flavor: control
+    default_name: overcloud-controller-0
+    hostnamemap_override: "{{ hostvars[groups['overcloud'][0]].ansible_hostname }}"
   - name: control_1
     flavor: control
+    default_name: overcloud-controllerapi-0
+    hostnamemap_override: "{{ hostvars[groups['overcloud'][1]].ansible_hostname }}"
 
 node_count: 2
 

doc/source/feature-configuration.rst

@@ -79,7 +79,7 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+-------+
 | 031 |        |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       |       | X     |        |      |    |    |       |
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+-------+
-| 032 |        |      |        |        |       |       |         |         |         |         |    X    |          |             |      |         |       |       |       |       |       |       |       |       |        |      | X  |    |       |
+| 032 |    X   |      |        |        |       |       |         |         |         |         |    X    |          |             |      |         |       |       |       |       |       |       |       |       |        |      | X  |    |       |
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+-------+
 | 033 |        |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       |       |       | X     |       |       |        |      |    |    |       |
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+-------+