Reduce duplication in Neutron reclass
* Common definitions moved to neutron/control/cluster.yml
neutron/control/single.yml
* neutron/control/cluster.yml and neutron/control/single.yml
defined in conforming backend ones.
Change-Id: I9bf580c70a886db7188716f96d48f1d2a2d3a2a1
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 12baf43..797c378 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -16,30 +16,13 @@
python-pymysql:
fromrepo: ${_param:openstack_version}
version: latest
- haproxy:
- proxy:
- listen:
- neutron_api:
- type: openstack-service
- service_name: neutron
- binds:
- - address: ${_param:cluster_vip_address}
- port: 9696
- servers:
- - name: ${_param:cluster_node01_hostname}
- host: ${_param:cluster_node01_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ${_param:cluster_node02_hostname}
- host: ${_param:cluster_node02_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ${_param:cluster_node03_hostname}
- host: ${_param:cluster_node03_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
neutron:
server:
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
database:
x509:
enabled: ${_param:openstack_mysql_x509_enabled}
@@ -49,6 +32,5 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
role: ${_param:openstack_node_role}
- plugin: contrail
identity:
protocol: ${_param:cluster_internal_protocol}