Update overcloud-scale post extra roles merging
- Remove scale_ceph.yml config, it isn't tested/verified and shouldn't be supported - Clean up the scale_compute.yml config and remove unused or redundant (overriding default with default) variables - Ensure the conditional tasks cast strings to bools to avoid false positives Change-Id: Ib80e5e492b3add4a7943bdeb24de0957b9b7bcb3
This commit is contained in:
Harry Rybacki
parent
c231a1c823
commit
522e9d7d46
|
|
@ -1,64 +0,0 @@
|
|||
---
|
||||
|
||||
control_memory: 6144
|
||||
compute_memory: 6144
|
||||
ceph_memory: 8192
|
||||
|
||||
undercloud_memory: 8192
|
||||
undercloud_vcpu: 2
|
||||
|
||||
overcloud_nodes:
|
||||
- name: control_0
|
||||
flavor: control
|
||||
|
||||
- name: compute_0
|
||||
flavor: compute
|
||||
|
||||
- name: ceph-storage_0
|
||||
flavor: ceph
|
||||
|
||||
- name: ceph-storage_1
|
||||
flavor: ceph
|
||||
|
||||
tempest: false
|
||||
pingtest: true
|
||||
deploy_timeout: 60
|
||||
|
||||
# General deployment info
|
||||
libvirt_args: "--libvirt-type qemu"
|
||||
flavor_args: >-
|
||||
--control-flavor {{flavor_map.control
|
||||
if flavor_map is defined and 'control' in flavor_map else 'oooq_control'}}
|
||||
--compute-flavor {{flavor_map.compute
|
||||
if flavor_map is defined and 'compute' in flavor_map else 'oooq_compute'}}
|
||||
--ceph-storage-flavor {{flavor_map.ceph
|
||||
if flavor_map is defined and 'ceph' in flavor_map else 'oooq_ceph'}}
|
||||
timeout_args: "--timeout {{ deploy_timeout }}"
|
||||
extra_args: "--ceph-storage-scale 1 --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"
|
||||
# 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_deployment_arg }}-scale {{ final_scale_value }} --neutron-network-type vxlan --neutron-tunnel-types vxlan {{ scale_extra_configs }} --ntp-server pool.ntp.org"
|
||||
|
||||
|
||||
# Scale deployment info
|
||||
node_to_scale: ceph # Type of node to scale
|
||||
node_to_scale_deployment_arg: ceph-storage # argument needed to scale node
|
||||
initial_scale_value: 1 # Initial number of nodes to deploy
|
||||
final_scale_value: 2 # Number of additional nodes to add during the scale
|
||||
|
||||
# Initial deployment arguments
|
||||
deploy_args: >-
|
||||
{{ libvirt_args }}
|
||||
{{ flavor_args }}
|
||||
{{ timeout_args }}
|
||||
{{ extra_args }}
|
||||
|
||||
# Scale deployment arguments
|
||||
scale_args: >-
|
||||
{{ libvirt_args }}
|
||||
{{ flavor_args }}
|
||||
{{ timeout_args }}
|
||||
{{ scale_extra_args }}
|
||||
|
||||
# Sample call
|
||||
# ./deploy.sh -v --playbook scale_nodes --config-file config/scale/scale_ceph.yml
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
control_memory: 16384
|
||||
control_vcpu: 4
|
||||
|
||||
# Define single controller node with two computes to allow for scaling
|
||||
overcloud_nodes:
|
||||
- name: control_0
|
||||
flavor: control
|
||||
|
|
@ -13,12 +14,13 @@ overcloud_nodes:
|
|||
- name: compute_1
|
||||
flavor: compute
|
||||
|
||||
# If `run_tempest` is `true`, run tempests tests, otherwise do not
|
||||
# run them.
|
||||
run_tempest: false
|
||||
tempest_config: false
|
||||
test_ping: true
|
||||
enable_pacemaker: true
|
||||
network_isolation: true
|
||||
deploy_timeout: 60
|
||||
deploy_timeout: 75
|
||||
|
||||
# General deployment info
|
||||
libvirt_args: "--libvirt-type qemu"
|
||||
|
|
@ -33,11 +35,11 @@ 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"
|
||||
|
||||
# Pulled this out so we can hand these configs to the openstack overcloud node delete command
|
||||
# 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 deployment info
|
||||
node_to_scale: compute # Type of node to scale
|
||||
initial_scale_value: 1 # Initial number of nodes to deploy
|
||||
|
|
@ -51,7 +53,7 @@ scale_args: >-
|
|||
{{ pacemaker_args }}
|
||||
{{ scale_extra_args }}
|
||||
|
||||
# options below direct automatic doc generation by collect-logs
|
||||
# Options below direct automatic doc generation by collect-logs
|
||||
artcl_gen_docs: true
|
||||
artcl_create_docs_payload:
|
||||
included_deployment_scripts:
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
# tasks file for ansible-role-tripleo-overcloud-scale-nodes
|
||||
|
||||
- include: pre-scale.yml
|
||||
when: artosn_scale_nodes
|
||||
when: artosn_scale_nodes|bool
|
||||
tags:
|
||||
- pre-overcloud-scale-nodes
|
||||
|
||||
- include: scale-nodes.yml
|
||||
when: artosn_scale_nodes
|
||||
when: artosn_scale_nodes|bool
|
||||
tags:
|
||||
- overcloud-scale-nodes
|
||||
|
||||
# Optionally delete the original node of type scaled
|
||||
- include: delete-original-node.yml
|
||||
when: artosn_delete_original_node
|
||||
when: artosn_delete_original_node|bool
|
||||
tags:
|
||||
- post-overcloud-scale-nodes-delete
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
set_fact:
|
||||
pacemaker_args: >-
|
||||
-e {{ overcloud_templates_path }}/environments/puppet-pacemaker.yaml
|
||||
when: enable_pacemaker
|
||||
when: enable_pacemaker|bool
|
||||
|
||||
- name: extract the number of controllers to be deployed
|
||||
set_fact: number_of_controllers="{{ scale_args| regex_replace('^.*--control-scale +([0-9]+).*$', '\\1') | regex_replace('^[^ 0-9]*.*$', '1') }}"
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
pacemaker_args: >-
|
||||
{{ pacemaker_args }}
|
||||
-e $HOME/neutronl3ha.yaml
|
||||
when: enable_pacemaker and number_of_controllers|int < 3
|
||||
when: enable_pacemaker|bool and number_of_controllers|int < 3
|
||||
|
||||
# Prep for scaling overcloud
|
||||
- name: Determine initial number of node(s) that will be scaled
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
mode: 0755
|
||||
|
||||
- name: Copy neutron l3 ha heat template
|
||||
when: enable_pacemaker and number_of_controllers|int < 3
|
||||
when: enable_pacemaker|bool and number_of_controllers|int < 3
|
||||
template:
|
||||
src: "neutronl3ha.yaml.j2"
|
||||
dest: "{{ artosn_working_dir }}/neutronl3ha.yaml"
|
||||
|
|
|
|||
Loading…
Reference in New Issue