From e8bfab8631613efba20710539043376bec05ecf2 Mon Sep 17 00:00:00 2001 From: Artem Savinov Date: Wed, 22 Jun 2016 15:45:45 +0300 Subject: [PATCH] Add neutron stop task, before start neutron configured with nsxv Closes-bug: #1595188 Change-Id: I298f11870ed5937a3b61c8f5476b426fe36fbd49 --- .../puppet/manifests/neutron-server-stop.pp | 8 ++++++++ deployment_tasks.yaml | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 deployment_scripts/puppet/manifests/neutron-server-stop.pp diff --git a/deployment_scripts/puppet/manifests/neutron-server-stop.pp b/deployment_scripts/puppet/manifests/neutron-server-stop.pp new file mode 100644 index 0000000..20f0939 --- /dev/null +++ b/deployment_scripts/puppet/manifests/neutron-server-stop.pp @@ -0,0 +1,8 @@ +notice('fuel-plugin-nsxv: neutron-server-stop.pp') + +include ::neutron::params + +service { 'neutron-server-stop': + ensure => 'stopped', + name => $::neutron::params::server_service, +} diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 48d2b1a..48213e8 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -70,6 +70,19 @@ puppet_manifest: puppet/manifests/neutron-server-policy.pp puppet_modules: puppet/modules timeout: 300 +- id: openstack-network-neutron-stop + version: 2.0.0 + refresh_on: [neutron_config] + type: puppet + groups: [controller] + required_for: [deploy_end] + requires: [openstack-network-neutron-policy,nsxv-install] + cross-depended-by: + - name: primary-openstack-network-neutron-start + parameters: + puppet_manifest: puppet/manifests/neutron-server-stop.pp + puppet_modules: puppet/modules + timeout: 60 - id: primary-openstack-network-neutron-start version: 2.0.0 refresh_on: [neutron_config]