diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-05 16:44:05 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-21 15:15:31 +0000 |
| commit | 378d1f3b53053fee922accd48d37f1c678acd1fd (patch) | |
| tree | ee9012b822a3000a1aa822d7d62af9c6414769cc /mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch | |
| parent | ba754f2eb858756dd92b3f583442bbff9c991e82 (diff) | |
submodule: Bump salt-formula-maas
* bump salt-formula-maas git submodule;
* sync AArch64 initial salt config with the x86_64 default config;
* bump Pharos git submodule to sync `power_pass` MaaS configuration
paramater naming;
Change-Id: Ic59dd8becb6d83a9e67004c38d51681c88c4be7c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4c3c9c9a321d724e137f61e23509b6734ac836b7)
Diffstat (limited to 'mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch')
| -rw-r--r-- | mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch b/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch index aef087d92..fe5f4e671 100644 --- a/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch +++ b/mcp/patches/salt-formula-maas/0002-maas-region-allow-timeout-override.patch @@ -43,7 +43,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 40 insertions(+) diff --git a/maas/region.sls b/maas/region.sls -index 5844f22..d844bb4 100644 +index e0f65b0..d151e3a 100644 --- a/maas/region.sls +++ b/maas/region.sls @@ -38,6 +38,46 @@ restore_maas_database_{{ region.database.name }}: |