6 files changed, 73 insertions, 16 deletions
diff --git a/puppet/services/README.rst b/puppet/services/README.rst
index a593d55e..38e2a280 100644
--- a/puppet/services/README.rst
+++ b/puppet/services/README.rst
@@ -99,12 +99,12 @@ It is also possible to use Mistral actions or workflows together with
 a deployment step, these are executed before the main configuration run.
 To describe actions or workflows from within a service use:
 
-  * service_workflow_tasks: One or more workflow task properties
+  * workflow_tasks: One or more workflow task properties
 
 which expects a map where the key is the step and the value a list of
 dictionaries descrbing each a workflow task, for example::
 
-  service_workflow_tasks:
+  workflow_tasks:
     step2:
       - name: echo
         action: std.echo output=Hello
diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index 011ec037..1c2da401 100644
--- a/puppet/services/kernel.yaml
+++ b/puppet/services/kernel.yaml
@@ -60,6 +60,11 @@ parameters:
                  ARP cache. The garbage collector will always run if there
                  are more than this number of entries in the cache.
     type: number
+  InotifyIntancesMax:
+    default: 1024
+    description: Configures sysctl fs.inotify.max_user_instances key
+    type: number
+
 
 outputs:
   role_data:
@@ -129,5 +134,9 @@ outputs:
             value: {get_param: NeighbourGcThreshold2}
           net.ipv4.neigh.default.gc_thresh3:
             value: {get_param: NeighbourGcThreshold3}
+          # set inotify value for neutron/dnsmasq scale
+          fs.inotify.max_user_instances:
+            value: {get_param: InotifyIntancesMax}
+
       step_config: |
         include ::tripleo::profile::base::kernel
diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml
index f1a56530..e594c2da 100644
--- a/puppet/services/neutron-compute-plugin-nuage.yaml
+++ b/puppet/services/neutron-compute-plugin-nuage.yaml
@@ -38,6 +38,39 @@ parameters:
     description: TCP Port to listen for metadata server requests
     type: string
     default: '9697'
+  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
+  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'
 
 outputs:
   role_data:
@@ -45,6 +78,16 @@ outputs:
     value:
       service_name: neutron_compute_plugin_nuage
       config_settings:
+        nuage::vrs::active_controller: {get_param: NuageActiveController}
+        nuage::vrs::standby_controller: {get_param: NuageStandbyController}
+        nuage::metadataagent::metadata_port: {get_param: NuageMetadataPort}
+        nuage::metadataagent::nova_metadata_port: {get_param: NuageNovaMetadataPort}
+        nuage::metadataagent::metadata_secret: {get_param: NuageMetadataProxySharedSecret}
+        nuage::metadataagent::nova_client_version: {get_param: NuageNovaClientVersion}
+        nuage::metadataagent::nova_os_username: {get_param: NuageNovaOsUsername}
+        nuage::metadataagent::metadata_agent_start_with_ovs: {get_param: NuageMetadataAgentStartWithOvs}
+        nuage::metadataagent::nova_api_endpoint_type: {get_param: NuageNovaApiEndpoint}
+        nuage::metadataagent::nova_region_name: {get_param: NuageNovaRegionName}
         tripleo::profile::base::neutron::agents::nuage::nova_os_tenant_name: 'service'
         tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword}
         tripleo::profile::base::neutron::agents::nuage::nova_auth_ip: {get_param: [EndpointMap, KeystoneInternal, host]}
diff --git a/puppet/services/neutron-plugin-ml2-nuage.yaml b/puppet/services/neutron-plugin-ml2-nuage.yaml
index a7dc2e8b..4cd541cc 100644
--- a/puppet/services/neutron-plugin-ml2-nuage.yaml
+++ b/puppet/services/neutron-plugin-ml2-nuage.yaml
@@ -67,6 +67,16 @@ parameters:
     type: boolean
     default: false
 
+  NovaPatchConfigMonkeyPatch:
+    description: Apply monkey patching or not
+    type: boolean
+    default: false
+
+  NovaPatchConfigMonkeyPatchModules:
+    description: List of modules/decorators to monkey patch
+    type: comma_delimited_list
+    default: ''
+
 resources:
 
   NeutronML2Base:
@@ -95,5 +105,7 @@ outputs:
             neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
             neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
             nova::api::use_forwarded_for: {get_param: UseForwardedFor}
+            nova::patch::config::monkey_patch: {get_param: NovaPatchConfigMonkeyPatch}
+            nova::patch::config::monkey_patch_modules: {get_param: NovaPatchConfigMonkeyPatchModules}
       step_config: |
         include tripleo::profile::base::neutron::plugins::ml2
diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml
index f4675875..cbbf2eaf 100644
--- a/puppet/services/pacemaker/cinder-volume.yaml
+++ b/puppet/services/pacemaker/cinder-volume.yaml
@@ -66,17 +66,9 @@ outputs:
             resource: openstack-cinder-volume
             state: disable
             wait_for_resource: true
-        - name: get bootstrap nodeid
-          tags: step5
-          command: hiera bootstrap_nodeid
-          register: bootstrap_node
-        - block:
-          - name: Sync cinder DB
-            tags: step5
-            command: cinder-manage db sync
-          - name: Start cinder_volume service (pacemaker)
-            tags: step5
-            pacemaker_resource:
-              resource: openstack-cinder-volume
-              state: enable
-          when: bootstrap_node.stdout == ansible_hostname
+      post_upgrade_tasks:
+        - name: Start cinder_volume service (pacemaker)
+          tags: step1
+          pacemaker_resource:
+            resource: openstack-cinder-volume
+            state: enable
diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml
index 541a2eb6..251d8092 100644
--- a/puppet/services/tacker.yaml
+++ b/puppet/services/tacker.yaml
@@ -114,6 +114,7 @@ outputs:
         tacker::keystone::authtoken::project_name: 'service'
         tacker::keystone::authtoken::user_domain_name: 'Default'
         tacker::keystone::authtoken::project_domain_name: 'Default'
+        tacker::keystone::authtoken::password: {get_param: TackerPassword}
         tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
         tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}