Add AUTH_S3_KEYSTONE_CEPH_ENABLED setting
Also, add this setting handling in the create_cluster method Change-Id: Iaf50eaba00bc5a0b224391902bca9989a0ef4edd Closes-Bug: #1629299
This commit is contained in:
parent
049d282db7
commit
919246ceaf
|
@ -19,6 +19,7 @@ lib
|
||||||
lib64
|
lib64
|
||||||
MANIFEST
|
MANIFEST
|
||||||
TAGS
|
TAGS
|
||||||
|
.venv
|
||||||
|
|
||||||
# Installer logs
|
# Installer logs
|
||||||
pip-log.txt
|
pip-log.txt
|
||||||
|
|
|
@ -81,6 +81,7 @@ from fuelweb_test.settings import KEYSTONE_CREDS
|
||||||
from fuelweb_test.settings import KVM_USE
|
from fuelweb_test.settings import KVM_USE
|
||||||
from fuelweb_test.settings import MULTIPLE_NETWORKS
|
from fuelweb_test.settings import MULTIPLE_NETWORKS
|
||||||
from fuelweb_test.settings import NOVA_QUOTAS_ENABLED
|
from fuelweb_test.settings import NOVA_QUOTAS_ENABLED
|
||||||
|
from fuelweb_test.settings import AUTH_S3_KEYSTONE_CEPH_ENABLED
|
||||||
from fuelweb_test.settings import NETWORK_PROVIDERS
|
from fuelweb_test.settings import NETWORK_PROVIDERS
|
||||||
from fuelweb_test.settings import NEUTRON
|
from fuelweb_test.settings import NEUTRON
|
||||||
from fuelweb_test.settings import NEUTRON_SEGMENT
|
from fuelweb_test.settings import NEUTRON_SEGMENT
|
||||||
|
@ -690,6 +691,14 @@ class FuelWebClient29(object):
|
||||||
nova_quotas = attributes['editable']['common']['nova_quota']
|
nova_quotas = attributes['editable']['common']['nova_quota']
|
||||||
nova_quotas['value'] = True
|
nova_quotas['value'] = True
|
||||||
|
|
||||||
|
if AUTH_S3_KEYSTONE_CEPH_ENABLED:
|
||||||
|
logger.info(
|
||||||
|
'Enable S3 API Authentication \
|
||||||
|
via Keystone in Ceph RadosGW')
|
||||||
|
auth_s3_keystone_ceph = \
|
||||||
|
attributes['editable']['common']['auth_s3_keystone_ceph']
|
||||||
|
auth_s3_keystone_ceph['value'] = True
|
||||||
|
|
||||||
if not help_data.TASK_BASED_ENGINE:
|
if not help_data.TASK_BASED_ENGINE:
|
||||||
logger.info('Switch to Granular deploy')
|
logger.info('Switch to Granular deploy')
|
||||||
attributes['editable']['common']['task_deploy']['value'] =\
|
attributes['editable']['common']['task_deploy']['value'] =\
|
||||||
|
|
|
@ -747,6 +747,9 @@ IRONIC_USER_IMAGE_URL = os.environ.get(
|
||||||
|
|
||||||
NOVA_QUOTAS_ENABLED = get_var_as_bool("NOVA_QUOTAS_ENABLED", False)
|
NOVA_QUOTAS_ENABLED = get_var_as_bool("NOVA_QUOTAS_ENABLED", False)
|
||||||
|
|
||||||
|
AUTH_S3_KEYSTONE_CEPH_ENABLED = get_var_as_bool(
|
||||||
|
"AUTH_S3_KEYSTONE_CEPH_ENABLED", False)
|
||||||
|
|
||||||
DISABLE_OFFLOADING = get_var_as_bool("DISABLE_OFFLOADING", True)
|
DISABLE_OFFLOADING = get_var_as_bool("DISABLE_OFFLOADING", True)
|
||||||
|
|
||||||
GERRIT_PROJECT = os.environ.get("GERRIT_PROJECT")
|
GERRIT_PROJECT = os.environ.get("GERRIT_PROJECT")
|
||||||
|
|
Loading…
Reference in New Issue