diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-26 12:58:18 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-26 13:01:03 +0400 |
| commit | c437e37d989ef882e258f06898f185909b337621 (patch) | |
| tree | c33a2acbde379dec0b68e426f55256131df7e509 | |
| parent | 20e1bdabfe3be305ad55987dad140479e4eaa5a0 (diff) | |
Fix salt target option in opendaylight state
Change-Id: Idf8b4b42dcc68bc55debaac9a8b5f1ca6b5b398e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rwxr-xr-x | mcp/config/states/opendaylight | 2 | ||||
| -rw-r--r-- | mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index b17b15ef1..c263f0f27 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -14,7 +14,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" # Get OpenDaylight server options with prefix odl_ function odl() { - salt --out txt -I 'opendaylight:server and *01*' pillar.get "opendaylight:server:odl_$1" | cut -d ' ' -f2 + salt --out txt -C 'I@opendaylight:server and *01*' pillar.get "opendaylight:server:odl_$1" | cut -d ' ' -f2 } wait_for 5.0 "salt -I 'opendaylight:server' state.sls opendaylight" diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch index 1f31755b2..7126e7d65 100644 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch @@ -33,7 +33,7 @@ index 2c75586..d7d4c49 100644 ARG RECLASS_BASE="/srv/salt/reclass" ENV RECLASS_BASE $RECLASS_BASE - RUN echo "Layer python/salt module prerequisites, formulas" \ -+ RUN echo "Layer python/salt module prerequisites, formulas (23 Oct 2018)" \ ++ RUN echo "Layer python/salt module prerequisites, formulas (26 Oct 2018)" \ && mkdir -p /srv/salt \ && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \ && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \ |