Remove some properties from overcloud.yaml Controller group

Remove those parameters which simply shadow parameters defined in
puppet/controller.yaml, these can be passed via parameter_defaults,
which is the default.  The remaining properties are more tricky so
will be handled via subsequent patches.

Partially-Implements: blueprint custom-roles
Change-Id: I9bbbd12631de8cb1ad83e265f6ddc9e942dff9ab

1 files changed, 1 insertions, 127 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index 38944d72..f2c99d21 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -16,10 +16,6 @@ parameters:
     description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     type: string
     hidden: true
-  AodhPassword:
-    description: The password for the aodh services.
-    type: string
-    hidden: true
   CinderEnableNfsBackend:
     default: false
     description: Whether to enable or not the NFS backend for Cinder
@@ -36,18 +32,10 @@ parameters:
     default: []
     description: Should be used for arbitrary ips.
     type: json
-  CorosyncIPv6:
-    default: false
-    description: Enable IPv6 in Corosync
-    type: boolean
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
     type: string
-  HAProxySyslogAddress:
-    default: /dev/log
-    description: Syslog address where HAproxy will send its log
-    type: string
   ImageUpdatePolicy:
     default: 'REBUILD_PRESERVE_EPHEMERAL'
     description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
@@ -64,10 +52,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.keypair
-  MemcachedIPv6:
-    default: false
-    description: Enable IPv6 features in Memcached.
-    type: boolean
   NeutronControlPlaneID:
     default: 'ctlplane'
     type: string
@@ -116,10 +100,6 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
-  RedisPassword:
-    description: The password for Redis
-    type: string
-    hidden: true
   StorageVirtualFixedIPs:
     default: []
     description: >
@@ -165,18 +145,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.flavor
-  ControlVirtualInterface:
-    default: 'br-ex'
-    description: Interface where virtual ip will be assigned.
-    type: string
-  EnableFencing:
-    default: false
-    description: Whether to enable fencing in Pacemaker or not.
-    type: boolean
-  EnableGalera:
-    default: true
-    description: Whether to use Galera instead of regular MariaDB.
-    type: boolean
   ControllerSchedulerHints:
     type: json
     description: Optional scheduler hints to pass to nova
@@ -188,74 +156,12 @@ parameters:
       may be implementation specific, e.g puppet hieradata.  Any role specific
       ExtraConfig, e.g controllerExtraConfig takes precedence over ExtraConfig.
     type: json
-  FencingConfig:
-    default: {}
-    description: |
-      Pacemaker fencing configuration. The JSON should have
-      the following structure:
-        {
-          "devices": [
-            {
-              "agent": "AGENT_NAME",
-              "host_mac": "HOST_MAC_ADDRESS",
-              "params": {"PARAM_NAME": "PARAM_VALUE"}
-            }
-          ]
-        }
-      For instance:
-        {
-          "devices": [
-            {
-              "agent": "fence_xvm",
-              "host_mac": "52:54:00:aa:bb:cc",
-              "params": {
-                "multicast_address": "225.0.0.12",
-                "port": "baremetal_0",
-                "manage_fw": true,
-                "manage_key_file": true,
-                "key_file": "/etc/fence_xvm.key",
-                "key_file_password": "abcdef"
-              }
-            }
-          ]
-        }
-    type: json
-    type: string
-    hidden: true
-  InstanceNameTemplate:
-    default: 'instance-%08x'
-    description: Template string to be used to generate instance names
-    type: string
-  ManageFirewall:
-    default: true
-    description: Whether to manage IPtables rules.
-    type: boolean
-  PurgeFirewallRules:
-    default: false
-    description: Whether IPtables rules should be purged before setting up the ones.
-    type: boolean
-  MysqlInnodbBufferPoolSize:
-    description: >
-        Specifies the size of the buffer pool in megabytes. Setting to
-        zero should be interpreted as "no value" and will defer to the
-        lower level default.
-    type: number
-    default: 0
-  MysqlMaxConnections:
-    description: Configures MySQL max_connections config setting
-    type: number
-    default: 4096
-  PublicVirtualInterface:
-    default: 'br-ex'
-    description: >
-        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
   SwiftHashSuffix:
     description: A random string to be used as a salt when hashing to determine mappings in the ring.
     type: string
     hidden: true
 
+
 # Compute-specific params
   ComputeCount:
     type: number
@@ -664,58 +570,26 @@ resources:
       resource_def:
         type: OS::TripleO::Controller
         properties:
-          AdminPassword: {get_param: AdminPassword}
-          AodhPassword: {get_param: AodhPassword}
-          CloudDomain: {get_param: CloudDomain}
-          ControlVirtualInterface: {get_param: ControlVirtualInterface}
           controllerExtraConfig: {get_param: controllerExtraConfig}
-          CorosyncIPv6: {get_param: CorosyncIPv6}
-          Debug: {get_param: Debug}
-          EnableFencing: {get_param: EnableFencing}
-          ManageFirewall: {get_param: ManageFirewall}
-          PurgeFirewallRules: {get_param: PurgeFirewallRules}
-          EnableGalera: {get_param: EnableGalera}
-          ExtraConfig: {get_param: ExtraConfig}
-          FencingConfig: {get_param: FencingConfig}
           Flavor: {get_param: OvercloudControlFlavor}
-          HAProxySyslogAddress: {get_param: HAProxySyslogAddress}
           HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
           HorizonSecret: {get_resource: HorizonSecret}
           Image: {get_param: controllerImage}
-          ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
-          InstanceNameTemplate: {get_param: InstanceNameTemplate}
-          KeyName: {get_param: KeyName}
-          MemcachedIPv6: {get_param: MemcachedIPv6}
           MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
-          MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize}
-          MysqlMaxConnections: {get_param: MysqlMaxConnections}
           MysqlRootPassword: {get_attr: [MysqlRootPassword, value]}
-          NeutronPublicInterface: {get_param: NeutronPublicInterface}
-          NeutronPassword: {get_param: NeutronPassword}
-          NovaIPv6: {get_param: NovaIPv6}
-          NovaPassword: {get_param: NovaPassword}
           PcsdPassword: {get_resource: PcsdPassword}
-          PublicVirtualInterface: {get_param: PublicVirtualInterface}
-          RabbitPassword: {get_param: RabbitPassword}
-          RabbitUserName: {get_param: RabbitUserName}
           RabbitCookie: {get_attr: [RabbitCookie, value]}
-          RabbitClientUseSSL: {get_param: RabbitClientUseSSL}
-          RabbitClientPort: {get_param: RabbitClientPort}
-          RedisPassword: {get_param: RedisPassword}
           RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
           RedisVirtualIPUri: {get_attr: [RedisVirtualIP, ip_address_uri]}
-          SwiftHashSuffix: {get_param: SwiftHashSuffix}
           ServiceNetMap: {get_param: ServiceNetMap}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
           MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
-          UpdateIdentifier: {get_param: UpdateIdentifier}
           Hostname:
             str_replace:
               template: {get_param: ControllerHostnameFormat}
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
           NodeIndex: '%index%'
-          ServerMetadata: {get_param: ServerMetadata}
           SchedulerHints: {get_param: ControllerSchedulerHints}
           ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
           ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}