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/scripts/lib.sh | |
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/scripts/lib.sh')
-rw-r--r-- | mcp/scripts/lib.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index b43686b7d..cc88f9b54 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -493,15 +493,9 @@ function prepare_containers { docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/" "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml down - sudo rm -rf "${image_dir}/"{salt,hosts} "${image_dir}/nodes/"* + sudo rm -rf "${image_dir}/"{salt,hosts,pki} "${image_dir}/nodes/"* mkdir -p "${image_dir}/salt/"{master.d,minion.d} - # salt state does not properly configure file_roots in master.conf, hard set it - sed -e 's/user: salt/user: root\nfile_recv: True/' -e 's/auto_accept:/open_mode:/' \ - "${MCP_REPO_ROOT_PATH}/docker/files/salt/master.conf" > \ - "${image_dir}/salt/master.d/opnfv.conf" - echo 'master: localhost' > "${image_dir}/salt/minion.d/opnfv.conf" - cp "${MCP_REPO_ROOT_PATH}/mcp/scripts/docker-compose/files/hosts" \ - "${image_dir}/hosts" + touch "${image_dir}/hosts" } function start_containers { |