From 2a14e3c9644611ba100eab6f11833329ac368cbf Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Tue, 29 Nov 2016 11:50:40 +0100 Subject: [PATCH] Remove parameters from overcloud deploy 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 and scale_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: Icb36a45797bdb5e217ce9f33fa67e6697590b23c --- config/general_config/scale_compute.yml | 4 ++-- roles/baremetal-undercloud/README.md | 2 +- roles/overcloud-scale/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/general_config/scale_compute.yml b/config/general_config/scale_compute.yml index aa94d635e..3bd4f6ec7 100644 --- a/config/general_config/scale_compute.yml +++ b/config/general_config/scale_compute.yml @@ -33,12 +33,12 @@ flavor_args: >- timeout_args: "--timeout {{ deploy_timeout }}" -extra_args: "--compute-scale 1 --neutron-network-type vxlan --neutron-tunnel-types vxlan -e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e ~/network-environment.yaml --ntp-server pool.ntp.org" +extra_args: "--compute-scale 1 -e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e ~/network-environment.yaml --ntp-server pool.ntp.org" # Pull out scale_extra_args so the same var can be reused for the call to # `openstack overcloud delete` scale_extra_configs: "-e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e /home/stack/network-environment.yaml" -scale_extra_args: "--{{ node_to_scale }}-scale {{ final_scale_value }} --neutron-network-type vxlan --neutron-tunnel-types vxlan {{ scale_extra_configs }} --ntp-server pool.ntp.org" +scale_extra_args: "--{{ node_to_scale }}-scale {{ final_scale_value }} {{ scale_extra_configs }} --ntp-server pool.ntp.org" # Scale deployment info node_to_scale: compute # Type of node to scale diff --git a/roles/baremetal-undercloud/README.md b/roles/baremetal-undercloud/README.md index c7ca32b96..e9acb6da5 100644 --- a/roles/baremetal-undercloud/README.md +++ b/roles/baremetal-undercloud/README.md @@ -110,7 +110,7 @@ public_net_pool_start: "" public_net_pool_end: "" public_net_gateway: "" -extra_args: "--ntp-server --control-scale 3 --compute-scale 2 --ceph-storage-scale 0 --block-storage-scale 0 --swift-storage-scale 0 --templates -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /home/stack/network-environment.yaml --neutron-bridge-mappings datacentre:br-floating" +extra_args: "--ntp-server --control-scale 3 --compute-scale 2 --ceph-storage-scale 0 --block-storage-scale 0 --swift-storage-scale 0 --templates -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /home/stack/network-environment.yaml" ``` A brief explanation of the variables: diff --git a/roles/overcloud-scale/README.md b/roles/overcloud-scale/README.md index a2b4e2a40..4998ad2f5 100644 --- a/roles/overcloud-scale/README.md +++ b/roles/overcloud-scale/README.md @@ -74,7 +74,7 @@ Example Playbook timeout_args: "--timeout {{ deploy_timeout }}" # Pulled this out so we can hand these configs to the openstack overcloud node delete command scale_extra_configs: "-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" - scale_extra_args: "--{{ node_to_scale }}-scale {{ final_scale_value }} --neutron-network-type vxlan --neutron-tunnel-types vxlan {{ scale_extra_configs }} --ntp-server pool.ntp.org" + scale_extra_args: "--{{ node_to_scale }}-scale {{ final_scale_value }} {{ scale_extra_configs }} --ntp-server pool.ntp.org" # Scale deployment info node_to_scale: compute # Type of node to scale