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

Rebased

pull/953/head
James Saint-Rossy 2016-09-29 19:48:54 -04:00
parent 99f1caa120 1a7d1ca6bf
commit e2198b3c6a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -9,7 +9,7 @@ DEBUG = false
config_file=File.expand_path(File.join(File.dirname(__FILE__), 'vagrant_variables.yml')) config_file=File.expand_path(File.join(File.dirname(__FILE__), 'vagrant_variables.yml'))
settings=YAML.load_file(config_file) settings=YAML.load_file(config_file)
LABEL_PREFIX = "" LABEL_PREFIX = settings['label_prefix'] ? settings['label_prefix'] : ""
NMONS = settings['mon_vms'] NMONS = settings['mon_vms']
NOSDS = settings['osd_vms'] NOSDS = settings['osd_vms']
NMDSS = settings['mds_vms'] NMDSS = settings['mds_vms']

4
group_vars/all.sample
View File

@ -132,8 +132,8 @@ dummy:
# #
#ceph_rhcs: false #ceph_rhcs: false
# This will affect how/what repositories are enabled depending on the desired # This will affect how/what repositories are enabled depending on the desired
# version. The next version will use "2" not "2.0" which would not work. # version. The previous version was 1.3. The current version is 2.
#ceph_rhcs_version: 1.3 # next version is 2 #ceph_rhcs_version: 2
#ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com #ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
#ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com #ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
#ceph_rhcs_iso_path: #ceph_rhcs_iso_path:

4
roles/ceph-common/defaults/main.yml
View File

@ -137,8 +137,8 @@ ceph_stable_redhat_distro: el7
# #
ceph_rhcs: false ceph_rhcs: false
# This will affect how/what repositories are enabled depending on the desired # This will affect how/what repositories are enabled depending on the desired
# version. The next version will use "2" not "2.0" which would not work. # version. The previous version was 1.3. The current version is 2.
ceph_rhcs_version: 1.3 # next version is 2 ceph_rhcs_version: 2
ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
#ceph_rhcs_iso_path: #ceph_rhcs_iso_path:

3
roles/ceph-common/templates/ceph.conf.j2
View File

@ -56,9 +56,6 @@ public_network = {{ public_network }}
{% if cluster_network is defined %} {% if cluster_network is defined %}
cluster_network = {{ cluster_network }} cluster_network = {{ cluster_network }}
{% endif %} {% endif %}
{% if common_single_host_mode is defined %}
osd crush chooseleaf type = 0
{% endif %}
[client.libvirt] [client.libvirt]
admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor

3
vagrant_variables.yml.linode
View File

@ -3,6 +3,9 @@
vagrant_box: 'linode' vagrant_box: 'linode'
vagrant_box_url: 'https://github.com/displague/vagrant-linode/raw/master/box/linode.box' vagrant_box_url: 'https://github.com/displague/vagrant-linode/raw/master/box/linode.box'
# Set a label prefix for the machines in this cluster. (This is useful and necessary when running multiple clusters concurrently.)
#label_prefix: 'foo'
ssh_username: 'vagrant' ssh_username: 'vagrant'
ssh_private_key_path: '~/.ssh/id_rsa' ssh_private_key_path: '~/.ssh/id_rsa'