diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-31 12:48:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-31 12:48:45 +0000 |
| commit | 2f5d1a609e9863beff19d021dae184aecbe75e2c (patch) | |
| tree | b279c109eae9aa6b235562ee4e5925ea596511b6 | |
| parent | 431b65a32fd0880bb14ddaf07e2f53ac42f10dad (diff) | |
| parent | f9b98d4c576d84be7167f1b728179d32a018a1a1 (diff) | |
Merge "Implement mongo_node_ips hiera key"
| -rw-r--r-- | all-nodes-config.yaml | 2 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 1 | ||||
| -rw-r--r-- | puppet/all-nodes-config.yaml | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/all-nodes-config.yaml b/all-nodes-config.yaml index 677c12d6..7fa27c5d 100644 --- a/all-nodes-config.yaml +++ b/all-nodes-config.yaml @@ -6,6 +6,8 @@ parameters: type: comma_delimited_list controller_hosts: type: comma_delimited_list + controller_ips: + type: comma_delimited_list block_storage_hosts: type: comma_delimited_list object_storage_hosts: diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 3bc969e2..be324524 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -695,6 +695,7 @@ resources: properties: compute_hosts: {get_attr: [Compute, hosts_entry]} controller_hosts: {get_attr: [Controller, hosts_entry]} + controller_ips: {get_attr: [Controller, ip_address]} block_storage_hosts: {get_attr: [BlockStorage, hosts_entry]} object_storage_hosts: {get_attr: [ObjectStorage, hosts_entry]} ceph_storage_hosts: {get_attr: [CephStorage, hosts_entry]} diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 7fca449e..55acb4b7 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -6,6 +6,8 @@ parameters: type: comma_delimited_list controller_hosts: type: comma_delimited_list + controller_ips: + type: comma_delimited_list block_storage_hosts: type: comma_delimited_list object_storage_hosts: @@ -52,6 +54,10 @@ resources: list_join: - ',' - {get_param: controller_names} + mongo_node_ips: + list_join: + - ',' + - {get_param: controller_ips} outputs: config_id: |