openstack
/
tripleo-quickstart
Code Issues Proposed changes

Remove parameters from overcloud deploy 

Review https://review.openstack.org/#/c/397312/ has removed
some options in tripleoclient.

Specifically, --neutron-network-type and --neutron-tunnel-types
are being used in tripleo-quickstart. This patch removes them
from extra_args.

This parameters are being passed via environment files or using
vxlan by default so i think it doesn't need any other adjustment.

Change-Id: I8f9b52e7a0e78266fab0717e20a9710be264f5aa
This commit is contained in:
Alfredo Moralejo 2016-11-29 11:33:42 +01:00
parent d5369f008e
commit 881c8f2c53
6 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/ceph.yml
View File

@ -13,8 +13,6 @@ overcloud_nodes:
# Tell tripleo how we want things done.
extra_args: >-
--neutron-network-type vxlan
--neutron-tunnel-types vxlan
--ntp-server pool.ntp.org
--ceph-storage-scale 1
-e {{overcloud_templates_path}}/environments/storage-environment.yaml

3
config/general_config/ha.yml
View File

@ -36,8 +36,7 @@ step_introspect: false
# Tell tripleo about our environment.
network_isolation: true
extra_args: >-
--control-scale 3 --neutron-network-type vxlan
--neutron-tunnel-types vxlan
--control-scale 3
--ntp-server pool.ntp.org
test_ping: true
enable_pacemaker: true

2
config/general_config/ha_big.yml
View File

@ -40,8 +40,6 @@ network_isolation: true
extra_args: >-
--compute-scale 3
--control-scale 3
--neutron-network-type vxlan
--neutron-tunnel-types vxlan
--ntp-server pool.ntp.org
test_ping: true
enable_pacemaker: true

3
config/general_config/ha_ipv6.yml
View File

@ -32,8 +32,7 @@ step_introspect: false
# Tell tripleo about our environment.
network_isolation: true
extra_args: >-
--control-scale 3 --neutron-network-type vxlan
--neutron-tunnel-types vxlan
--control-scale 3
--ntp-server pool.ntp.org
test_ping: true
enable_pacemaker: true

2
config/general_config/minimal.yml
View File

@ -13,8 +13,6 @@ overcloud_nodes:
# Tell tripleo how we want things done.
extra_args: >-
--neutron-network-type vxlan
--neutron-tunnel-types vxlan
--ntp-server pool.ntp.org
network_isolation: true

2
config/general_config/minimal_pacemaker.yml
View File

@ -11,8 +11,6 @@ overcloud_nodes:
# Tell tripleo how we want things done.
extra_args: >-
--neutron-network-type vxlan
--neutron-tunnel-types vxlan
--ntp-server pool.ntp.org
network_isolation: true