openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Remove parameters from overcloud deploy

Browse Source 
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
This commit is contained in:
Alfredo Moralejo 2016-11-29 11:50:40 +01:00
parent a9a3432987
commit 2a14e3c964
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/general_config/scale_compute.yml
View File

@ -33,12 +33,12 @@ flavor_args: >-
timeout_args: "--timeout {{ deploy_timeout }}" 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 # Pull out scale_extra_args so the same var can be reused for the call to
# `openstack overcloud delete` # `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_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 # Scale deployment info
node_to_scale: compute # Type of node to scale node_to_scale: compute # Type of node to scale

2
roles/baremetal-undercloud/README.md
View File

@ -110,7 +110,7 @@ public_net_pool_start: "<FLOATING NETWORK POOL START>"
public_net_pool_end: "<FLOATING NETWORK POOL END>" public_net_pool_end: "<FLOATING NETWORK POOL END>"
public_net_gateway: "<FLOATING NETWORK GATEWAY>" public_net_gateway: "<FLOATING NETWORK GATEWAY>"
extra_args: "--ntp-server <NTP SERVER IP> --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 <NTP SERVER IP> --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: A brief explanation of the variables:

2
roles/overcloud-scale/README.md
View File

@ -74,7 +74,7 @@ Example Playbook
timeout_args: "--timeout {{ deploy_timeout }}" timeout_args: "--timeout {{ deploy_timeout }}"
# Pulled this out so we can hand these configs to the openstack overcloud node delete command # 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_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 # Scale deployment info
node_to_scale: compute # Type of node to scale node_to_scale: compute # Type of node to scale