ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1044 from batrick/no-vagrant-dev-branch 

vagrant: use group_vars for ceph pkg source
pull/1045/head
Leseb 2016-10-21 22:57:48 +02:00 committed by GitHub
parent f7680b99b2 9225443785
commit 62c8b2f66c
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Vagrantfile vendored
View File

@ -64,14 +64,6 @@ ansible_provision = proc do |ansible|
journal_size: 100, journal_size: 100,
public_network: "#{PUBLIC_SUBNET}.0/24", public_network: "#{PUBLIC_SUBNET}.0/24",
} }
if settings['ceph_install_source'] == 'dev' then
ansible.extra_vars['ceph_dev'] = true
if settings['ceph_install_branch'] then
ansible.extra_vars['ceph_dev_branch'] = settings['ceph_install_branch']
end
else
ansible.extra_vars['ceph_stable'] = true
end
# In a production deployment, these should be secret # In a production deployment, these should be secret
if DOCKER then if DOCKER then

5
vagrant_variables.yml.linode
View File

@ -32,11 +32,6 @@ iscsi_gw_vms: 0
# Deploy RESTAPI on each of the Monitors # Deploy RESTAPI on each of the Monitors
restapi: true restapi: true
# INSTALL SOURCE OF CEPH
# valid values are 'stable' and 'dev'
ceph_install_source: 'dev'
ceph_install_branch: 'master'
# The sync directory changes based on vagrant box # The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
# vagrant_sync_dir: /home/vagrant/sync # vagrant_sync_dir: /home/vagrant/sync

4
vagrant_variables.yml.sample
View File

@ -16,10 +16,6 @@ iscsi_gw_vms: 0
# Deploy RESTAPI on each of the Monitors # Deploy RESTAPI on each of the Monitors
restapi: true restapi: true
# INSTALL SOURCE OF CEPH
# valid values are 'stable' and 'dev'
ceph_install_source: stable
# SUBNETS TO USE FOR THE VMS # SUBNETS TO USE FOR THE VMS
public_subnet: 192.168.42 public_subnet: 192.168.42
cluster_subnet: 192.168.43 cluster_subnet: 192.168.43