[docker] Switch to containerized Salt Master 61/61361/10
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 18 Aug 2018 01:46:13 +0000 (03:46 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 28 Aug 2018 23:27:28 +0000 (01:27 +0200)
commitab18375a629010525ac15bc11ce2d4e4cf393fe9
tree38dc93fe27b88db9ebe489e4c685b06e4b80561e
parentcfa1c0d67ee23edcbc25d9620754159645981dd8
[docker] Switch to containerized Salt Master

* Refactor OPNFV salt-formulas mechanism to resemble upstream git
  structure:
  - git submodules: add new submodule for each formula we patch;
  - create salt-formula-x directories for OPNFV formulas;
  - move mcp/metadata/service contents to their each formula subdir;
  - use `make patches-import` for patches previously handled by
    patch.sh;
  - retire patch.sh
* states: add virtual_init:
  - mostly based on old salt.sh, which is now obsolete;
  - exclude salt-master service restart (it would kill the container);
* scenarios: cleanup (rm cfg01 virtual node def), adopt virtual_init;
* reclass: align our model with prebuilt container's Salt config:
  - drop linux:network pillar data (handled by Docker);
  - stop applying linux.system state on cfg01;
  - align salt user homedir;
  - drop salt-formula packages (preprovisioned);
* minor plumbing in deploy.sh and lib.sh;

JIRA: FUEL-383

Change-Id: I28708a9b399d3f19012212c71966ebda9d6fc0ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
47 files changed:
.gitmodules
ci/deploy.sh
mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
mcp/config/scenario/os-odl-ovs-noha.yaml.j2
mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
mcp/config/states/virtual_init [new file with mode: 0755]
mcp/patches/patch.sh [deleted file]
mcp/patches/patches.list [deleted file]
mcp/patches/salt-formula-keystone/0001-Handle-extra-environment-variables.patch [moved from mcp/patches/0008-Handle-extra-environment-variables.patch with 93% similarity]
mcp/patches/salt-formula-linux/0001-system.repo-Debian-Use-proxy-for-keyservers.patch [moved from mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch with 99% similarity]
mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch [moved from mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch with 91% similarity]
mcp/patches/salt-formula-maas/0001-maas-region-skip-credentials-update.patch [moved from mcp/patches/0002-maas-region-skip-credentials-update.patch with 89% similarity]
mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch [moved from mcp/patches/0010-maas-region-allow-timeout-override.patch with 93% similarity]
mcp/patches/salt-formula-maas/0003-Add-machines.delete-co-pxe_nat-sls.patch [new file with mode: 0644]
mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
mcp/salt-formulas/maas/machines/delete.sls [deleted file]
mcp/salt-formulas/maas/machines/mark_broken_fixed.sls [deleted file]
mcp/salt-formulas/maas/machines/override_failed_testing.sls [deleted file]
mcp/salt-formulas/maas/pxe_nat.sls [deleted file]
mcp/salt-formulas/salt-formula-keystone [new submodule]
mcp/salt-formulas/salt-formula-linux [new submodule]
mcp/salt-formulas/salt-formula-maas [new submodule]
mcp/salt-formulas/salt-formula-nova [new submodule]
mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml [moved from mcp/metadata/service/opendaylight/server/single.yml with 100% similarity]
mcp/salt-formulas/salt-formula-opendaylight/metadata/service/support.yml [moved from mcp/metadata/service/opendaylight/support.yml with 100% similarity]
mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/jetty.xml [moved from mcp/salt-formulas/opendaylight/files/jetty.xml with 100% similarity]
mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/setenv.shell [moved from mcp/salt-formulas/opendaylight/files/setenv.shell with 100% similarity]
mcp/salt-formulas/salt-formula-opendaylight/opendaylight/init.sls [moved from mcp/salt-formulas/opendaylight/init.sls with 100% similarity]
mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja [moved from mcp/salt-formulas/opendaylight/map.jinja with 100% similarity]
mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls [moved from mcp/salt-formulas/opendaylight/server.sls with 100% similarity]
mcp/salt-formulas/salt-formula-tacker/metadata/service/server/single.yml [moved from mcp/metadata/service/tacker/server/single.yml with 100% similarity]
mcp/salt-formulas/salt-formula-tacker/tacker/files/tacker.conf [moved from mcp/salt-formulas/tacker/files/tacker.conf with 100% similarity]
mcp/salt-formulas/salt-formula-tacker/tacker/files/tacker.systemd [moved from mcp/salt-formulas/tacker/files/tacker.systemd with 100% similarity]
mcp/salt-formulas/salt-formula-tacker/tacker/init.sls [moved from mcp/salt-formulas/tacker/init.sls with 100% similarity]
mcp/salt-formulas/salt-formula-tacker/tacker/map.jinja [moved from mcp/salt-formulas/tacker/map.jinja with 100% similarity]
mcp/salt-formulas/salt-formula-tacker/tacker/server.sls [moved from mcp/salt-formulas/tacker/server.sls with 100% similarity]
mcp/scripts/lib.sh
mcp/scripts/salt.sh [deleted file]
mcp/scripts/xdf_data.sh.j2