From 881c8f2c53d474d45f13dbb02d35c86f3f54ff5d Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Tue, 29 Nov 2016 11:33:42 +0100 Subject: [PATCH] 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 --- config/general_config/ceph.yml | 2 -- config/general_config/ha.yml | 3 +-- config/general_config/ha_big.yml | 2 -- config/general_config/ha_ipv6.yml | 3 +-- config/general_config/minimal.yml | 2 -- config/general_config/minimal_pacemaker.yml | 2 -- 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/config/general_config/ceph.yml b/config/general_config/ceph.yml index 17a9491a2..621b8af22 100644 --- a/config/general_config/ceph.yml +++ b/config/general_config/ceph.yml @@ -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 diff --git a/config/general_config/ha.yml b/config/general_config/ha.yml index 8cb7d8d32..5d577d0fb 100644 --- a/config/general_config/ha.yml +++ b/config/general_config/ha.yml @@ -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 diff --git a/config/general_config/ha_big.yml b/config/general_config/ha_big.yml index 180225197..4e3536a95 100644 --- a/config/general_config/ha_big.yml +++ b/config/general_config/ha_big.yml @@ -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 diff --git a/config/general_config/ha_ipv6.yml b/config/general_config/ha_ipv6.yml index 005b21b2b..fae5e3b89 100644 --- a/config/general_config/ha_ipv6.yml +++ b/config/general_config/ha_ipv6.yml @@ -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 diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml index f009ae313..ab51bb04d 100644 --- a/config/general_config/minimal.yml +++ b/config/general_config/minimal.yml @@ -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 diff --git a/config/general_config/minimal_pacemaker.yml b/config/general_config/minimal_pacemaker.yml index 74de7f60f..671fcf1d9 100644 --- a/config/general_config/minimal_pacemaker.yml +++ b/config/general_config/minimal_pacemaker.yml @@ -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