Merge "[patch] OVS bridges should not use 'auto'"
[fuel.git] / mcp / patches / 0002-maas-region-skip-credentials-update.patch
1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2018 Mirantis Inc., Enea AB and others.
3 :
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
10 Date: Sat, 5 Aug 2017 02:03:01 +0200
11 Subject: [PATCH] maas: region: skip credentials update
12
13 Password update for maas psql database breaks ulterior acesses
14 to maas-region syncdb.
15 For now, limit regiond.conf changes to maas_url, and skip
16 updating credentials.
17
18 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
19 ---
20
21 diff --git a/maas/region.sls b/maas/region.sls
22 index d3227ca..8a2243d 100644
23 --- a/maas/region.sls
24 +++ b/maas/region.sls
25 @@ -6,10 +6,9 @@
26      - names: {{ region.pkgs }}
27
28  /etc/maas/regiond.conf:
29 -  file.managed:
30 -  - source: salt://maas/files/regiond.conf
31 -  - template: jinja
32 -  - group: maas
33 +  file.replace:
34 +  - pattern: ^maas_url.*$
35 +  - repl: "maas_url: http://{{ region.bind.host }}:5240/MAAS"
36    - require:
37      - pkg: maas_region_packages
38