diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-09 18:53:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-09 18:53:07 +0000 |
| commit | 3cc34744f1b116b16142caa31d7a3537420dd70f (patch) | |
| tree | 23f9d51e4a9dc86981d6d3aec6d030c8236a4510 /puppet | |
| parent | 5fa62815675912b57775c36b7b184ddbfcaa1753 (diff) | |
| parent | 975fbb4dcafd80bd973bf29ebd3b211d7c4a7e9f (diff) | |
Merge "Generate VIP info for ctlplane VIP, not management"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/vip-hosts.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index d16341df..c764d4ef 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -10,7 +10,7 @@ parameters: type: string cloud_name_storage_mgmt: type: string - cloud_name_management: + cloud_name_ctlplane: type: string hosts: type: comma_delimited_list @@ -209,7 +209,7 @@ resources: cloud_name_internal_api: {get_param: cloud_name_internal_api} cloud_name_storage: {get_param: cloud_name_storage} cloud_name_storage_mgmt: {get_param: cloud_name_storage_mgmt} - cloud_name_management: {get_param: cloud_name_management} + cloud_name_ctlplane: {get_param: cloud_name_ctlplane} outputs: config_id: diff --git a/puppet/services/vip-hosts.yaml b/puppet/services/vip-hosts.yaml index 445a276c..a9d757ee 100644 --- a/puppet/services/vip-hosts.yaml +++ b/puppet/services/vip-hosts.yaml @@ -47,10 +47,10 @@ outputs: ip: "%{hiera('storage_mgmt_virtual_ip')}" ensure: present comment: FQDN of the storage mgmt VIP - management: - name: "%{hiera('cloud_name_management')}" + ctlplane: + name: "%{hiera('cloud_name_ctlplane')}" ip: "%{hiera('controller_virtual_ip')}" ensure: present - comment: FQDN of the management VIP + comment: FQDN of the ctlplane VIP step_config: | include ::tripleo::vip_hosts |