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 #1783 from ceph/remove-dup-var 

resync group_vars files
pull/1784/head
Sébastien Han 2017-08-22 11:40:27 +02:00 committed by GitHub
parent b8af5fc5a0 19ae8b42e6
commit 37ec3bc798
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/all.yml.sample
View File

@ -397,7 +397,6 @@ dummy:
#kv_type: etcd #kv_type: etcd
#kv_endpoint: 127.0.0.1 #kv_endpoint: 127.0.0.1
#kv_port: 2379 #kv_port: 2379
#containerized_deployment_with_kv: false
# this is only here for usage with the rolling_update.yml playbook # this is only here for usage with the rolling_update.yml playbook

4
group_vars/clients.yml.sample
View File

@ -22,6 +22,6 @@ dummy:
# To have have ansible setfacl the generated key for $user, set the acls var like so: # To have have ansible setfacl the generated key for $user, set the acls var like so:
# acls: ["u:$user:r--"] # acls: ["u:$user:r--"]
#keys: #keys:
# - { name: client.test, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", acls: [] } # - { name: client.test, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", mode: "0600", acls: [] }
# - { name: client.test2, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", acls: [] } # - { name: client.test2, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", mode: "0600", acls: [] }

1
group_vars/osds.yml.sample
View File

@ -200,6 +200,7 @@ dummy:
# Use 'osd_scenario: lvm' to enable this scenario. Currently we only support dedicated journals # Use 'osd_scenario: lvm' to enable this scenario. Currently we only support dedicated journals
# when using lvm, not collocated journals. # when using lvm, not collocated journals.
# lvm_volumes is a dictionary whose key/value pair represent a data lv and a journal pair. # lvm_volumes is a dictionary whose key/value pair represent a data lv and a journal pair.
# Any logical volume or logical group used must be a name and not a path.
# Journals can be either a lv, device or partition. You can not use the same journal for many data lvs. # Journals can be either a lv, device or partition. You can not use the same journal for many data lvs.
# For example: # For example:
# lvm_volumes: # lvm_volumes:

2
group_vars/rhcs.yml.sample
View File

@ -159,6 +159,7 @@ ceph_rhcs: true
# version. The previous version was 1.3. The current version is 2. # version. The previous version was 1.3. The current version is 2.
#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" #ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}"
#ceph_rhcs_cdn_install: "{{ ceph_stable_rh_storage_cdn_install | default(false) }}" # assumes all the nodes can connect to cdn.redhat.com #ceph_rhcs_cdn_install: "{{ ceph_stable_rh_storage_cdn_install | default(false) }}" # assumes all the nodes can connect to cdn.redhat.com
#ceph_rhcs_cdn_debian_repo: https://customername:customerpasswd@rhcs.download.redhat.com
#ceph_rhcs_iso_install: "{{ ceph_stable_rh_storage_iso_install | default(false) }}" # usually used when nodes don't have access to cdn.redhat.com #ceph_rhcs_iso_install: "{{ ceph_stable_rh_storage_iso_install | default(false) }}" # usually used when nodes don't have access to cdn.redhat.com
#ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}" #ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}"
#ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}" #ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
@ -396,7 +397,6 @@ ceph_rhcs: true
#kv_type: etcd #kv_type: etcd
#kv_endpoint: 127.0.0.1 #kv_endpoint: 127.0.0.1
#kv_port: 2379 #kv_port: 2379
#containerized_deployment_with_kv: false
# this is only here for usage with the rolling_update.yml playbook # this is only here for usage with the rolling_update.yml playbook

1
roles/ceph-defaults/defaults/main.yml
View File

@ -389,7 +389,6 @@ ceph_docker_on_openstack: false
kv_type: etcd kv_type: etcd
kv_endpoint: 127.0.0.1 kv_endpoint: 127.0.0.1
kv_port: 2379 kv_port: 2379
containerized_deployment_with_kv: false
# this is only here for usage with the rolling_update.yml playbook # this is only here for usage with the rolling_update.yml playbook