X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=patches%2Fopnfv-fuel%2F0001-salt-formulas-Add-enable-armband-formula.patch;fp=patches%2Fopnfv-fuel%2F0001-salt-formulas-Add-enable-armband-formula.patch;h=50687698e06a85b4e9bdef090daae1bd876c3d44;hb=db0fc039e923b03efbe645b59c75b4e01cecf8f6;hp=1e986544b463f55fc4440ee07d4885ce7ed8c68c;hpb=f9e87162f57a5fcc7cfa6f68cbd818c3306d3dec;p=armband.git

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 1e986544..50687698 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
@@ -42,7 +42,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 73c44bb6..4ac5d6d5 100755
+index f0809042..91c7e2f7 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
@@ -51,13 +51,13 @@ index 73c44bb6..4ac5d6d5 100755
  salt -I 'nova:compute' state.sls nova
 +wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
 
- salt -I 'redis:cluster:role:master' state.sls redis
- salt -I 'redis:server' state.sls redis
+ salt -I 'barbican:server' state.sls barbican -b 1
+ salt -I 'barbican:client' state.sls barbican
 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index 70db238b..52d643df 100755
+index 02530236..95f95a7b 100755
 --- a/mcp/config/states/openstack_noha
 +++ b/mcp/config/states/openstack_noha
-@@ -54,3 +54,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
+@@ -57,3 +57,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
  salt -I 'ceilometer:agent' state.sls ceilometer
 
  salt -I 'horizon:server' state.sls horizon