openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Add AUTH_S3_KEYSTONE_CEPH_ENABLED setting"

This commit is contained in:
Jenkins 2016-10-25 13:50:11 +00:00 committed by Gerrit Code Review
parent 7cf3599dfb 919246ceaf
commit 60b5adb103
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,6 +19,7 @@ lib
lib64
MANIFEST
TAGS
.venv
# Installer logs
pip-log.txt

9
fuelweb_test/models/fuel_web_client.py
View File

@ -82,6 +82,7 @@ from fuelweb_test.settings import KEYSTONE_CREDS
from fuelweb_test.settings import KVM_USE
from fuelweb_test.settings import MULTIPLE_NETWORKS
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 NEUTRON
from fuelweb_test.settings import NEUTRON_SEGMENT
@ -691,6 +692,14 @@ class FuelWebClient29(object):
nova_quotas = attributes['editable']['common']['nova_quota']
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:
logger.info('Switch to Granular deploy')
attributes['editable']['common']['task_deploy']['value'] =\

3
fuelweb_test/settings.py
View File

@ -744,6 +744,9 @@ IRONIC_USER_IMAGE_URL = os.environ.get(
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)
GERRIT_PROJECT = os.environ.get("GERRIT_PROJECT")