From b90ba25358ee904576905729fffe15ee77854f2f Mon Sep 17 00:00:00 2001
From: Deepak C Shetty <deepakcs@redhat.com>
Date: Wed, 23 Dec 2015 12:49:21 +0530
Subject: [PATCH] TEST PATCH - DO NOT MERGE. TESTING RGW Support

Testing RGW support

Change-Id: I5b934ce7d7c56645fa77c0636b2decd74ecc1db9
---
 devstack/lib/ceph          | 5 +++++
 devstack/override-defaults | 7 ++++++-
 devstack/settings          | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index e640773a..91cbf6c7 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -521,6 +521,10 @@ if is_ubuntu; then
     echo deb http://ceph.com/debian-${CEPH_RELEASE} $(lsb_release -sc) main \
     | sudo tee /etc/apt/sources.list.d/ceph.list
 
+    # Update the devstack env var since we modified the repo list, for
+    # apt-get update to happen
+    REPOS_UPDATED=False
+
     install_package ceph radosgw libnss3-tools
 else
     # Install directly from distro repos. See LP bug 1521073 for more details.
@@ -529,6 +533,7 @@ else
     # stack.sh
     install_package ceph ceph-radosgw
 fi
+
 }
 
 # start_ceph() - Start running processes, including screen
diff --git a/devstack/override-defaults b/devstack/override-defaults
index 4168b188..fac7d4ae 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -1,5 +1,10 @@
 # Plug-in overrides
 
+disable_service s-account
+disable_service s-container
+disable_service s-object
+disable_service s-proxy
+
 ENABLE_CEPH_CINDER=$(trueorfalse True ENABLE_CEPH_CINDER)
 ENABLE_CEPH_C_BAK=$(trueorfalse True ENABLE_CEPH_C_BAK)
 ENABLE_CEPH_GLANCE=$(trueorfalse True ENABLE_CEPH_GLANCE)
@@ -7,7 +12,7 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)
 
 # RGW is not enabled by default as its not used in upstream CI, yet!
 # Local devstack setup can enable it in localrc, if needed
-ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
+ENABLE_CEPH_RGW=$(trueorfalse True ENABLE_CEPH_RGW)
 
 if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
     CINDER_DRIVER=ceph
diff --git a/devstack/settings b/devstack/settings
index 64c86c04..4854b8db 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -14,6 +14,11 @@ CEPH_PLUGIN_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 TEMPEST_STORAGE_PROTOCOL=ceph
 CEPH_LOOPBACK_DISK_SIZE=8G
 
+disable_service s-account
+disable_service s-container
+disable_service s-object
+disable_service s-proxy
+
 # Source plugin's lib/ceph
 
 source $CEPH_PLUGIN_DIR/lib/ceph