From bf4d4728dd3ec729aa79fc0935239e5fda007fd7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 21 Nov 2018 16:57:10 +0100 Subject: [docker] build: Allow cache invalidation While at it, fix emoji issues with latest virtualenv [1]. JIRA: FUEL-398 [1] https://github.com/pypa/pipenv/issues/3223 Change-Id: Ice5937222bf75c1ddadc6b9f1994635bc10faf57 Signed-off-by: Alexandru Avadanii (cherry picked from commit f03a33bc58135acc7e4420efaaf34c26a32d6142) --- .../0001-OPNFV-tag-convention-alignment.patch | 78 ------------------- ...01-tasks.py-Allow-passing-extra-build-arg.patch | 59 +++++++++++++++ ...02-OPNFV-package-installation-Ubuntu-user.patch | 87 --------------------- .../0002-OPNFV-tag-convention-alignment.patch | 78 +++++++++++++++++++ ...03-OPNFV-package-installation-Ubuntu-user.patch | 88 ++++++++++++++++++++++ ...Set-ignore_overwritten_missing_references.patch | 34 --------- ...Set-ignore_overwritten_missing_references.patch | 34 +++++++++ 7 files changed, 259 insertions(+), 199 deletions(-) delete mode 100644 mcp/patches/docker/0001-OPNFV-tag-convention-alignment.patch create mode 100644 mcp/patches/docker/0001-tasks.py-Allow-passing-extra-build-arg.patch delete mode 100644 mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch create mode 100644 mcp/patches/docker/0002-OPNFV-tag-convention-alignment.patch create mode 100644 mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch delete mode 100644 mcp/patches/docker/0003-reclass-Set-ignore_overwritten_missing_references.patch create mode 100644 mcp/patches/docker/0004-reclass-Set-ignore_overwritten_missing_references.patch (limited to 'mcp/patches') diff --git a/mcp/patches/docker/0001-OPNFV-tag-convention-alignment.patch b/mcp/patches/docker/0001-OPNFV-tag-convention-alignment.patch deleted file mode 100644 index aa0b01c39..000000000 --- a/mcp/patches/docker/0001-OPNFV-tag-convention-alignment.patch +++ /dev/null @@ -1,78 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Tue, 21 Aug 2018 02:42:35 +0200 -Subject: [PATCH] OPNFV tag convention alignment - -* (arch)- prefix Docker tags - Hacky implementation that only detects 'arm64', otherwise it will - default to 'amd64'. - Note that Docker arch notation uses 'arm64' instead of 'aarch64'. -* Override Docker tag to align with OPNFV format -* use Docker repository: opnfv/fuel - -Signed-off-by: Alexandru Avadanii ---- - invoke.yml | 2 +- - tasks.py | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/invoke.yml b/invoke.yml -index 0bd793e..291f4c7 100644 ---- a/invoke.yml -+++ b/invoke.yml -@@ -65,7 +65,7 @@ target: - - dockermake: - destination: 'images' -- repository: 'docker.io/epcim/salt' -+ repository: 'docker.io/opnfv/fuel' - # options: '--no-cache' - # options: '--bust-cache reclass' - # options: '--registry-user epcim' -diff --git a/tasks.py b/tasks.py -index d6bf3bc..092c6e7 100644 ---- a/tasks.py -+++ b/tasks.py -@@ -6,6 +6,7 @@ from invoke import Collection, task - from string import Template - import re - import ast -+import platform - - # TODOs: - # - WIP - use namespace to expose images/targets as inoke tasks # image = Collection('image') -@@ -25,8 +26,9 @@ def all(ctx, dry=False, push=False, dry_targets=False, filter=None, **kwargs): - dry=dry, push=push, dry_targets=dry_targets, filter=filter, **kwargs) - - @task --def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, formula_rev=None, push=False, dry=False, dry_targets=False, **kwargs): -+def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, formula_rev=None, opnfv_tag='latest', push=False, dry=False, dry_targets=False, **kwargs): - -+ kwargs['arch'] = 'arm64' if platform.machine() == 'aarch64' else 'amd64' - kwargs['dist'] = dist - kwargs['dist_rel'] = dist_rel - kwargs['dry'] = True if dry_targets or dry else False -@@ -35,6 +37,7 @@ def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, - kwargs['require'] = require - kwargs['salt'] = salt - kwargs['target'] = target -+ kwargs['opnfv_tag'] = opnfv_tag - # command formating + update - fmt = {'tag': ''} - fmt.update(ctx.dockermake) -@@ -56,7 +59,7 @@ def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, - # execute - cmd = Template(""" - ${dry}docker-make -f DockerMake.${dist}.yml -u ${repository}: --name ${target} \ -- \t-t ${dist}-${dist_rel}${tag} \ -+ \t-t ${arch}-${opnfv_tag} \ - \t--requires ${requires} \ - \t--build-arg SALT_VERSION="${salt}" \ - \t--build-arg SALT_FORMULA_VERSION="${formula_rev}" \ diff --git a/mcp/patches/docker/0001-tasks.py-Allow-passing-extra-build-arg.patch b/mcp/patches/docker/0001-tasks.py-Allow-passing-extra-build-arg.patch new file mode 100644 index 000000000..cf1c57d31 --- /dev/null +++ b/mcp/patches/docker/0001-tasks.py-Allow-passing-extra-build-arg.patch @@ -0,0 +1,59 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Sun, 9 Sep 2018 23:18:39 +0200 +Subject: [PATCH] tasks.py: Allow passing extra --build-arg + +E.g. A, B with values "a", respectively "b c": +$ invoke build saltmaster-reclass --build-arg-extra='A="a" B="b c"' +will be passed down as: +--build-arg A="a" --build-arg B="b c" + +Signed-off-by: Alexandru Avadanii +--- + tasks.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tasks.py b/tasks.py +index d6bf3bc..59e217d 100644 +--- a/tasks.py ++++ b/tasks.py +@@ -3,6 +3,7 @@ + + + from invoke import Collection, task ++from shlex import split + from string import Template + import re + import ast +@@ -25,7 +26,7 @@ def all(ctx, dry=False, push=False, dry_targets=False, filter=None, **kwargs): + dry=dry, push=push, dry_targets=dry_targets, filter=filter, **kwargs) + + @task +-def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, formula_rev=None, push=False, dry=False, dry_targets=False, **kwargs): ++def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, formula_rev=None, push=False, dry=False, dry_targets=False, build_arg_extra='', **kwargs): + + kwargs['dist'] = dist + kwargs['dist_rel'] = dist_rel +@@ -35,6 +36,7 @@ def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, + kwargs['require'] = require + kwargs['salt'] = salt + kwargs['target'] = target ++ kwargs['build_arg_extra'] = ' --build-arg '.join([''] + split(build_arg_extra.replace('"', '"\\"'))) + # command formating + update + fmt = {'tag': ''} + fmt.update(ctx.dockermake) +@@ -60,6 +62,7 @@ def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, + \t--requires ${requires} \ + \t--build-arg SALT_VERSION="${salt}" \ + \t--build-arg SALT_FORMULA_VERSION="${formula_rev}" \ ++ \t${build_arg_extra} \ + \t${push} ${options} \ + ${fin}""").safe_substitute(fmt) + ctx.run(cmd.replace(' ', '')) diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch deleted file mode 100644 index a96c24b1f..000000000 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ /dev/null @@ -1,87 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Wed, 22 Aug 2018 01:35:06 +0200 -Subject: [PATCH] OPNFV package installation, Ubuntu user - -* Install OpenSSH server (and client), so other OPNFV projects can - easily connect to the Salt master node; -* Install 'salt-formula-gnocchi' distro package (empty git formula - 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 ---- - DockerMake.yml | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/DockerMake.yml b/DockerMake.yml -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 (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} - -+opnfv: -+ build: | -+ # Some formulas have empty git repos, use the package version -+ ARG SALT_FORMULA_VERSION="nightly" -+ 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 [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 \ -+ && curl -sL $APT_REPOSITORY_GPG | $SUDO apt-key add - \ -+ && eval ${LAYER_PKGUPDT} \ -+ && ${LAYER_INSTALL} ${SALT_FORMULA_LIST} -y --fix-missing -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ -+ && eval ${LAYER_CLEANUP} -+ RUN echo "Layer with OPNFV packages" \ -+ && eval ${LAYER_PKGUPDT} \ -+ && ${LAYER_INSTALL} \ -+ gawk \ -+ inetutils-ping \ -+ 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} -+ -+ - wheel: - requires: - - base diff --git a/mcp/patches/docker/0002-OPNFV-tag-convention-alignment.patch b/mcp/patches/docker/0002-OPNFV-tag-convention-alignment.patch new file mode 100644 index 000000000..6ceb4873d --- /dev/null +++ b/mcp/patches/docker/0002-OPNFV-tag-convention-alignment.patch @@ -0,0 +1,78 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Tue, 21 Aug 2018 02:42:35 +0200 +Subject: [PATCH] OPNFV tag convention alignment + +* (arch)- prefix Docker tags + Hacky implementation that only detects 'arm64', otherwise it will + default to 'amd64'. + Note that Docker arch notation uses 'arm64' instead of 'aarch64'. +* Override Docker tag to align with OPNFV format +* use Docker repository: opnfv/fuel + +Signed-off-by: Alexandru Avadanii +--- + invoke.yml | 2 +- + tasks.py | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/invoke.yml b/invoke.yml +index 0bd793e..291f4c7 100644 +--- a/invoke.yml ++++ b/invoke.yml +@@ -65,7 +65,7 @@ target: + + dockermake: + destination: 'images' +- repository: 'docker.io/epcim/salt' ++ repository: 'docker.io/opnfv/fuel' + # options: '--no-cache' + # options: '--bust-cache reclass' + # options: '--registry-user epcim' +diff --git a/tasks.py b/tasks.py +index 59e217d..8afbde9 100644 +--- a/tasks.py ++++ b/tasks.py +@@ -7,6 +7,7 @@ from shlex import split + from string import Template + import re + import ast ++import platform + + # TODOs: + # - WIP - use namespace to expose images/targets as inoke tasks # image = Collection('image') +@@ -26,8 +27,9 @@ def all(ctx, dry=False, push=False, dry_targets=False, filter=None, **kwargs): + dry=dry, push=push, dry_targets=dry_targets, filter=filter, **kwargs) + + @task +-def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, formula_rev=None, push=False, dry=False, dry_targets=False, build_arg_extra='', **kwargs): ++def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, formula_rev=None, opnfv_tag='latest', push=False, dry=False, dry_targets=False, build_arg_extra='', **kwargs): + ++ kwargs['arch'] = 'arm64' if platform.machine() == 'aarch64' else 'amd64' + kwargs['dist'] = dist + kwargs['dist_rel'] = dist_rel + kwargs['dry'] = True if dry_targets or dry else False +@@ -37,6 +39,7 @@ def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, + kwargs['salt'] = salt + kwargs['target'] = target + kwargs['build_arg_extra'] = ' --build-arg '.join([''] + split(build_arg_extra.replace('"', '"\\"'))) ++ kwargs['opnfv_tag'] = opnfv_tag + # command formating + update + fmt = {'tag': ''} + fmt.update(ctx.dockermake) +@@ -58,7 +61,7 @@ def build(ctx, target, require=[], dist='debian', dist_rel='stretch', salt=None, + # execute + cmd = Template(""" + ${dry}docker-make -f DockerMake.${dist}.yml -u ${repository}: --name ${target} \ +- \t-t ${dist}-${dist_rel}${tag} \ ++ \t-t ${arch}-${opnfv_tag} \ + \t--requires ${requires} \ + \t--build-arg SALT_VERSION="${salt}" \ + \t--build-arg SALT_FORMULA_VERSION="${formula_rev}" \ diff --git a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch new file mode 100644 index 000000000..d283d06b6 --- /dev/null +++ b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch @@ -0,0 +1,88 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Wed, 22 Aug 2018 01:35:06 +0200 +Subject: [PATCH] OPNFV package installation, Ubuntu user + +* Install OpenSSH server (and client), so other OPNFV projects can + easily connect to the Salt master node; +* Install 'salt-formula-gnocchi' distro package (empty git formula + 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 +--- + DockerMake.yml | 37 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 36 insertions(+), 1 deletion(-) + +diff --git a/DockerMake.yml b/DockerMake.yml +index 2c75586..eb06cbd 100644 +--- a/DockerMake.yml ++++ b/DockerMake.yml +@@ -29,6 +29,7 @@ common-cleanup: + + common: + build: | ++ ARG CACHE_INVALIDATE="0" + RUN echo "Layer with common packages" \ + && eval ${LAYER_PKGUPDT} \ + && apt-get upgrade -qy \ +@@ -94,7 +95,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 +@@ -108,6 +109,40 @@ salt-formulas: + && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \ + && eval ${LAYER_CLEANUP} + ++opnfv: ++ build: | ++ # Some formulas have empty git repos, use the package version ++ ARG SALT_FORMULA_VERSION="nightly" ++ 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 [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 \ ++ && curl -sL $APT_REPOSITORY_GPG | $SUDO apt-key add - \ ++ && eval ${LAYER_PKGUPDT} \ ++ && ${LAYER_INSTALL} ${SALT_FORMULA_LIST} -y --fix-missing -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ ++ && eval ${LAYER_CLEANUP} ++ RUN echo "Layer with OPNFV packages" \ ++ && eval ${LAYER_PKGUPDT} \ ++ && ${LAYER_INSTALL} \ ++ gawk \ ++ inetutils-ping \ ++ 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} ++ ++ + wheel: + requires: + - base diff --git a/mcp/patches/docker/0003-reclass-Set-ignore_overwritten_missing_references.patch b/mcp/patches/docker/0003-reclass-Set-ignore_overwritten_missing_references.patch deleted file mode 100644 index 4437ecd91..000000000 --- a/mcp/patches/docker/0003-reclass-Set-ignore_overwritten_missing_references.patch +++ /dev/null @@ -1,34 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Tue, 20 Nov 2018 23:16:44 +0200 -Subject: [PATCH] reclass: Set ignore_overwritten_missing_references - -The recent changes in `reclass` 1.6.x allow configuring this new -option; however the default for it is broken - see [1]. - -[1] https://github.com/salt-formulas/reclass/issues/77 - -Signed-off-by: Alexandru Avadanii ---- - files/reclass/reclass-config.yml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/files/reclass/reclass-config.yml b/files/reclass/reclass-config.yml -index 00aba49..f4da04c 100644 ---- a/files/reclass/reclass-config.yml -+++ b/files/reclass/reclass-config.yml -@@ -3,6 +3,7 @@ inventory_base_uri: /srv/salt/reclass - pretty_print: True - output: yaml - -+ignore_overwritten_missing_references: True - ignore_class_notfound: True - ignore_class_regexp: - - 'service.*' diff --git a/mcp/patches/docker/0004-reclass-Set-ignore_overwritten_missing_references.patch b/mcp/patches/docker/0004-reclass-Set-ignore_overwritten_missing_references.patch new file mode 100644 index 000000000..4437ecd91 --- /dev/null +++ b/mcp/patches/docker/0004-reclass-Set-ignore_overwritten_missing_references.patch @@ -0,0 +1,34 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Tue, 20 Nov 2018 23:16:44 +0200 +Subject: [PATCH] reclass: Set ignore_overwritten_missing_references + +The recent changes in `reclass` 1.6.x allow configuring this new +option; however the default for it is broken - see [1]. + +[1] https://github.com/salt-formulas/reclass/issues/77 + +Signed-off-by: Alexandru Avadanii +--- + files/reclass/reclass-config.yml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/files/reclass/reclass-config.yml b/files/reclass/reclass-config.yml +index 00aba49..f4da04c 100644 +--- a/files/reclass/reclass-config.yml ++++ b/files/reclass/reclass-config.yml +@@ -3,6 +3,7 @@ inventory_base_uri: /srv/salt/reclass + pretty_print: True + output: yaml + ++ignore_overwritten_missing_references: True + ignore_class_notfound: True + ignore_class_regexp: + - 'service.*' -- cgit 1.2.3-korg