diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-05-09 21:01:53 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-05-17 11:17:33 +0100 |
| commit | 32d2934e982d3de634bb977f5beeddac47e7ceb2 (patch) | |
| tree | 11b0884b27754ac0ed0a6e0159a94fb15e84e966 | |
| parent | aeb9482f4b1ec9d78dc3ac44ee3c0b180cd27574 (diff) | |
Remove ControllerClusterConfig from overcloud.yaml
AFAICS this isn't actually used anywhere, I assume it's left over
from the older element based implementation.
Change-Id: Ie95628bd7af1bcd50a6e331531b2987e434c7136
| -rw-r--r-- | overcloud.yaml | 23 | ||||
| -rw-r--r-- | puppet/controller.yaml | 7 |
2 files changed, 0 insertions, 30 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index cf20b512..e265c74f 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -1422,29 +1422,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: diff --git a/puppet/controller.yaml b/puppet/controller.yaml index d38a24e7..335c0a8a 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1667,13 +1667,6 @@ outputs: hostname: description: Hostname of the server value: {get_attr: [Controller, name]} - corosync_node: - description: > - Node object in the format {ip: ..., name: ...} format that the corosync - element expects - value: - ip: {get_attr: [Controller, networks, ctlplane, 0]} - name: {get_attr: [Controller, name]} hosts_entry: description: > Server's IP address and hostname in the /etc/hosts format |