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

diff --git a/overcloud.yaml b/overcloud.yaml
index f2c4b63..d576492 100644 (file)
--- 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 69bb193..05c5805 100644 (file)
--- 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 445a276..a9d757e 100644 (file)
--- 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