Use the new hiera hook in all remaining templates

The new hiera hook in I21639f6aadabf9e49f40d1bb0b1d0edcfc4dbc5e
was added to most of the tripleo-heat-templates in
Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1

The new hook is installed by default if you use tripleo-common
Ia1864933235152b7e899c4442534879f8e22240d and will be installed
as part of the Newton to Ocata upgrades workflow in
I0c7a32194c0069b63a501a913c17907b47c9cc16

In order to use the new hiera data as part of the upgrade we
need to remove the old hieradata which will break anyone still
defining and using it. This change updates the remaining vendor
plugin manifests to use the new hiera hook. The pre-requisite
is that the new hook is installed on their overcloud (as above
it comes if you follow the N..O upgrade)

Change-Id: Ic95154734cb21e6b941c7f1569295b413963831d

5 files changed, 98 insertions, 103 deletions

diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
index 7fe2a842..533c0ee9 100644
--- a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
@@ -20,14 +20,13 @@ resources:
   NeutronBigswitchConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          datafiles:
-            neutron_bigswitch_data:
-              mapped_data:
-                neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
-                neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
+        datafiles:
+          neutron_bigswitch_data:
+            mapped_data:
+              neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
+              neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
 
   NeutronBigswitchDeployment:
     type: OS::Heat::StructuredDeployment
diff --git a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
index 47c782c7..1d16e909 100644
--- a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
@@ -50,22 +50,21 @@ resources:
   NovaNuageConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          datafiles:
-            nova_nuage_data:
-              mapped_data:
-               nuage::vrs::active_controller: {get_input: ActiveController}
-               nuage::vrs::standby_controller: {get_input: StandbyController}
-               nuage::metadataagent::metadata_port: {get_input: MetadataPort}
-               nuage::metadataagent::nova_metadata_port: {get_input: NovaMetadataPort}
-               nuage::metadataagent::metadata_secret: {get_input: SharedSecret}
-               nuage::metadataagent::nova_client_version: {get_input: NovaClientVersion}
-               nuage::metadataagent::nova_os_username: {get_input: NovaOsUsername}
-               nuage::metadataagent::metadata_agent_start_with_ovs: {get_input: MetadataAgentStartWithOvs}
-               nuage::metadataagent::nova_api_endpoint_type: {get_input: NovaApiEndpointType}
-               nuage::metadataagent::nova_region_name: {get_input: NovaRegionName}
+        datafiles:
+          nova_nuage_data:
+            mapped_data:
+             nuage::vrs::active_controller: {get_input: ActiveController}
+             nuage::vrs::standby_controller: {get_input: StandbyController}
+             nuage::metadataagent::metadata_port: {get_input: MetadataPort}
+             nuage::metadataagent::nova_metadata_port: {get_input: NovaMetadataPort}
+             nuage::metadataagent::metadata_secret: {get_input: SharedSecret}
+             nuage::metadataagent::nova_client_version: {get_input: NovaClientVersion}
+             nuage::metadataagent::nova_os_username: {get_input: NovaOsUsername}
+             nuage::metadataagent::metadata_agent_start_with_ovs: {get_input: MetadataAgentStartWithOvs}
+             nuage::metadataagent::nova_api_endpoint_type: {get_input: NovaApiEndpointType}
+             nuage::metadataagent::nova_region_name: {get_input: NovaRegionName}
 
   NovaNuageDeployment:
     type: OS::Heat::StructuredDeployment
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
index 763ae39a..378f7f98 100644
--- a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
@@ -91,35 +91,34 @@ resources:
   CinderNetappConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          datafiles:
-            cinder_netapp_data:
-              mapped_data:
-                tripleo::profile::base::cinder::volume::cinder_enable_netapp_backend: {get_input: EnableNetappBackend}
-                cinder::backend::netapp::title: {get_input: NetappBackendName}
-                cinder::backend::netapp::netapp_login: {get_input: NetappLogin}
-                cinder::backend::netapp::netapp_password: {get_input: NetappPassword}
-                cinder::backend::netapp::netapp_server_hostname: {get_input: NetappServerHostname}
-                cinder::backend::netapp::netapp_server_port: {get_input: NetappServerPort}
-                cinder::backend::netapp::netapp_size_multiplier: {get_input: NetappSizeMultiplier}
-                cinder::backend::netapp::netapp_storage_family: {get_input: NetappStorageFamily}
-                cinder::backend::netapp::netapp_storage_protocol: {get_input: NetappStorageProtocol}
-                cinder::backend::netapp::netapp_transport_type: {get_input: NetappTransportType}
-                cinder::backend::netapp::netapp_vfiler: {get_input: NetappVfiler}
-                cinder::backend::netapp::netapp_volume_list: {get_input: NetappVolumeList}
-                cinder::backend::netapp::netapp_vserver: {get_input: NetappVserver}
-                cinder::backend::netapp::netapp_partner_backend_name: {get_input: NetappPartnerBackendName}
-                cinder::backend::netapp::nfs_shares: {get_input: NetappNfsShares}
-                cinder::backend::netapp::nfs_shares_config: {get_input: NetappNfsSharesConfig}
-                cinder::backend::netapp::nfs_mount_options: {get_input: NetappNfsMountOptions}
-                cinder::backend::netapp::netapp_copyoffload_tool_path: {get_input: NetappCopyOffloadToolPath}
-                cinder::backend::netapp::netapp_controller_ips: {get_input: NetappControllerIps}
-                cinder::backend::netapp::netapp_sa_password: {get_input: NetappSaPassword}
-                cinder::backend::netapp::netapp_storage_pools: {get_input: NetappStoragePools}
-                cinder::backend::netapp::netapp_host_type: {get_input: NetappHostType}
-                cinder::backend::netapp::netapp_webservice_path: {get_input: NetappWebservicePath}
+        datafiles:
+          cinder_netapp_data:
+            mapped_data:
+              tripleo::profile::base::cinder::volume::cinder_enable_netapp_backend: {get_input: EnableNetappBackend}
+              cinder::backend::netapp::title: {get_input: NetappBackendName}
+              cinder::backend::netapp::netapp_login: {get_input: NetappLogin}
+              cinder::backend::netapp::netapp_password: {get_input: NetappPassword}
+              cinder::backend::netapp::netapp_server_hostname: {get_input: NetappServerHostname}
+              cinder::backend::netapp::netapp_server_port: {get_input: NetappServerPort}
+              cinder::backend::netapp::netapp_size_multiplier: {get_input: NetappSizeMultiplier}
+              cinder::backend::netapp::netapp_storage_family: {get_input: NetappStorageFamily}
+              cinder::backend::netapp::netapp_storage_protocol: {get_input: NetappStorageProtocol}
+              cinder::backend::netapp::netapp_transport_type: {get_input: NetappTransportType}
+              cinder::backend::netapp::netapp_vfiler: {get_input: NetappVfiler}
+              cinder::backend::netapp::netapp_volume_list: {get_input: NetappVolumeList}
+              cinder::backend::netapp::netapp_vserver: {get_input: NetappVserver}
+              cinder::backend::netapp::netapp_partner_backend_name: {get_input: NetappPartnerBackendName}
+              cinder::backend::netapp::nfs_shares: {get_input: NetappNfsShares}
+              cinder::backend::netapp::nfs_shares_config: {get_input: NetappNfsSharesConfig}
+              cinder::backend::netapp::nfs_mount_options: {get_input: NetappNfsMountOptions}
+              cinder::backend::netapp::netapp_copyoffload_tool_path: {get_input: NetappCopyOffloadToolPath}
+              cinder::backend::netapp::netapp_controller_ips: {get_input: NetappControllerIps}
+              cinder::backend::netapp::netapp_sa_password: {get_input: NetappSaPassword}
+              cinder::backend::netapp::netapp_storage_pools: {get_input: NetappStoragePools}
+              cinder::backend::netapp::netapp_host_type: {get_input: NetappHostType}
+              cinder::backend::netapp::netapp_webservice_path: {get_input: NetappWebservicePath}
 
   CinderNetappDeployment:
     type: OS::Heat::StructuredDeployment
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
index 0f4806db..1456337f 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
@@ -38,19 +38,18 @@ resources:
   NeutronBigswitchConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          datafiles:
-            neutron_bigswitch_data:
-              mapped_data:
-                neutron::plugins::ml2::bigswitch::restproxy::servers: {get_input: restproxy_servers}
-                neutron::plugins::ml2::bigswitch::restproxy::server_auth: {get_input: restproxy_server_auth}
-                neutron::plugins::ml2::bigswitch::restproxy::auto_sync_on_failure: {get_input: restproxy_auto_sync_on_failure}
-                neutron::plugins::ml2::bigswitch::restproxy::consistency_interval: {get_input: restproxy_consistency_interval}
-                neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
-                neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
-                neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
+        datafiles:
+          neutron_bigswitch_data:
+            mapped_data:
+              neutron::plugins::ml2::bigswitch::restproxy::servers: {get_input: restproxy_servers}
+              neutron::plugins::ml2::bigswitch::restproxy::server_auth: {get_input: restproxy_server_auth}
+              neutron::plugins::ml2::bigswitch::restproxy::auto_sync_on_failure: {get_input: restproxy_auto_sync_on_failure}
+              neutron::plugins::ml2::bigswitch::restproxy::consistency_interval: {get_input: restproxy_consistency_interval}
+              neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
+              neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
+              neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
 
   NeutronBigswitchDeployment:
     type: OS::Heat::StructuredDeployment
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
index 6eae812f..bca6010a 100644
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
@@ -96,48 +96,47 @@ resources:
   CiscoN1kvConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          datafiles:
-            cisco_n1kv_data:
-              mapped_data:
-                #enable_cisco_n1kv: {get_input: EnableCiscoN1kv}
-                # VEM Parameters
-                n1kv_vem_source: {get_input: n1kv_vem_source}
-                n1kv_vem_version: {get_input: n1kv_vem_version}
-                neutron::agents::n1kv_vem::n1kv_vsm_ip: {get_input: n1kv_vsm_ip}
-                neutron::agents::n1kv_vem::n1kv_vsm_domain_id: {get_input: n1kv_vsm_domain_id}
-                neutron::agents::n1kv_vem::n1kv_vsm_ip_v6: {get_input: n1kv_vsm_ip_v6}
-                neutron::agents::n1kv_vem::host_mgmt_intf: {get_input: n1kv_vem_host_mgmt_intf}
-                neutron::agents::n1kv_vem::uplink_profile: {get_input: n1kv_vem_uplink_profile}
-                neutron::agents::n1kv_vem::vtep_config: {get_input: n1kv_vem_vtep_config}
-                neutron::agents::n1kv_vem::portdb: {get_input: n1kv_vem_portdb}
-                neutron::agents::n1kv_vem::vteps_in_same_subnet: {get_input: n1kv_vem_vteps_in_same_subnet}
-                neutron::agents::n1kv_vem::fastpath_flood: {get_input: n1kv_vem_fastpath_flood}
-                #VSM Parameter
-                n1kv_vsm_source: {get_input: n1kv_vsm_source}
-                n1kv_vsm_version: {get_input: n1kv_vsm_version}
-                n1k_vsm::phy_if_bridge: {get_input: n1kv_vsm_host_mgmt_intf}
-                n1k_vsm::vsm_role: {get_input: n1kv_vsm_role}
-                n1k_vsm::pacemaker_control: {get_input: n1kv_vsm_pacemaker_ctrl}
-                n1k_vsm::existing_bridge: {get_input: n1kv_vsm_existing_br}
-                n1k_vsm::vsm_admin_passwd: {get_input: n1kv_vsm_password}
-                n1k_vsm::vsm_domain_id: {get_input: n1kv_vsm_domain_id}
-                n1k_vsm::vsm_mgmt_ip: {get_input: n1kv_vsm_ip}
-                n1k_vsm::vsm_mgmt_netmask: {get_input: n1kv_vsm_mgmt_netmask}
-                n1k_vsm::vsm_mgmt_gateway: {get_input: n1kv_vsm_gateway_ip}
-                n1k_vsm::phy_gateway: {get_input: n1kv_vsm_gateway_ip}
-                n1k_vsm::phy_bridge_vlan: {get_input: n1kv_phy_brige_vlan}
-                # Cisco N1KV driver Parameters
-                neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_ip: {get_input: n1kv_vsm_ip}
-                neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_username: {get_input: n1kv_vsm_username}
-                neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_password: {get_input: n1kv_vsm_password}
-                neutron::plugins::ml2::cisco::nexus1000v::poll_duration: {get_input: n1kv_vsm_poll_duration}
-                neutron::plugins::ml2::cisco::nexus1000v::http_pool_size: {get_input: n1kv_vsm_http_pool_size}
-                neutron::plugins::ml2::cisco::nexus1000v::http_timeout: {get_input: n1kv_vsm_http_timeout}
-                neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_sync_interval: {get_input: n1kv_vsm_sync_interval}
-                neutron::plugins::ml2::cisco::nexus1000v::max_vsm_retries: {get_input: n1kv_max_vsm_retries}
+        datafiles:
+          cisco_n1kv_data:
+            mapped_data:
+              #enable_cisco_n1kv: {get_input: EnableCiscoN1kv}
+              # VEM Parameters
+              n1kv_vem_source: {get_input: n1kv_vem_source}
+              n1kv_vem_version: {get_input: n1kv_vem_version}
+              neutron::agents::n1kv_vem::n1kv_vsm_ip: {get_input: n1kv_vsm_ip}
+              neutron::agents::n1kv_vem::n1kv_vsm_domain_id: {get_input: n1kv_vsm_domain_id}
+              neutron::agents::n1kv_vem::n1kv_vsm_ip_v6: {get_input: n1kv_vsm_ip_v6}
+              neutron::agents::n1kv_vem::host_mgmt_intf: {get_input: n1kv_vem_host_mgmt_intf}
+              neutron::agents::n1kv_vem::uplink_profile: {get_input: n1kv_vem_uplink_profile}
+              neutron::agents::n1kv_vem::vtep_config: {get_input: n1kv_vem_vtep_config}
+              neutron::agents::n1kv_vem::portdb: {get_input: n1kv_vem_portdb}
+              neutron::agents::n1kv_vem::vteps_in_same_subnet: {get_input: n1kv_vem_vteps_in_same_subnet}
+              neutron::agents::n1kv_vem::fastpath_flood: {get_input: n1kv_vem_fastpath_flood}
+              #VSM Parameter
+              n1kv_vsm_source: {get_input: n1kv_vsm_source}
+              n1kv_vsm_version: {get_input: n1kv_vsm_version}
+              n1k_vsm::phy_if_bridge: {get_input: n1kv_vsm_host_mgmt_intf}
+              n1k_vsm::vsm_role: {get_input: n1kv_vsm_role}
+              n1k_vsm::pacemaker_control: {get_input: n1kv_vsm_pacemaker_ctrl}
+              n1k_vsm::existing_bridge: {get_input: n1kv_vsm_existing_br}
+              n1k_vsm::vsm_admin_passwd: {get_input: n1kv_vsm_password}
+              n1k_vsm::vsm_domain_id: {get_input: n1kv_vsm_domain_id}
+              n1k_vsm::vsm_mgmt_ip: {get_input: n1kv_vsm_ip}
+              n1k_vsm::vsm_mgmt_netmask: {get_input: n1kv_vsm_mgmt_netmask}
+              n1k_vsm::vsm_mgmt_gateway: {get_input: n1kv_vsm_gateway_ip}
+              n1k_vsm::phy_gateway: {get_input: n1kv_vsm_gateway_ip}
+              n1k_vsm::phy_bridge_vlan: {get_input: n1kv_phy_brige_vlan}
+              # Cisco N1KV driver Parameters
+              neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_ip: {get_input: n1kv_vsm_ip}
+              neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_username: {get_input: n1kv_vsm_username}
+              neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_password: {get_input: n1kv_vsm_password}
+              neutron::plugins::ml2::cisco::nexus1000v::poll_duration: {get_input: n1kv_vsm_poll_duration}
+              neutron::plugins::ml2::cisco::nexus1000v::http_pool_size: {get_input: n1kv_vsm_http_pool_size}
+              neutron::plugins::ml2::cisco::nexus1000v::http_timeout: {get_input: n1kv_vsm_http_timeout}
+              neutron::plugins::ml2::cisco::nexus1000v::n1kv_vsm_sync_interval: {get_input: n1kv_vsm_sync_interval}
+              neutron::plugins::ml2::cisco::nexus1000v::max_vsm_retries: {get_input: n1kv_max_vsm_retries}
 
   CiscoN1kvDeployment:
     type: OS::Heat::StructuredDeployment