X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller.yaml;h=e9833b4cd50d62d9dd97e572a7d1c92ab6d42256;hb=6fab74a693b6068c3c4ccc1ff4477e60dff4a0fe;hp=fba8ba1862be3277cbd9f86e0bf58629cb953ff3;hpb=b5781172ba18d57d8c586c62102e6e856fb55bf6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index fba8ba18..e9833b4c 100644
--- 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
@@ -343,36 +322,17 @@ parameters:
     default: true
     description: Whether to manage Swift rings or not
     type: boolean
-  SwiftProxyVirtualIP:
-    type: string
-    default: ''
   SwiftReplicas:
     type: number
     default: 3
     description: How many replicas to use in the swift rings.
-  TimeZone:
-    default: 'UTC'
-    description: The timezone to be set on controller nodes.
-    type: string
   UpgradeLevelNovaCompute:
     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
@@ -724,7 +684,6 @@ resources:
         rabbit_cookie: {get_param: RabbitCookie}
         rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
         rabbit_client_port: {get_param: RabbitClientPort}
-        timezone: {get_param: TimeZone}
         control_virtual_interface: {get_param: ControlVirtualInterface}
         public_virtual_interface: {get_param: PublicVirtualInterface}
         swift_hash_suffix: {get_param: SwiftHashSuffix}
@@ -773,6 +732,7 @@ resources:
         ceph_cluster_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
         ceph_public_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
         ceph_public_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
+        ironic_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, IronicApiNetwork]}]}
 
   # Map heat metadata into hiera datafiles
   ControllerConfig:
@@ -1036,7 +996,6 @@ resources:
                 # Misc
                 memcached_ipv6: {get_input: memcached_ipv6}
                 memcached::listen_ip: {get_input: memcached_network}
-                timezone::timezone: {get_input: timezone}
                 control_virtual_interface: {get_input: control_virtual_interface}
                 public_virtual_interface: {get_input: public_virtual_interface}
                 tripleo::keepalived::control_virtual_interface: {get_input: control_virtual_interface}