From: Sébastien Han Date: Wed, 23 May 2018 19:44:24 +0000 (-0700) Subject: group_vars: resync group_vars X-Git-Tag: v3.1.0rc4~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1fe587441fbe7593701a1749112d5e3f44872461;p=ceph-ansible.git group_vars: resync group_vars The previous commit changed the content of roles/$ROLE/default/main.yml so we have to re generate the group_vars files. Signed-off-by: Sébastien Han (cherry picked from commit 3c32280ca1093f6c3abe0038f524ee3b88dd3672) Signed-off-by: Sébastien Han --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index b142bf4a0..dbaae46a2 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -533,7 +533,6 @@ dummy: #docker_pull_timeout: "300s" - ############# # OPENSTACK # ############# diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index b142bf4a0..cdefcd0ca 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -29,7 +29,7 @@ dummy: # mimic: 13 # Directory to fetch cluster fsid, keys etc... -#fetch_directory: fetch/ +fetch_directory: ~/ceph-ansible-keys # The 'cluster' variable determines the name of the cluster. # Changing the default value to something else means that you will @@ -135,14 +135,14 @@ dummy: # - 'distro' means that no separate repo file will be added # you will get whatever version of Ceph is included in your Linux distro. # 'local' means that the ceph binaries will be copied over from the local machine -#ceph_origin: "{{ 'repository' if ceph_rhcs or ceph_stable or ceph_dev or ceph_stable_uca or ceph_custom else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 +ceph_origin: repository #valid_ceph_origins: # - repository # - distro # - local -#ceph_repository: "{{ 'community' if ceph_stable else 'rhcs' if ceph_rhcs else 'dev' if ceph_dev else 'uca' if ceph_stable_uca else 'custom' if ceph_custom else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 +ceph_repository: rhcs #valid_ceph_repository: # - community # - rhcs @@ -533,7 +533,6 @@ dummy: #docker_pull_timeout: "300s" - ############# # OPENSTACK # #############