X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fpatches%2Fdocker%2F0002-OPNFV-package-installation-Ubuntu-user.patch;h=a96c24b1ff3101a86dd665a167e063484937409e;hb=4c3c9c9a321d724e137f61e23509b6734ac836b7;hp=e0526c577e13b4e2bba04712fcd126dc05192c34;hpb=2dde16ca1276a4982602dd303c5cf6d6324daa6f;p=fuel.git 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 e0526c577..a96c24b1f 100644 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch @@ -21,19 +21,28 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user Signed-off-by: Alexandru Avadanii --- - DockerMake.yml | 36 +++++++++++++++++++++++++++++++++++- - 1 file changed, 35 insertions(+), 1 deletion(-) + DockerMake.yml | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) 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 (27 Sep 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' \