summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-09-08 16:11:53 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-09-09 08:43:24 +0300
commit975fbb4dcafd80bd973bf29ebd3b211d7c4a7e9f (patch)
treeebde39e33f905e51221e8563ffd22a0f7072478c
parentbedf3dc546982624628267f812bae24d9b73ff44 (diff)
Generate VIP info for ctlplane VIP, not management
The management network does not have a VIP, so it's been wrong to generate a cloud name and hieradata for this. Instead, the network that actually needs a name and a hosts entry is the ctlplane network, which actually has a VIP and there are services that use it. bp tls-via-certmonger Closes-Bug: #1621742 Change-Id: I163b2c7b5684da6dc290636f54eefe3f2b0c3e3f
-rw-r--r--overcloud.yaml8
-rw-r--r--puppet/all-nodes-config.yaml4
-rw-r--r--puppet/services/vip-hosts.yaml6
3 files changed, 9 insertions, 9 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index f2c4b631..d5764926 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -34,8 +34,8 @@ parameters:
The DNS name of this cloud's storage management endpoint. E.g.
'ci-overcloud.storagemgmt.tripleo.org'.
type: string
- CloudNameManagement:
- default: overcloud.management.localdomain
+ CloudNameCtlplane:
+ default: overcloud.ctlplane.localdomain
description: >
The DNS name of this cloud's storage management endpoint. E.g.
'ci-overcloud.management.tripleo.org'.
@@ -422,7 +422,7 @@ resources:
internal_api: {get_param: CloudNameInternal}
storage: {get_param: CloudNameStorage}
storage_mgmt: {get_param: CloudNameStorageManagement}
- management: {get_param: CloudNameManagement}
+ ctlplane: {get_param: CloudNameCtlplane}
NetIpMap: {get_attr: [VipMap, net_ip_map]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
@@ -665,7 +665,7 @@ resources:
cloud_name_internal_api: {get_param: CloudNameInternal}
cloud_name_storage: {get_param: CloudNameStorage}
cloud_name_storage_mgmt: {get_param: CloudNameStorageManagement}
- cloud_name_management: {get_param: CloudNameManagement}
+ cloud_name_ctlplane: {get_param: CloudNameCtlplane}
hosts:
- list_join:
- '\n'
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 69bb1935..05c58055 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
@@ -182,7 +182,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