Merge "Add flexability for octavia cinder variable."

defaults/main.yml

@@ -61,6 +61,9 @@ octavia_barbican_enabled: false
 
 ## Cinder Volume
 octavia_cinder_enabled: False
+cinder_default_availability_zone: "{{ octavia_amp_availability_zone }}"
+octavia_cinder_volume_size: 16
+octavia_cinder_volume_type: "volumes-hdd"
 
 ## Database info
 octavia_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
@@ -306,7 +309,7 @@ octavia_enable_anti_affinity: False
 # Some installations put hardware more suited for load balancing in special
 # availability zones. This allows to target a specific availability zone
 # for amphora creation
-#octavia_amp_availability_zone:
+octavia_amp_availability_zone: nova
 
 # List of haproxy template files to copy from deployment host to octavia hosts
 # octavia_user_haproxy_templates:

releasenotes/notes/add_flexibility_for_octavia_cinder_variables-107cb1da89834bf3.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - Introduces 3 new variables cinder_default_availability_zone,
+    octavia_cinder_volume_size and octavia_cinder_volume_type. using
+    these variables, enables Octavia to use different Cinder configurations.

templates/octavia.conf.j2

@@ -154,9 +154,9 @@ enable_anti_affinity = {{ octavia_enable_anti_affinity }}
 service_name = {{ cinder_service_v3_name | default('cinderv3') }}
 region_name = {{ keystone_service_region }}
 endpoint_type = {{ octavia_clients_endpoint }}
-availability_zone = nova
-volume_size = 16
-volume_type = "volumes-hdd"
+availability_zone = {{ cinder_default_availability_zone }}
+volume_size = {{ octavia_cinder_volume_size }}
+volume_type = {{ octavia_cinder_volume_type }}
 volume_create_retry_interval = 5
 volume_create_timeout = 50
 volume_create_max_retries = 2