diff options
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch | 16 |
1 files changed, 11 insertions, 5 deletions
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 5ad57bb5f..9a0a0cf88 100644 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch @@ -20,20 +20,26 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user `salt_minion_reclass_dependencies`; Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - DockerMake.yml | 36 +++++++++++++++++++++++++++++++++++- - 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/DockerMake.yml b/DockerMake.yml -index 2c75586..d7d4c49 100644 +index 2c75586..13813a2 100644 --- a/DockerMake.yml +++ b/DockerMake.yml +@@ -94,7 +94,7 @@ salt-formulas: + build: | + ARG SALT_FORMULA_VERSION="master" + ENV SALT_FORMULA_VERSION $SALT_FORMULA_VERSION +- ARG SALT_FORMULA_SOURCES="https://github.com/salt-formulas https://github.com/saltstack-formulas" ++ ARG SALT_FORMULA_SOURCES="https://github.com/salt-formulas" + ENV SALT_FORMULA_SOURCES $SALT_FORMULA_SOURCES + ARG SALT_FORMULAS_BASE="/srv/salt/formula" + ENV SALT_FORMULAS_BASE $SALT_FORMULAS_BASE @@ -102,12 +102,46 @@ salt-formulas: ENV SALT_ENV_PATH_ $SALT_ENV_PATH_ 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 (29 Oct 2018)" \ ++ RUN echo "Layer python/salt module prerequisites, formulas (09 Nov 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' \ |