submodule: Bump salt-formula-maas

[fuel.git] / mcp / patches / docker / 0002-OPNFV-package-installation-Ubuntu-user.patch

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 546e4e9..a96c24b 100644 (file)
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -16,17 +16,35 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user
   workaround);
 * While at it, create 'ubuntu' user so other OPNFV projects don't
   have to switch to 'root' login;
+* Preinstall `salt_minion_dependency_packages` and
+  `salt_minion_reclass_dependencies`;
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- DockerMake.yml | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
+ DockerMake.yml | 38 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/DockerMake.yml b/DockerMake.yml
-index 2c75586..9b044a3 100644
+index 2c75586..13813a2 100644
 --- a/DockerMake.yml
 +++ b/DockerMake.yml
-@@ -108,6 +108,34 @@ salt-formulas:
+@@ -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 (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' \
        && eval ${LAYER_CLEANUP}
 
@@ -37,7 +55,7 @@ index 2c75586..9b044a3 100644
 +    ENV SALT_FORMULA_VERSION $SALT_FORMULA_VERSION
 +    ARG SALT_FORMULA_LIST="salt-formula-gnocchi"
 +    ENV SALT_FORMULA_LIST $SALT_FORMULA_LIST
-+    ENV APT_REPOSITORY "deb http://apt.mirantis.com/xenial ${SALT_FORMULA_VERSION} salt"
++    ENV APT_REPOSITORY "deb [arch=amd64] http://apt.mirantis.com/xenial ${SALT_FORMULA_VERSION} salt"
 +    ENV APT_REPOSITORY_GPG "http://apt.mirantis.com/public.gpg"
 +    RUN echo "Layer extra salt-formulas packages" \
 +      && echo "$APT_REPOSITORY" | tee /etc/apt/sources.list.d/salt-formulas.list >/dev/null \
@@ -53,6 +71,12 @@ index 2c75586..9b044a3 100644
 +           kmod \
 +           net-tools \
 +           openssh-server \
++           python-m2crypto \
++           python-msgpack \
++           python-netaddr \
++           python-oauth \
++           python-psutil \
++           python-yaml \
 +      && useradd -m ubuntu \
 +      && echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu \
 +      && eval ${LAYER_CLEANUP}