diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-19 08:58:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-19 08:58:58 +0000 |
| commit | 3ddb1136e570906cb9c1f32f9cc6fcd6ccd3ac45 (patch) | |
| tree | 25daca8e665683398c3b6d2293c4be92a8bec076 /overcloud.yaml | |
| parent | 27625182b25539bdd4f0959817cf77971ef34598 (diff) | |
| parent | 32d2934e982d3de634bb977f5beeddac47e7ceb2 (diff) | |
Merge "Remove ControllerClusterConfig from overcloud.yaml"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 0a9d80e5..6b5f6ed9 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -1409,29 +1409,6 @@ resources: ceph_mon_names: {get_attr: [Controller, hostname]} ceph_mon_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]} - ControllerClusterConfig: - type: OS::Heat::StructuredConfig - properties: - group: os-apply-config - config: - corosync: - nodes: {get_attr: [Controller, corosync_node]} - horizon: - caches: - memcached: - nodes: {get_attr: [Controller, hostname]} - mysql: - nodes: {get_attr: [Controller, corosync_node]} - haproxy: - nodes: {get_attr: [Controller, corosync_node]} - - ControllerClusterDeployment: - type: OS::Heat::StructuredDeployments - properties: - name: ControllerClusterDeployment - config: {get_resource: ControllerClusterConfig} - servers: {get_attr: [Controller, attributes, nova_server_resource]} - ControllerAllNodesDeployment: type: OS::Heat::StructuredDeployments properties: |