From 481173f20377b09d781ee6bc2d5b26c9d8637519 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Sat, 27 Jan 2018 19:40:09 +0000 Subject: [PATCH] Add default for radosgw_keystone_ssl This should default to False. The default for Keystone is not to use PKI keys, additionally, anybody using this setting had to have been manually setting it before. Fixes: #2111 --- group_vars/all.yml.sample | 1 + group_vars/rhcs.yml.sample | 1 + roles/ceph-defaults/defaults/main.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index bf79846d4..5c2e35c21 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -385,6 +385,7 @@ dummy: #radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #radosgw_address_block: subnet #radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/ +#radosgw_keystone_ssl: false # activate this when using keystone PKI keys # Rados Gateway options #email_address: foo@bar.com diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 8ffa32d87..f9b5da70e 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -385,6 +385,7 @@ ceph_repository: rhcs #radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #radosgw_address_block: subnet #radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/ +#radosgw_keystone_ssl: false # activate this when using keystone PKI keys # Rados Gateway options #email_address: foo@bar.com diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index af4015046..1486bc50a 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -377,6 +377,7 @@ radosgw_interface: interface radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 radosgw_address_block: subnet radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/ +radosgw_keystone_ssl: false # activate this when using keystone PKI keys # Rados Gateway options email_address: foo@bar.com -- 2.39.5