summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-01 18:05:08 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-01 21:31:39 +0200
commitc4d91eca1ba1614648fb2ae96340ed2876f64cd3 (patch)
treef0c013d38288561e0616a65c7e4ba50a7afb3f28 /.gitmodules
parent57040b97c6317a94020ad27b8001ac0965b208f7 (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 '.gitmodules')
-rw-r--r--.gitmodules8
1 files changed, 0 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index e664bd1ae..e1d801159 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,10 +14,6 @@
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
@@ -26,7 +22,3 @@
path = mcp/salt-formulas/salt-formula-maas
url = https://github.com/salt-formulas/salt-formula-maas
branch = master
-[submodule "salt-formula-salt"]
- path = mcp/salt-formulas/salt-formula-salt
- url = https://github.com/salt-formulas/salt-formula-salt
- branch = master