From ee9b8f3a5d86c1258c717dc598a7bd34d47a367a Mon Sep 17 00:00:00 2001
From: Lokesh Jain <lokesh.jain@gmail.com>
Date: Thu, 1 Oct 2015 15:57:57 -0400
Subject: Changes for configuring Nuage

Added ExtraConfig templates and environment files for Nuage specific parameters.
Modified overcloud_compute.pp and overcloud_controller.pp to conditionally
include Nuage plugin and agents.

Change-Id: I95510c753b0a262c73566481f9e94279970f4a4f
---
 .../extraconfig/pre_deploy/compute/nova-nuage.yaml | 42 +++++++++++
 .../pre_deploy/controller/neutron-nuage.yaml       | 83 ++++++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
 create mode 100644 puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml

(limited to 'puppet/extraconfig/pre_deploy')

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..64d0a630
--- /dev/null
+++ b/puppet/extraconfig/pre_deploy/compute/nova-nuage.yaml
@@ -0,0 +1,42 @@
+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
+
+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}
+
+  NovaNuageDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: NovaNuageConfig}
+      server: {get_param: server}
+      input_values:
+        ActiveController: {get_param: NuageActiveController}
+        StandbyController: {get_param: NuageStandbyController}
+
+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]}
-- 
cgit 1.2.3-korg