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 #1087 from ceph/vagrant-boxes 

use vagrant boxes that support libvirt and virtualbox
pull/1088/head
Sébastien Han 2016-11-09 12:09:00 +01:00 committed by GitHub
parent da7dd92e95 db657ed8e1
commit 38d84ce595
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/functional/centos/7/mon-osd/group_vars/all
View File

@ -5,8 +5,8 @@ public_network: "192.168.42.0/24"
cluster_network: "192.168.43.0/24" cluster_network: "192.168.43.0/24"
journal_size: 100 journal_size: 100
devices: devices:
- '/dev/sda'
- '/dev/sdb' - '/dev/sdb'
- '/dev/sdc'
journal_collocation: True journal_collocation: True
os_tuning_params: os_tuning_params:
- { name: kernel.pid_max, value: 4194303 } - { name: kernel.pid_max, value: 4194303 }

3
tests/functional/centos/7/mon-osd/hosts
View File

@ -1,6 +1,5 @@
[mons] [mons]
# centos7 uses the enp0s8 interface mon0 monitor_interface=eth1
mon0 monitor_interface=enp0s8
[osds] [osds]
osd0 osd0

2
tests/functional/centos/7/mon-osd/vagrant_variables.yml
View File

@ -46,7 +46,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at: # For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: box-cutter/centos72 vagrant_box: centos/7
#ssh_private_key_path: "~/.ssh/id_rsa" #ssh_private_key_path: "~/.ssh/id_rsa"
# 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

2
tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml
View File

@ -46,7 +46,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at: # For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: geerlingguy/ubuntu1604 vagrant_box: yk0/ubuntu-xenial
#ssh_private_key_path: "~/.ssh/id_rsa" #ssh_private_key_path: "~/.ssh/id_rsa"
# 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

2
tests/functional/ubuntu/16.04/mon/vagrant_variables.yml
View File

@ -46,7 +46,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
# For more boxes have a look at: # For more boxes have a look at:
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: geerlingguy/ubuntu1604 vagrant_box: yk0/ubuntu-xenial
#ssh_private_key_path: "~/.ssh/id_rsa" #ssh_private_key_path: "~/.ssh/id_rsa"
# 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

2
tox.ini
View File

@ -20,7 +20,7 @@ changedir=
xenial-mon-osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd xenial-mon-osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd
centos7-mon-osd: {toxinidir}/tests/functional/centos/7/mon-osd centos7-mon-osd: {toxinidir}/tests/functional/centos/7/mon-osd
commands= commands=
vagrant up --no-provision --provider=virtualbox vagrant up --no-provision {posargs:--provider=virtualbox}
bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample