From: Alexandru Avadanii Date: Fri, 7 Dec 2018 14:42:23 +0000 (+0100) Subject: [cfg01] Patch reclass settings.py broken default X-Git-Tag: opnfv-7.1.0~10 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=f91dfb13181b247fc825e1cc9229f1a9162ff8b4;hp=4bbd4d019f40548c43f38c0e6990d3089ba6b368;p=fuel.git [cfg01] Patch reclass settings.py broken default Until a new reclass release including the fix for [1] is published, patch settings.py explicitly. [1] https://github.com/salt-formulas/reclass/issues/77 Change-Id: If93848a6b6f084c76e64ddcf7bfdfa52b7d59050 Signed-off-by: Alexandru Avadanii (cherry picked from commit 2de5348a8b267a1742154dd6d5c4f5bd3a2983ab) --- diff --git a/mcp/config/states/virtual_init b/mcp/config/states/virtual_init index 46d880471..e234b7235 100755 --- a/mcp/config/states/virtual_init +++ b/mcp/config/states/virtual_init @@ -22,6 +22,9 @@ NODE_MASK="${LOCAL_VIRT_NODES// /|}" wait_for 5.0 "salt-call state.sls reclass,linux.network,salt.minion \ exclude='[{id: reclass_packages}, {id: /etc/reclass/reclass-config.yml}]'" +# Workaround for: https://github.com/salt-formulas/reclass/issues/77 +salt-call file.replace '/usr/local/lib/python2.7/dist-packages/reclass/settings.py' \ + pattern='(ignore_overwritten_missing_references)defaults.' repl='\1' wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' saltutil.refresh_pillar" # NOTE: domain name changes are not yet supported without a clean redeploy