From 0435d26b5445930a59392280a88deab7786c82b9 Mon Sep 17 00:00:00 2001 From: Shannon Mitchell Date: Wed, 28 Feb 2018 20:49:04 -0600 Subject: [PATCH] Add ability to disable serial throttling for mnaio installs This allows the setting of an ansible osa_disable_serial variable that drops in a config to set all of the serial settings to 100% to disable throttling. The exception being keystone as it has a race condition that prevents it. The default is 'false' and can be set in the MNAIO_ANSIBLE_PARAMETERS var before running the build.sh script. Change-Id: I5850d882d465b7ef10b317076bb135934f1ceba2 Closes-Bug: 1752475 --- multi-node-aio/playbooks/deploy-osa.yml | 11 +++++++++++ multi-node-aio/playbooks/group_vars/all.yml | 1 + .../playbooks/osa/user_unserial_variables.yml | 16 ++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 multi-node-aio/playbooks/osa/user_unserial_variables.yml diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml index 2046e30a..7dcc89d5 100644 --- a/multi-node-aio/playbooks/deploy-osa.yml +++ b/multi-node-aio/playbooks/deploy-osa.yml @@ -79,6 +79,17 @@ when: - pre_config_osa | default(true) | bool + - name: Drop config to disable serial throttle settings + template: + src: "osa/user_unserial_variables.yml" + dest: /etc/openstack_deploy/user_unserial_variables.yml + mode: "0644" + owner: root + group: root + when: + - pre_config_osa | default(true) | bool + - osa_disable_serial | default(false) | bool + - name: Ensure the user_variables file is populated lineinfile: path: /etc/openstack_deploy/user_variables.yml diff --git a/multi-node-aio/playbooks/group_vars/all.yml b/multi-node-aio/playbooks/group_vars/all.yml index 42472f48..7750d40b 100644 --- a/multi-node-aio/playbooks/group_vars/all.yml +++ b/multi-node-aio/playbooks/group_vars/all.yml @@ -126,3 +126,4 @@ osa_enable_dashboard: true osa_enable_network: true osa_enable_meter: true osa_enable_object_storage: true +osa_disable_serial: false diff --git a/multi-node-aio/playbooks/osa/user_unserial_variables.yml b/multi-node-aio/playbooks/osa/user_unserial_variables.yml new file mode 100644 index 00000000..2c98afbb --- /dev/null +++ b/multi-node-aio/playbooks/osa/user_unserial_variables.yml @@ -0,0 +1,16 @@ +cinder_api_serial: 100% +cinder_scheduler_serial: 100% +cinder_backend_serial: 100% +glance_api_serial: 100% +glance_registry_serial: 100% +neutron_server_serial: 100% +neutron_agent_serial: 100% +neutron_other_serial: 100% +nova_conductor_serial: 100% +nova_scheduler_serial: 100% +nova_api_serial: 100% +nova_console_serial: 100% +nova_compute_serial: 100% +nova_serial: 100% +#keystone_serial: 100% # Do NOT enable due to race condition with authorized_keys module. +