From 919246ceaf08c9f0105bb57ecd0a2e83cc4b4e98 Mon Sep 17 00:00:00 2001
From: Maksym Shalamov <mshalamov@mirantis.com>
Date: Thu, 29 Sep 2016 17:59:48 +0300
Subject: [PATCH] Add AUTH_S3_KEYSTONE_CEPH_ENABLED setting

Also, add this setting handling in the create_cluster method

Change-Id: Iaf50eaba00bc5a0b224391902bca9989a0ef4edd
Closes-Bug: #1629299
---
 .gitignore                             | 1 +
 fuelweb_test/models/fuel_web_client.py | 9 +++++++++
 fuelweb_test/settings.py               | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/.gitignore b/.gitignore
index cf07c6873..ba53cadba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ lib
 lib64
 MANIFEST
 TAGS
+.venv
 
 # Installer logs
 pip-log.txt
diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py
index 343c97ca0..c502c785e 100644
--- a/fuelweb_test/models/fuel_web_client.py
+++ b/fuelweb_test/models/fuel_web_client.py
@@ -81,6 +81,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
@@ -690,6 +691,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'] =\
diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py
index 9b32f3d84..5cf7f65b1 100644
--- a/fuelweb_test/settings.py
+++ b/fuelweb_test/settings.py
@@ -747,6 +747,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")