diff options
Diffstat (limited to 'mcp/patches/docker')
| -rw-r--r-- | mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch | 12 | ||||
| -rw-r--r-- | mcp/patches/docker/0005-Add-saltminion-maas-build-target.patch | 22 |
2 files changed, 20 insertions, 14 deletions
diff --git a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch index 75da21633..27df86e8d 100644 --- a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch @@ -21,15 +21,18 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user * Pin dockermake to v0.8 to allow using python3.5 for virtualenv, since python 3.6 is not easily available for Ubuntu Xenial jump/build hosts. +* Pin jinja2 to 2.11.0 to bypass [1]. + +[1] https://github.com/saltstack/salt/issues/46594 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - DockerMake.yml | 38 +++++++++++++++++++++++++++++++++++++- + DockerMake.yml | 39 ++++++++++++++++++++++++++++++++++++++- Pipfile | 4 ++-- - 2 files changed, 39 insertions(+), 3 deletions(-) + 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/DockerMake.yml b/DockerMake.yml -index 2c75586..9ab7195 100644 +index 2c75586..f30024c 100644 --- a/DockerMake.yml +++ b/DockerMake.yml @@ -29,6 +29,7 @@ common-cleanup: @@ -49,7 +52,7 @@ index 2c75586..9ab7195 100644 ENV SALT_FORMULA_SOURCES $SALT_FORMULA_SOURCES ARG SALT_FORMULAS_BASE="/srv/salt/formula" ENV SALT_FORMULAS_BASE $SALT_FORMULAS_BASE -@@ -108,6 +109,41 @@ salt-formulas: +@@ -108,6 +109,42 @@ salt-formulas: && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \ && eval ${LAYER_CLEANUP} @@ -85,6 +88,7 @@ index 2c75586..9ab7195 100644 + python-yaml \ + && useradd -m ubuntu \ + && echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/ubuntu \ ++ && python -m pip install -U jinja2==2.11.0 \ + && eval ${LAYER_CLEANUP} + + diff --git a/mcp/patches/docker/0005-Add-saltminion-maas-build-target.patch b/mcp/patches/docker/0005-Add-saltminion-maas-build-target.patch index 2fb4cf523..82ce1ee82 100644 --- a/mcp/patches/docker/0005-Add-saltminion-maas-build-target.patch +++ b/mcp/patches/docker/0005-Add-saltminion-maas-build-target.patch @@ -11,15 +11,15 @@ Date: Wed, 30 Jan 2019 17:21:03 +0100 Subject: [PATCH] Add saltminion-maas build target --- - DockerMake.yml | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ - invoke.yml | 5 +++++ - 2 files changed, 66 insertions(+) + DockerMake.yml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ + invoke.yml | 5 ++++ + 2 files changed, 68 insertions(+) diff --git a/DockerMake.yml b/DockerMake.yml -index 9ab7195..2c0b8ac 100644 +index f30024c..ca91539 100644 --- a/DockerMake.yml +++ b/DockerMake.yml -@@ -50,6 +50,67 @@ common: +@@ -50,6 +50,69 @@ common: && eval ${LAYER_CLEANUP} @@ -33,6 +33,9 @@ index 9ab7195..2c0b8ac 100644 + ARG SALT_BOOTSTRAP_OPTS="-PdX ${SALT_VERSION}" + ENV SALT_BOOTSTRAP_OPTS $SALT_BOOTSTRAP_OPTS + RUN echo "Layer with MaaS, salt-minion packages" \ ++ && eval ${LAYER_PKGUPDT} \ ++ && apt-get upgrade -qy \ ++ && ${LAYER_INSTALL} maas-common systemd \ + && find /etc/systemd/system \ + /lib/systemd/system \ + -path '*.wants/*' \ @@ -41,10 +44,6 @@ index 9ab7195..2c0b8ac 100644 + -not -name '*systemd-user-sessions*' \ + -exec rm \{} \; \ + && systemctl set-default multi-user.target \ -+ && eval ${LAYER_PKGUPDT} \ -+ && curl -qL https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | $SUDO sh -s -- -A cfg01 ${SALT_BOOTSTRAP_OPTS} \ -+ && apt-get upgrade -qy \ -+ && ${LAYER_INSTALL} maas-common \ + && ${LAYER_INSTALL} \ + at \ + avahi-utils \ @@ -65,6 +64,7 @@ index 9ab7195..2c0b8ac 100644 + python-msgpack \ + python-netaddr \ + python-oauth \ ++ python-pip \ + python-psutil \ + python-yaml \ + sysfsutils \ @@ -80,8 +80,10 @@ index 9ab7195..2c0b8ac 100644 + && mv /var/lib/maas /var/lib/postgresql /var/lib/opnfv/ \ + && mv /etc/maas /etc/ssh /var/lib/opnfv/etc/ \ + && mv /var/lib/opnfv/maas-region-controller.postinst /var/lib/dpkg/info/ \ ++ && python -m pip install -U jinja2==2.11.0 \ ++ && curl -qL https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | $SUDO sh -s -- -A cfg01 ${SALT_BOOTSTRAP_OPTS} \ + && eval ${LAYER_CLEANUP} -+ ENTRYPOINT ["/bin/bash", "-c", "/entrypoint.sh && exec /sbin/init"] ++ ENTRYPOINT ["/bin/bash", "-c", "/entrypoint.sh && exec /lib/systemd/systemd"] + + salt: |