diff options
| -rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 1 | ||||
| -rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-noha.yaml | 1 | ||||
| -rw-r--r-- | mcp/config/scenario/os-ovn-nofeature-noha.yaml | 1 | ||||
| -rwxr-xr-x | mcp/config/states/neutron_compute | 12 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 1 | ||||
| -rw-r--r-- | mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch | 39 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
7 files changed, 41 insertions, 15 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 4af625b25..3a36ae297 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -11,7 +11,6 @@ cluster: states: - openstack_noha - neutron_gateway - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index a1e53e750..eed17c1a4 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -12,7 +12,6 @@ cluster: - dpdk - openstack_noha - neutron_gateway - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index 8f29d7bb1..0e4d644d7 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -11,7 +11,6 @@ cluster: states: - openstack_noha - ovn_ctl_opts - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute deleted file mode 100755 index c6b90e20d..000000000 --- a/mcp/config/states/neutron_compute +++ /dev/null @@ -1,12 +0,0 @@ -#!/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:compute' state.sls neutron diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 9fc30bbf1..4c8cbcf8a 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -42,6 +42,7 @@ salt -I 'cinder:controller' state.sls cinder wait_for 3 "salt -I 'cinder:volume' state.sls cinder" salt -I 'neutron:server' state.sls neutron +salt -I 'neutron:compute' state.sls neutron salt -I 'nova:compute' state.sls nova diff --git a/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch b/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch new file mode 100644 index 000000000..4c1d2ce8f --- /dev/null +++ b/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch @@ -0,0 +1,39 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Mon, 12 Mar 2018 16:32:50 +0400 +Subject: [PATCH] Apply opendaylight client state on compute only + +Change-Id: I07cd760fdb4ce84aba21450af9246c8c9128118f + +diff --git a/neutron/compute.sls b/neutron/compute.sls +index 418282d..7ff136a 100644 +--- a/neutron/compute.sls ++++ b/neutron/compute.sls +@@ -2,6 +2,10 @@ + {%- if compute.enabled %} + + {% if compute.backend.engine == "ml2" %} ++{%- if compute.opendaylight is defined %} ++include: ++ - .opendaylight.client ++{%- else %} + neutron_compute_packages: + pkg.installed: + - names: {{ compute.pkgs }} +@@ -243,9 +247,6 @@ rabbitmq_ca_neutron_compute: + {%- endif %} + {%- endif %} + +-{%- if compute.opendaylight is defined %} +-include: +- - .opendaylight.client + {%- endif %} + + {%- elif compute.backend.engine == "ovn" %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index ca8ef17ce..9c460f8e8 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -5,6 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +/usr/share/salt-formulas/env: 0001-Apply-opendaylight-client-state-on-compute-only.patch /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch |