Merge "Enables OpenDaylight clustering in HA deployments"

[apex-tripleo-heat-templates.git] / puppet / extraconfig / pre_deploy / compute / nova-nuage.yaml

diff --git a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
index 64d0a63..1d16e90 100644 (file)
--- 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: ocata
 
 description: Configure hieradata for Nuage configuration on the Compute
 
@@ -13,29 +13,79 @@ parameters:
   NuageStandbyController:
     description: IP address of the Standby Virtualized Services Controller (VSC)
     type: string
+  NuageMetadataPort:
+    description: TCP Port to listen for metadata server requests
+    type: string
+    default: '9697'
+  NuageNovaMetadataPort:
+    description: TCP Port used by Nova metadata server
+    type: string
+    default: '8775'
+  NuageMetadataProxySharedSecret:
+    description: Shared secret to sign the instance-id request
+    type: string
+  NuageNovaClientVersion:
+    description: Client Version Nova
+    type: string
+    default: '2'
+  NuageNovaOsUsername:
+    description: Nova username in keystone_authtoken
+    type: string
+    default: 'nova'
+  NuageMetadataAgentStartWithOvs:
+    description: Set to True if nuage-metadata-agent needs to be started with nuage-openvswitch-switch
+    type: string
+    default: 'True'
+  NuageNovaApiEndpoint:
+    description: One of publicURL, internalURL, adminURL in "keystone endpoint-list"
+    type: string
+    default: 'publicURL'
+  NuageNovaRegionName:
+    description: Region name in "keystone endpoint-list"
+    type: string
+    default: 'regionOne'
 
+# Declaration of resources for the template.
 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}
+        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
     properties:
+      name: NovaNuageDeployment
       config: {get_resource: NovaNuageConfig}
       server: {get_param: server}
       input_values:
         ActiveController: {get_param: NuageActiveController}
         StandbyController: {get_param: NuageStandbyController}
+        MetadataPort: {get_param: NuageMetadataPort}
+        NovaMetadataPort: {get_param: NuageNovaMetadataPort}
+        SharedSecret: {get_param: NuageMetadataProxySharedSecret}
+        NovaClientVersion: {get_param: NuageNovaClientVersion}
+        NovaOsUsername: {get_param: NuageNovaOsUsername}
+        MetadataAgentStartWithOvs: {get_param: NuageMetadataAgentStartWithOvs}
+        NovaApiEndpointType: {get_param: NuageNovaApiEndpoint}
+        NovaRegionName: {get_param: NuageNovaRegionName}
 
+# Specify output parameters that will be available
+# after the template is instantiated.
 outputs:
   deploy_stdout:
     description: Deployment reference, used to trigger puppet apply on changes