diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-20 18:01:07 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 05:44:10 +0100 |
commit | d1de8877810d0ab0a6e0381e370f5eaa3b07e52d (patch) | |
tree | a6c9a2d3f1dc7e6665b8979b00da3dc24fe666f4 /patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | |
parent | 1c1cd04959057f18cf8dc4f0331def50f0066442 (diff) |
u/fuel: Bump & rebase for cinder retry
While at it, refresh Armband GPG public key embedded in maas config.
Change-Id: Id69677102ae8fea7a962578bae44e930afea8200
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch')
-rw-r--r-- | patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index 6e4618b8..2d663889 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -45,7 +45,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index fbddc6e..4f5e327 100755 +index 02b7009..9ec1409 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 @@ -57,10 +57,10 @@ index fbddc6e..4f5e327 100755 salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha -index 369e165..2eb6811 100755 +index cc46ac1..e70b6d3 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -50,3 +50,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon |