[docker] Cleanup, minor fixes, formula bump 87/61687/6
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 1 Sep 2018 16:05:08 +0000 (18:05 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 1 Sep 2018 19:31:39 +0000 (21:31 +0200)
commitc4d91eca1ba1614648fb2ae96340ed2876f64cd3
treef0c013d38288561e0616a65c7e4ba50a7afb3f28
parent57040b97c6317a94020ad27b8001ac0965b208f7
[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>
12 files changed:
.gitmodules
mcp/config/states/virtual_init
mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
mcp/patches/salt-formula-salt/0001-libvirt-xml-pass-loader-virt-machine-cpu-mode.patch [deleted file]
mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
mcp/salt-formulas/salt-formula-nova [deleted submodule]
mcp/salt-formulas/salt-formula-salt [deleted submodule]
mcp/scripts/docker-compose/docker-compose.yaml.j2
mcp/scripts/docker-compose/files/entrypoint.sh
mcp/scripts/docker-compose/files/opnfv_master.conf [new file with mode: 0644]
mcp/scripts/lib.sh