diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-23 15:09:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-23 15:09:10 +0000 |
| commit | a68e56ced7a19ebc1c010c96378b398eaa4b9e57 (patch) | |
| tree | 575f16ccecfbcbc41b3ec323d56303669de70d47 /mcp/patches/docker | |
| parent | ba754f2eb858756dd92b3f583442bbff9c991e82 (diff) | |
| parent | 150777d76de8c023383e88ca8b8c1fe68fe0d854 (diff) | |
Merge "[patch] Set ignore_overwritten_missing_references" into stable/gambia
Diffstat (limited to 'mcp/patches/docker')
| -rw-r--r-- | mcp/patches/docker/0003-reclass-Set-ignore_overwritten_missing_references.patch | 34 |
1 files changed, 34 insertions, 0 deletions
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 new file mode 100644 index 000000000..4437ecd91 --- /dev/null +++ b/mcp/patches/docker/0003-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 <Alexandru.Avadanii@enea.com> +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 <Alexandru.Avadanii@enea.com> +--- + 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.*' |