diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-13 19:38:07 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-13 19:38:07 +0400 |
| commit | d9c4d1311a585f56e5e4ca62d4415581ab21759e (patch) | |
| tree | f68383e7925d6fe82aa5246118e7d58154dcf4d6 | |
| parent | de0bc2fc6e1c911630b0564a5ab384e27e1ea445 (diff) | |
[ovs/dpdk] Split out networking restart action
In common openstack_ha state the networking service restart
has no expected effect, so split it out into the detached
post-deployment state.
Change-Id: Iaaae0cd048474667895b7abf2a77196ee3dee14b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 1 | ||||
| -rwxr-xr-x | mcp/config/states/networking_gw | 12 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index 1766f9700..ee5ed4e3a 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -14,6 +14,7 @@ cluster: - dpdk - openstack_ha - networks + - networking_gw virtual: nodes: - cfg01 diff --git a/mcp/config/states/networking_gw b/mcp/config/states/networking_gw new file mode 100755 index 000000000..70fb67da4 --- /dev/null +++ b/mcp/config/states/networking_gw @@ -0,0 +1,12 @@ +#!/bin/bash -e +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x + +salt -I 'neutron:gateway' service.restart networking diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 1bd1a9d5a..fbddc6e83 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -50,7 +50,6 @@ salt -I 'cinder:volume' state.sls cinder salt -I 'neutron:server' state.sls neutron -b 1 salt -I 'neutron:gateway' state.sls neutron.gateway -salt -I 'neutron:gateway' service.restart networking salt -I 'nova:compute' state.sls nova |