diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-11 13:35:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-11 13:35:24 +0000 |
| commit | 9720ddf955b76d678a08dc7ea53684400c659ce3 (patch) | |
| tree | 7bc82d5ec1cd3bb9f603955c2b923555c65ec038 /mcp/patches/0002-maas-region-skip-credentials-update.patch | |
| parent | f8137ae0ea1c41c2e37a7ccd2a5d4b65a37e5dba (diff) | |
| parent | 75c464b5bdeac188902d17576981c8074624ddf0 (diff) | |
Merge "maas: region: credentials workaround, force sync"
Diffstat (limited to 'mcp/patches/0002-maas-region-skip-credentials-update.patch')
| -rw-r--r-- | mcp/patches/0002-maas-region-skip-credentials-update.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/mcp/patches/0002-maas-region-skip-credentials-update.patch b/mcp/patches/0002-maas-region-skip-credentials-update.patch new file mode 100644 index 000000000..f2104e51f --- /dev/null +++ b/mcp/patches/0002-maas-region-skip-credentials-update.patch @@ -0,0 +1,30 @@ +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 }}/MAAS" + - require: + - pkg: maas_region_packages + |