X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fextraconfig%2Fpre_deploy%2Fcompute%2Fnova-nuage.yaml;h=ea2fd71cb66135400c906c448caa94ebabfa7f7e;hb=0a0e2ee629a143efe29bb00ffb06c90515f0e504;hp=5561c74a72cbc71a45be815835ff4a3456538ff3;hpb=795e4290dd6b12a8f4b7c6932a3777a036195081;p=apex-tripleo-heat-templates.git

diff --git a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
index 5561c74a..ea2fd71c 100644
--- a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: Configure hieradata for Nuage configuration on the Compute
 
@@ -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