openstack/tripleo-quickstart
Code Issues Proposed changes

Merge "fs032: activate config-download"

Browse Source
This commit is contained in:
Zuul 2018-02-08 01:45:39 +00:00 committed by Gerrit Code Review
commit c5c756b3b5
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/general_config/featureset032.yml
View File

@ -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 -%}

4
config/nodes/2ctlr.yml
View File

@ -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

2
doc/source/feature-configuration.rst
View File

@ -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 | | | | | | | |
+-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+-------+