openstack
/
tripleo-quickstart
Code Issues Proposed changes

use yaml blocks for really long strings 

this commit modifies the `extra_args` definitions in a couple of
variable files to use YAML blocks, rather than a really long quoted
string.  This makes the files display better in a number of situations
(nobody likes massic horizontal scrolls), and it makes the arguments a
little more obvious.

Change-Id: I98ed41013ad4a72f43b74ff95fd04a42a845d636
This commit is contained in:
Lars Kellogg-Stedman 2016-04-28 22:24:28 -04:00 committed by John Trowbridge
parent 4718ac91a8
commit f85e5d456d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/centosci/ha.yml
View File

@ -17,7 +17,15 @@ overcloud_nodes:
introspect: false
# Tell tripleo about our environment.
extra_args: >-
--control-scale 3 --neutron-network-type vxlan
--neutron-tunnel-types vxlan
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml
-e /usr/share/openstack-tripleo-heat-templates/environments/net-single-nic-with-vlans.yaml
-e ~/network-environment.yaml
-e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml
--ntp-server pool.ntp.org
deploy_timeout: 75
extra_args: "--control-scale 3 --neutron-network-type vxlan --neutron-tunnel-types vxlan -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/net-single-nic-with-vlans.yaml -e ~/network-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml --ntp-server pool.ntp.org"
tempest: false
pingtest: true

9
playbooks/centosci/minimal.yml
View File

@ -9,4 +9,11 @@ overcloud_nodes:
- name: compute_0
flavor: compute
extra_args: " --neutron-network-type vxlan --neutron-tunnel-types vxlan -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/net-single-nic-with-vlans.yaml -e ~/network-environment.yaml --ntp-server pool.ntp.org"
# Tell tripleo how we want things done.
extra_args: >-
--neutron-network-type vxlan
--neutron-tunnel-types vxlan
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml
-e /usr/share/openstack-tripleo-heat-templates/environments/net-single-nic-with-vlans.yaml
-e ~/network-environment.yaml
--ntp-server pool.ntp.org