Merge pull request #223 from leseb/vagrant-if

Fix Vagrant vars for MDS and RGW
pull/225/head
Leseb 2015-03-02 17:48:48 +01:00
commit 4138221e19
1 changed files with 8 additions and 1 deletions

9
Vagrantfile vendored
View File

@ -27,11 +27,12 @@ ansible_provision = proc do |ansible|
} }
# In a production deployment, these should be secret # In a production deployment, these should be secret
if NRGWS != '0' if NMDSS != '0' && NRGWS != '0'
ansible.extra_vars = { ansible.extra_vars = {
fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==', monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
radosgw: 'true', radosgw: 'true',
mds: 'true',
} }
elsif NMDSS != '0' elsif NMDSS != '0'
ansible.extra_vars = { ansible.extra_vars = {
@ -39,6 +40,12 @@ ansible_provision = proc do |ansible|
monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==', monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
mds: 'true', mds: 'true',
} }
elsif NRGWS != '0'
ansible.extra_vars = {
fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
radosgw: 'true',
}
else else
ansible.extra_vars = { ansible.extra_vars = {
fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',