Merge "Drop unused VIP params to controller.yaml"

diff --git a/overcloud.yaml b/overcloud.yaml
index 9c2b802..9bd3a57 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -872,22 +872,9 @@ resources:
           SwiftPartPower: {get_param: SwiftPartPower}
           SwiftReplicas: { get_param: SwiftReplicas}
           TimeZone: {get_param: TimeZone}
-          VirtualIP: {get_attr: [VipMap, net_ip_map, ctlplane]} # deprecated. Use per service VIP settings instead now.
-          PublicVirtualIP: {get_attr: [VipMap, net_ip_map, external]}
           ServiceNetMap: {get_param: ServiceNetMap}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
-          CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
-          AodhApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
-          GnocchiApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GnocchiApiNetwork]}]}
-          CinderApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
-          HeatApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
-          HeatApiVirtualIPUri: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
-          NovaApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
-          SwiftProxyVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
           MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
-          NeutronApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
-          NovaApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
-          SaharaApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           Hostname:
             str_replace:

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 6e703b9..c9df00c 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -8,18 +8,12 @@ parameters:
     description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     type: string
     hidden: true
-  AodhApiVirtualIP:
-    type: string
-    default: ''
   AodhPassword:
     description: The password for the aodh services.
     type: string
     hidden: true
   #TODO(composable Redis): Remove the Redis password param
   #As is used by ceilometer
-  CeilometerApiVirtualIP:
-    type: string
-    default: ''
   CeilometerBackend:
     default: 'mongodb'
     description: The ceilometer backend type.
@@ -42,9 +36,6 @@ parameters:
     type: string
     constraints:
     - allowed_values: ['gnocchi', 'database']
-  CinderApiVirtualIP:
-    type: string
-    default: ''
   CeilometerWorkers:
     default: 0
     description: Number of workers for Ceilometer service.
@@ -150,9 +141,6 @@ parameters:
     default: 'mysql'
     description: The short name of the Gnocchi indexer backend to use.
     type: string
-  GnocchiApiVirtualIP:
-    type: string
-    default: ''
   GnocchiPassword:
     description: The password for the gnocchi service and db account.
     type: string
@@ -215,9 +203,6 @@ parameters:
     default: false
     description: Whether IPtables rules should be purged before setting up the new ones.
     type: boolean
-  SaharaApiVirtualIP:
-    type: string
-    default: ''
   MysqlClusterUniquePart:
     description: A unique identifier of the MySQL cluster the controller is in.
     type: string
@@ -264,9 +249,6 @@ parameters:
       will determine the MTU that is assigned to the VM host through DHCP.
     default: 1400
     type: number
-  NovaApiVirtualIP:
-    type: string
-    default: ''
   NovaEnableDBPurge:
     default: true
     description: |
@@ -290,9 +272,6 @@ parameters:
         Specifies the interface where the public-facing virtual ip will be assigned.
         This should be int_public when a VLAN is being used.
     type: string
-  PublicVirtualIP:
-    type: string
-    default: ''  # Has to be here because of the ignored empty value bug
   RabbitCookie:
     type: string
     default: ''  # Has to be here because of the ignored empty value bug
@@ -351,9 +330,6 @@ parameters:
     default: true
     description: Whether to manage Swift rings or not
     type: boolean
-  SwiftProxyVirtualIP:
-    type: string
-    default: ''
   SwiftReplicas:
     type: number
     default: 3
@@ -366,21 +342,9 @@ parameters:
     type: string
     description: Nova Compute upgrade level
     default: ''
-  VirtualIP: # DEPRECATED: use per service settings instead
-    type: string
-    default: ''  # Has to be here because of the ignored empty value bug
-  HeatApiVirtualIP:
-    type: string
-    default: ''
-  HeatApiVirtualIPUri:
-    type: string
-    default: ''
   MysqlVirtualIP:
     type: string
     default: ''
-  NeutronApiVirtualIP:
-    type: string
-    default: ''
   EnablePackageInstall:
     default: 'false'
     description: Set to true to enable package installation via Puppet