Merge "Make number of Octavia controller workers configurable"
diff --git a/metadata/service/manager/cluster.yml b/metadata/service/manager/cluster.yml
index 4050391..058f6e4 100644
--- a/metadata/service/manager/cluster.yml
+++ b/metadata/service/manager/cluster.yml
@@ -6,6 +6,7 @@
_param:
keystone_octavia_endpoint_type: internal
octavia_loadbalancer_topology: 'SINGLE'
+ octavia_controller_worker_number: 2
octavia_hm_bind_port: 5555
octavia_amphora_availability_zone: 'nova'
octavia_worker_connection_max_retries: 500
@@ -41,6 +42,7 @@
ca_private_key: '/etc/octavia/certs/ca.key'
ca_certificate: '/etc/octavia/certs/ca_01.pem'
controller_worker:
+ workers: ${_param:octavia_controller_worker_number}
amp_flavor_id: ${_param:amp_flavor_id}
amp_image_tag: amphora
amp_ssh_key_name: octavia_ssh_key
diff --git a/metadata/service/manager/single.yml b/metadata/service/manager/single.yml
index e0a91fa..125ce45 100644
--- a/metadata/service/manager/single.yml
+++ b/metadata/service/manager/single.yml
@@ -6,6 +6,7 @@
_param:
keystone_octavia_endpoint_type: internal
octavia_loadbalancer_topology: 'SINGLE'
+ octavia_controller_worker_number: 2
octavia_hm_bind_port: 5555
octavia_amphora_availability_zone: 'nova'
octavia_worker_connection_max_retries: 500
@@ -41,6 +42,7 @@
ca_private_key: '/etc/octavia/certs/ca.key'
ca_certificate: '/etc/octavia/certs/ca_01.pem'
controller_worker:
+ workers: ${_param:octavia_controller_worker_number}
amp_flavor_id: ${_param:amp_flavor_id}
amp_image_tag: amphora
amp_ssh_key_name: octavia_ssh_key
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index 4c22e6e..a4d5d30 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -497,6 +497,8 @@
#
# From octavia
#
+#Number of workers for the controller-worker service.
+workers= {{ manager.controller_worker.workers }}
# Retry attempts to wait for Amphora to become active (integer value)
#amp_active_retries = 10
diff --git a/octavia/files/rocky/octavia_manager.conf b/octavia/files/rocky/octavia_manager.conf
index 7336e8f..2187fdc 100644
--- a/octavia/files/rocky/octavia_manager.conf
+++ b/octavia/files/rocky/octavia_manager.conf
@@ -208,6 +208,8 @@
#
# From octavia
#
+#Number of workers for the controller-worker service.
+workers= {{ manager.controller_worker.workers }}
# Retry attempts to wait for Amphora to become active (integer value)
#amp_active_retries = 10