add missing variable rgw_swift_account_in_url and enable by default,

enable implicit_tenants by default

Change-Id: I1d139bd547f7ad2ef2cada54a8ad5461d2f4bdb7
Related-Prod: PROD-26452

diff --git a/ceph/files/jewel/ceph.conf.Debian b/ceph/files/jewel/ceph.conf.Debian
index e8d73a9925fee0b47d94df0e033782ceee2f89a3..6437535306395ea7a8bf5d5457edf834d64ec7c1 100644 (file)
--- a/ceph/files/jewel/ceph.conf.Debian
+++ b/ceph/files/jewel/ceph.conf.Debian
@@ -105,7 +105,8 @@ rgw keystone api version = {{ ident.get('api_version', 3) }}
 rgw keystone url = {{ ident.get('protocol', 'https') }}://{{ ident.host }}:{{ ident.get('port', '5000') }}
 rgw keystone accepted roles =  {{ ident.get('accepted_roles', '_member_, Member, admin, swiftoperator, ResellerAdmin') }}
 rgw keystone revocation interval = {{ ident.get('revocation_interval', '1000000') }}
-rgw keystone implicit tenants = {{ ident.get('implicit_tenants', 'false') }}
+rgw keystone implicit tenants = {{ ident.get('implicit_tenants', 'true') }}
+rgw swift account in url = {{ ident.get('swift_account_in_url', 'true') }}
 rgw s3 auth use keystone = {{ ident.get('s3_auth_use_keystone', 'true') }}
 rgw keystone admin user = {{ ident.get('user', 'admin') }}
 rgw keystone admin password = {{ ident.password }}

diff --git a/ceph/files/kraken/ceph.conf.Debian b/ceph/files/kraken/ceph.conf.Debian
index e8d73a9925fee0b47d94df0e033782ceee2f89a3..6437535306395ea7a8bf5d5457edf834d64ec7c1 100644 (file)
--- a/ceph/files/kraken/ceph.conf.Debian
+++ b/ceph/files/kraken/ceph.conf.Debian
@@ -105,7 +105,8 @@ rgw keystone api version = {{ ident.get('api_version', 3) }}
 rgw keystone url = {{ ident.get('protocol', 'https') }}://{{ ident.host }}:{{ ident.get('port', '5000') }}
 rgw keystone accepted roles =  {{ ident.get('accepted_roles', '_member_, Member, admin, swiftoperator, ResellerAdmin') }}
 rgw keystone revocation interval = {{ ident.get('revocation_interval', '1000000') }}
-rgw keystone implicit tenants = {{ ident.get('implicit_tenants', 'false') }}
+rgw keystone implicit tenants = {{ ident.get('implicit_tenants', 'true') }}
+rgw swift account in url = {{ ident.get('swift_account_in_url', 'true') }}
 rgw s3 auth use keystone = {{ ident.get('s3_auth_use_keystone', 'true') }}
 rgw keystone admin user = {{ ident.get('user', 'admin') }}
 rgw keystone admin password = {{ ident.password }}

diff --git a/ceph/files/luminous/ceph.conf.Debian b/ceph/files/luminous/ceph.conf.Debian
index e8d73a9925fee0b47d94df0e033782ceee2f89a3..6437535306395ea7a8bf5d5457edf834d64ec7c1 100644 (file)
--- a/ceph/files/luminous/ceph.conf.Debian
+++ b/ceph/files/luminous/ceph.conf.Debian
@@ -105,7 +105,8 @@ rgw keystone api version = {{ ident.get('api_version', 3) }}
 rgw keystone url = {{ ident.get('protocol', 'https') }}://{{ ident.host }}:{{ ident.get('port', '5000') }}
 rgw keystone accepted roles =  {{ ident.get('accepted_roles', '_member_, Member, admin, swiftoperator, ResellerAdmin') }}
 rgw keystone revocation interval = {{ ident.get('revocation_interval', '1000000') }}
-rgw keystone implicit tenants = {{ ident.get('implicit_tenants', 'false') }}
+rgw keystone implicit tenants = {{ ident.get('implicit_tenants', 'true') }}
+rgw swift account in url = {{ ident.get('swift_account_in_url', 'true') }}
 rgw s3 auth use keystone = {{ ident.get('s3_auth_use_keystone', 'true') }}
 rgw keystone admin user = {{ ident.get('user', 'admin') }}
 rgw keystone admin password = {{ ident.password }}