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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index bf79846d483a54554afa274e6f81ae5833cf1feb..5c2e35c2144a22e415bde2163ae150f850eb12d6 100644 (file)
--- 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 8ffa32d87422a10bdbb420c13596e09c269e9018..f9b5da70e1f0f368aa47ee4e3256508876e74dd1 100644 (file)
--- 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 af40150464e9d09861434da63e0e574cb5ef2683..1486bc50adb98279c4b2bd7684524ce7048fe6ff 100644 (file)
--- 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