Merge pull request #313 from ceph/change-default-options

Change default options
pull/315/head
Leseb 2015-07-03 18:48:58 +02:00
commit 08fad35751
7 changed files with 10 additions and 8 deletions

2
Vagrantfile vendored
View File

@ -32,6 +32,8 @@ ansible_provision = proc do |ansible|
# In a production deployment, these should be secret # In a production deployment, these should be secret
ansible.extra_vars = { ansible.extra_vars = {
ceph_stable: 'true',
journal_collocation: 'true',
fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==', monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
journal_size: 100, journal_size: 100,

View File

@ -20,7 +20,7 @@ dummy:
######## ########
# COMMUNITY VERSION # COMMUNITY VERSION
#ceph_stable: true # use ceph stable branch #ceph_stable: false # use ceph stable branch
#ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc #ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
#ceph_stable_release: hammer # ceph stable release #ceph_stable_release: hammer # ceph stable release
@ -57,7 +57,7 @@ dummy:
# on RHEL 7. # on RHEL 7.
# #
#ceph_stable_rh_storage: false #ceph_stable_rh_storage: false
#ceph_stable_rh_storage_cdn_install: true # assumes all the nodes can connect to cdn.redhat.com #ceph_stable_rh_storage_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
#ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com #ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
#ceph_stable_rh_storage_iso_path: #ceph_stable_rh_storage_iso_path:
#ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount #ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount

View File

@ -11,7 +11,7 @@ dummy:
# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
#fsid: "{{ cluster_uuid.stdout }}" #fsid: "{{ cluster_uuid.stdout }}"
# monitor_secret: #monitor_secret:
#cephx: true #cephx: true
# CephFS # CephFS

View File

@ -69,7 +69,7 @@ osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host
# This will collocate both journal and data on the same disk # This will collocate both journal and data on the same disk
# creating a partition at the beginning of the device # creating a partition at the beginning of the device
#journal_collocation: true #journal_collocation: false
# II. Second scenario: single journal device for N OSDs # II. Second scenario: single journal device for N OSDs

View File

@ -17,7 +17,7 @@ restapi_group_name: restapis
######## ########
# COMMUNITY VERSION # COMMUNITY VERSION
ceph_stable: true # use ceph stable branch ceph_stable: false # use ceph stable branch
ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
ceph_stable_release: hammer # ceph stable release ceph_stable_release: hammer # ceph stable release
@ -54,7 +54,7 @@ ceph_stable_ice: false # use Inktank Ceph Enterprise
# on RHEL 7. # on RHEL 7.
# #
ceph_stable_rh_storage: false ceph_stable_rh_storage: false
ceph_stable_rh_storage_cdn_install: true # assumes all the nodes can connect to cdn.redhat.com ceph_stable_rh_storage_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
#ceph_stable_rh_storage_iso_path: #ceph_stable_rh_storage_iso_path:
ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount

View File

@ -9,7 +9,7 @@ rgw_group_name: rgws
# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
fsid: "{{ cluster_uuid.stdout }}" fsid: "{{ cluster_uuid.stdout }}"
# monitor_secret: #monitor_secret:
cephx: true cephx: true
# CephFS # CephFS

View File

@ -66,7 +66,7 @@ osd_auto_discovery: false
# This will collocate both journal and data on the same disk # This will collocate both journal and data on the same disk
# creating a partition at the beginning of the device # creating a partition at the beginning of the device
journal_collocation: true journal_collocation: false
# II. Second scenario: single journal device for N OSDs # II. Second scenario: single journal device for N OSDs