Add possibily to set availability_zone
Change-Id: Ib62713f67e0d1e267590210d331de19da58f8015
Related-PROD: DEVCLOUD-506
(cherry picked from commit 50a66c654627599bd47b9738463cc02f76c09956)
diff --git a/metadata/service/api/cluster.yml b/metadata/service/api/cluster.yml
index f6bd55e..f907f09 100644
--- a/metadata/service/api/cluster.yml
+++ b/metadata/service/api/cluster.yml
@@ -9,6 +9,7 @@
octavia_api_bind_port: 9876
octavia_api_v1_enabled: True
octavia_api_v2_enabled: True
+ octavia_amphora_availability_zone: 'nova'
octavia:
api:
enabled: true
@@ -42,3 +43,5 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ nova:
+ availability_zone: ${_param:octavia_amphora_availability_zone}
diff --git a/metadata/service/api/single.yml b/metadata/service/api/single.yml
index dfd1128..57bcdfa 100644
--- a/metadata/service/api/single.yml
+++ b/metadata/service/api/single.yml
@@ -7,6 +7,7 @@
keystone_octavia_endpoint_type: internal
octavia_api_v1_enabled: True
octavia_api_v2_enabled: True
+ octavia_amphora_availability_zone: 'nova'
octavia:
api:
enabled: true
@@ -40,3 +41,5 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ nova:
+ availability_zone: ${_param:octavia_amphora_availability_zone}
\ No newline at end of file
diff --git a/metadata/service/manager/cluster.yml b/metadata/service/manager/cluster.yml
index ac9db54..cd0db05 100644
--- a/metadata/service/manager/cluster.yml
+++ b/metadata/service/manager/cluster.yml
@@ -7,6 +7,7 @@
keystone_octavia_endpoint_type: internal
octavia_loadbalancer_topology: 'SINGLE'
octavia_hm_bind_port: 5555
+ octavia_amphora_availability_zone: 'nova'
octavia:
manager:
enabled: true
@@ -55,3 +56,5 @@
controller_ip_port_list: ${_param:octavia_health_manager_node01_address}:${_param:octavia_hm_bind_port},${_param:octavia_health_manager_node02_address}:${_param:octavia_hm_bind_port},${_param:octavia_health_manager_node03_address}:${_param:octavia_hm_bind_port}
house_keeping:
spare_amphora_pool_size: 0
+ nova:
+ availability_zone: ${_param:octavia_amphora_availability_zone}
diff --git a/metadata/service/manager/single.yml b/metadata/service/manager/single.yml
index 13713b0..4bde8bb 100644
--- a/metadata/service/manager/single.yml
+++ b/metadata/service/manager/single.yml
@@ -7,6 +7,7 @@
keystone_octavia_endpoint_type: internal
octavia_loadbalancer_topology: 'SINGLE'
octavia_hm_bind_port: 5555
+ octavia_amphora_availability_zone: 'nova'
octavia:
manager:
enabled: true
@@ -55,3 +56,5 @@
controller_ip_port_list: ${_param:octavia_hm_bind_ip}:${_param:octavia_hm_bind_port}
house_keeping:
spare_amphora_pool_size: 0
+ nova:
+ availability_zone: ${_param:octavia_amphora_availability_zone}
diff --git a/octavia/files/pike/octavia_api.conf b/octavia/files/pike/octavia_api.conf
index 0c13df6..8ceaae6 100644
--- a/octavia/files/pike/octavia_api.conf
+++ b/octavia/files/pike/octavia_api.conf
@@ -1262,6 +1262,9 @@
# Flag to indicate if nova anti-affinity feature is turned on. (boolean value)
#enable_anti_affinity = false
+# Availability zone to use for creating Amphorae
+availability_zone = {{ api.nova.get('availability_zone', 'nova') }}
+
[oslo_messaging]
#
diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index a25f557..bd89062 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -1309,6 +1309,9 @@
# Flag to indicate if nova anti-affinity feature is turned on. (boolean value)
#enable_anti_affinity = false
+# Availability zone to use for creating Amphorae
+availability_zone = {{ manager.nova.get('availability_zone', 'nova') }}
+
[oslo_messaging]
#
diff --git a/octavia/files/queens/octavia_api.conf b/octavia/files/queens/octavia_api.conf
index 5962987..0a314cb 100644
--- a/octavia/files/queens/octavia_api.conf
+++ b/octavia/files/queens/octavia_api.conf
@@ -943,6 +943,9 @@
# Flag to indicate if nova anti-affinity feature is turned on. (boolean value)
#enable_anti_affinity = false
+# Availability zone to use for creating Amphorae
+availability_zone = {{ api.nova.get('availability_zone', 'nova') }}
+
[oslo_messaging]
#
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index 4b1f484..218127c 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -989,6 +989,9 @@
# Flag to indicate if nova anti-affinity feature is turned on. (boolean value)
#enable_anti_affinity = false
+# Availability zone to use for creating Amphorae
+availability_zone = {{ manager.nova.get('availability_zone', 'nova') }}
+
[oslo_messaging]
#