From ab18375a629010525ac15bc11ce2d4e4cf393fe9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 18 Aug 2018 03:46:13 +0200 Subject: [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 --- .gitmodules | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index d3501c3ec..767cf14df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,19 @@ path = docker url = https://github.com/epcim/docker-salt-formulas branch = master +[submodule "salt-formula-linux"] + path = mcp/salt-formulas/salt-formula-linux + url = https://github.com/salt-formulas/salt-formula-linux + branch = master +[submodule "salt-formula-nova"] + path = mcp/salt-formulas/salt-formula-nova + url = https://github.com/salt-formulas/salt-formula-nova + branch = master +[submodule "salt-formula-keystone"] + path = mcp/salt-formulas/salt-formula-keystone + url = https://github.com/salt-formulas/salt-formula-keystone + branch = master +[submodule "salt-formula-maas"] + path = mcp/salt-formulas/salt-formula-maas + url = https://github.com/salt-formulas/salt-formula-maas + branch = master -- cgit 1.2.3-korg