Minor refactor of Octavia metadata
Classes and parameters specific for octavia manager would now
be defined on a cluster level in a separate class.
Change-Id: I60bb4dc38a411ab7a81f50574c3eb70cca020775
diff --git a/neutron/client/service/octavia.yml b/neutron/client/service/octavia.yml
index e818f76..90a4a4e 100644
--- a/neutron/client/service/octavia.yml
+++ b/neutron/client/service/octavia.yml
@@ -1,6 +1,8 @@
classes:
- service.neutron.client
parameters:
+ _param:
+ octavia_hm_bind_ip: '192.168.0.12'
neutron:
client:
server:
@@ -19,7 +21,7 @@
port:
octavia-health-manager-listen-port:
fixed_ips:
- - ip_address: '192.168.0.12'
+ - ip_address: ${_param:octavia_hm_bind_ip}
device_owner: Octavia:health-mgr
binding_host_id: ${_param:openstack_gateway_node01_hostname}
security_groups:
diff --git a/reclass/storage/system/openstack_gateway_single_octavia.yml b/reclass/storage/system/openstack_gateway_single_octavia.yml
index 7291977..2a5b952 100644
--- a/reclass/storage/system/openstack_gateway_single_octavia.yml
+++ b/reclass/storage/system/openstack_gateway_single_octavia.yml
@@ -4,6 +4,4 @@
node:
openstack_gateway_node01:
classes:
- - system.octavia.manager.single
- - system.salt.minion.ca.octavia_ca
- - system.salt.minion.cert.octavia_amp_client
+ - cluster.${_param:cluster_name}.openstack.octavia_manager