diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-01 18:05:08 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-01 21:31:39 +0200 |
commit | c4d91eca1ba1614648fb2ae96340ed2876f64cd3 (patch) | |
tree | f0c013d38288561e0616a65c7e4ba50a7afb3f28 /mcp/config | |
parent | 57040b97c6317a94020ad27b8001ac0965b208f7 (diff) |
[docker] Cleanup, minor fixes, formula bump
* ship prebuilt salt master conf for better readability:
- enable x509.sign_remote_certificate (for prx VCP nodes);
* refactor Salt master CA handling:
- preinstall `salt_minion_dependency_packages` and
`salt_minion_reclass_dependencies` inside docker image;
- persistent /etc/pki;
- run salt.minion on cfg01 to generate master keys;
* bump container formulas to 1 Sep 2018 versions or newer:
- inject date into Docker makefile, forcing a fresh fetch of all
salt formulas from upstream git repos;
* workaround broken salt-formula-designate's meta/sphinx.yml:
- the DEB package version of salt-formula-designate uses `cmd.shell`
to query dpkg on the minion, while the git repo version still
uses `cmd.run`, running into parsing issues;
- temporarily disable sphinx metadata generation for designate until
upstream git repo syncs with the DEB version;
* upstream: salt-formula-salt AArch64 salt.control.virt support:
- retire salt-formula-salt git submodule and related patches;
* skip installing reclass distro package (already installed via pip
inside the container);
* limit initial pillar_refresh call to nodes on jumphost;
* remove unused salt-formula-nova git submodule;
JIRA: FUEL-383
Change-Id: I883b825e556f887a5e31f8a43676dcd8ece6dfde
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config')
-rwxr-xr-x | mcp/config/states/virtual_init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcp/config/states/virtual_init b/mcp/config/states/virtual_init index 147e6b05e..47d69cd8a 100755 --- a/mcp/config/states/virtual_init +++ b/mcp/config/states/virtual_init @@ -19,9 +19,9 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x LOCAL_VIRT_NODES=$(echo ${virtual_nodes[*]}) # unquoted to filter space NODE_MASK="${LOCAL_VIRT_NODES// /|}" -# wait_for 3.0 "salt-call state.apply salt exclude='[{id: salt_master_service}]'" -wait_for 5.0 "salt-call state.sls reclass,linux.network" -wait_for 3.0 "salt -C '*' saltutil.refresh_pillar" +wait_for 5.0 "salt-call state.sls reclass,linux.network,salt.minion \ + exclude='[{id: reclass_packages}, {id: /etc/reclass/reclass-config.yml}]'" +wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' saltutil.refresh_pillar" # NOTE: domain name changes are not yet supported without a clean redeploy |