2 files changed, 175 insertions, 0 deletions
diff --git a/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
new file mode 100644
index 00000000..96368e37
--- /dev/null
+++ b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
@@ -0,0 +1,92 @@
+heat_template_version: 2015-04-30
+
+description: Configure hieradata for Nuage configuration on the Compute
+
+parameters:
+  server:
+    description: ID of the compute node to apply this config to
+    type: string
+
+  NuageActiveController:
+    description: IP address of the Active Virtualized Services Controller (VSC)
+    type: string
+  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
+      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}
+
+  NovaNuageDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      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
+    value: {get_attr: [NovaNuageDeployment, deploy_stdout]}
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
new file mode 100644
index 00000000..60f02bf8
--- /dev/null
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
@@ -0,0 +1,83 @@
+heat_template_version: 2015-04-30
+
+description: Configure hieradata for Nuage configuration on the Controller
+
+parameters:
+  server:
+    description: ID of the controller node to apply this config to
+    type: string
+
+  # Config specific parameters, to be provided via parameter_defaults
+  NeutronNuageOSControllerIp:
+    description: IP address of the OpenStack Controller
+    type: string
+
+  NeutronNuageNetPartitionName:
+    description: Specifies the title that you will see on the VSD
+    type: string
+    default: 'default_name'
+
+  NeutronNuageVSDIp:
+    description: IP address and port of the Virtual Services Directory
+    type: string
+
+  NeutronNuageVSDUsername:
+    description: Username to be used to log into VSD
+    type: string
+
+  NeutronNuageVSDPassword:
+    description: Password to be used to log into VSD
+    type: string
+
+  NeutronNuageVSDOrganization:
+    description: Organization parameter required to log into VSD
+    type: string
+    default: 'organization'
+
+  NeutronNuageBaseURIVersion:
+    description: URI version to be used based on the VSD release
+    type: string
+    default: 'default_uri_version'
+
+  NeutronNuageCMSId:
+    description: Cloud Management System ID (CMS ID) to distinguish between OS instances on the same VSD
+    type: string
+
+resources:
+  NeutronNuageConfig:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
+      config:
+        hiera:
+          datafiles:
+            neutron_nuage_data:
+              mapped_data:
+               neutron::plugins::nuage::nuage_oscontroller_ip: {get_input: NuageOSControllerIp}
+               neutron::plugins::nuage::nuage_net_partition_name: {get_input: NuageNetPartitionName}
+               neutron::plugins::nuage::nuage_vsd_ip: {get_input: NuageVSDIp}
+               neutron::plugins::nuage::nuage_vsd_username: {get_input: NuageVSDUsername}
+               neutron::plugins::nuage::nuage_vsd_password: {get_input: NuageVSDPassword}
+               neutron::plugins::nuage::nuage_vsd_organization: {get_input: NuageVSDOrganization}
+               neutron::plugins::nuage::nuage_base_uri_version: {get_input: NuageBaseURIVersion}
+               neutron::plugins::nuage::nuage_cms_id: {get_input: NuageCMSId}
+
+  NeutronNuageDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: NeutronNuageConfig}
+      server: {get_param: server}
+      input_values:
+        NuageOSControllerIp: {get_param: NeutronNuageOSControllerIp}
+        NuageNetPartitionName: {get_param: NeutronNuageNetPartitionName}
+        NuageVSDIp: {get_param: NeutronNuageVSDIp}
+        NuageVSDUsername: {get_param: NeutronNuageVSDUsername}
+        NuageVSDPassword: {get_param: NeutronNuageVSDPassword}
+        NuageVSDOrganization: {get_param: NeutronNuageVSDOrganization}
+        NuageBaseURIVersion: {get_param: NeutronNuageBaseURIVersion}
+        NuageCMSId: {get_param: NeutronNuageCMSId}
+
+outputs:
+  deploy_stdout:
+    description: Deployment reference, used to trigger puppet apply on changes
+    value: {get_attr: [NeutronNuageDeployment, deploy_stdout]}