From 5a929be775bb4513560b87f5da314e12421df665 Mon Sep 17 00:00:00 2001 From: chenshuai Date: Thu, 3 Nov 2016 03:39:35 -0400 Subject: [PATCH] add switch for openstack network node's components high availability Change-Id: I555fc334b8429f4741bf0a8eec3ea3c02fcb5ae1 Signed-off-by: chenshuai --- conf/package_metadata/openstack.conf | 8 ++++++++ .../vars/HA-ansible-multinodes.tmpl | 1 + .../vars/HA-ansible-multinodes.tmpl | 1 + 3 files changed, 10 insertions(+) diff --git a/conf/package_metadata/openstack.conf b/conf/package_metadata/openstack.conf index 3edef381..ebe804c5 100644 --- a/conf/package_metadata/openstack.conf +++ b/conf/package_metadata/openstack.conf @@ -121,6 +121,14 @@ METADATA = { 'default_value': 'Disable' } }, + 'ha_network': { + '_self': { + 'mapping_to': 'ha_network', + 'field': 'anytype', + 'is_required':False, + 'default_value': 'Disable' + } + }, 'network_cfg': { '_self': { 'mapping_to': 'network_cfg' diff --git a/conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl index 7baa641e..3e9a684a 100644 --- a/conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl @@ -31,6 +31,7 @@ enable_fwaas: $getVar('enable_fwaas', True) enable_vpnaas: $getVar('enable_vpnaas', True) odl_l3_agent: $getVar('odl_l3_agent', 'Disable') moon: $getVar('moon', 'Disable') +ha_network: $getVar('ha_network', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') ip_settings: $ip_settings network_cfg: $network_cfg diff --git a/conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl index 3ba57d45..2205431b 100644 --- a/conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl @@ -31,6 +31,7 @@ enable_fwaas: $getVar('enable_fwaas', True) enable_vpnaas: $getVar('enable_vpnaas', True) odl_l3_agent: $getVar('odl_l3_agent', 'Disable') moon: $getVar('moon', 'Disable') +ha_network: $getVar('ha_network', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') ip_settings: $ip_settings network_cfg: $network_cfg