diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/README.rst | 4 | ||||
| -rw-r--r-- | puppet/services/neutron-base.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/neutron-plugin-ml2-nuage.yaml | 12 | ||||
| -rw-r--r-- | puppet/services/neutron-plugin-nsx.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/pacemaker/cinder-volume.yaml | 20 | ||||
| -rw-r--r-- | puppet/services/tacker.yaml | 1 |
6 files changed, 23 insertions, 18 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/neutron-base.yaml b/puppet/services/neutron-base.yaml index af3f8637..9e493c3e 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -33,7 +33,7 @@ parameters: DhcpAgentNotification: default: true description: Whether or not to enable DHCP agent notifications. - type: string + type: boolean NeutronDnsDomain: type: string default: openstacklocal 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/neutron-plugin-nsx.yaml b/puppet/services/neutron-plugin-nsx.yaml index 26380649..ad0fc7f8 100644 --- a/puppet/services/neutron-plugin-nsx.yaml +++ b/puppet/services/neutron-plugin-nsx.yaml @@ -49,7 +49,7 @@ parameters: NativeDhcpMetadata: default: True description: This is the flag to indicate if using native DHCP/Metadata or not. - type: string + type: boolean DhcpProfileUuid: description: This is the UUID of the NSX DHCP Profile that will be used to enable native DHCP service. 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]} |