summaryrefslogtreecommitdiffstats
path: root/mcp/patches/0002-maas-region-skip-credentials-update.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-18 03:46:13 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-29 01:27:28 +0200
commitab18375a629010525ac15bc11ce2d4e4cf393fe9 (patch)
tree38dc93fe27b88db9ebe489e4c685b06e4b80561e /mcp/patches/0002-maas-region-skip-credentials-update.patch
parentcfa1c0d67ee23edcbc25d9620754159645981dd8 (diff)
[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>
Diffstat (limited to 'mcp/patches/0002-maas-region-skip-credentials-update.patch')
-rw-r--r--mcp/patches/0002-maas-region-skip-credentials-update.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/mcp/patches/0002-maas-region-skip-credentials-update.patch b/mcp/patches/0002-maas-region-skip-credentials-update.patch
deleted file mode 100644
index 1d226e4cd..000000000
--- a/mcp/patches/0002-maas-region-skip-credentials-update.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 5 Aug 2017 02:03:01 +0200
-Subject: [PATCH] maas: region: skip credentials update
-
-Password update for maas psql database breaks ulterior acesses
-to maas-region syncdb.
-For now, limit regiond.conf changes to maas_url, and skip
-updating credentials.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
-
-diff --git a/maas/region.sls b/maas/region.sls
-index d3227ca..8a2243d 100644
---- a/maas/region.sls
-+++ b/maas/region.sls
-@@ -6,10 +6,9 @@
- - names: {{ region.pkgs }}
-
- /etc/maas/regiond.conf:
-- file.managed:
-- - source: salt://maas/files/regiond.conf
-- - template: jinja
-- - group: maas
-+ file.replace:
-+ - pattern: ^maas_url.*$
-+ - repl: "maas_url: http://{{ region.bind.host }}:5240/MAAS"
- - require:
- - pkg: maas_region_packages
-