From 0915e0c6bd9d9d370fbf05963704690580af62ec Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Thu, 2 Jan 2014 15:05:41 +0100
Subject: [PATCH] Add oslo.rootwrap to devstack gate

oslo.rootwrap recently graduated but was not made part of the
devstack-gate. This change is part of a series of changes affecting
devstack-gate, config and devstack which will collectively fix this:

https://review.openstack.org/#/q/status:open+topic:rootwrap-gate,n,z

This should probably be merged once the config and devstack-gate changes
are in, so that it can be self-testing.

Change-Id: I7b1332c8004845a0dd76e27d871370d41d4524ac
---
 lib/oslo | 4 ++++
 stackrc  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/oslo b/lib/oslo
index 816ae9a48a..f644ed76c3 100644
--- a/lib/oslo
+++ b/lib/oslo
@@ -22,6 +22,7 @@ set +o xtrace
 # --------
 OSLOCFG_DIR=$DEST/oslo.config
 OSLOMSG_DIR=$DEST/oslo.messaging
+OSLORWRAP_DIR=$DEST/oslo.rootwrap
 
 # Entry Points
 # ------------
@@ -37,6 +38,9 @@ function install_oslo() {
 
     git_clone $OSLOMSG_REPO $OSLOMSG_DIR $OSLOMSG_BRANCH
     setup_develop $OSLOMSG_DIR
+
+    git_clone $OSLORWRAP_REPO $OSLORWRAP_DIR $OSLORWRAP_BRANCH
+    setup_develop $OSLORWRAP_DIR
 }
 
 # cleanup_oslo() - purge possibly old versions of oslo
diff --git a/stackrc b/stackrc
index 695bdb15d6..3fdc566ed2 100644
--- a/stackrc
+++ b/stackrc
@@ -136,6 +136,10 @@ OSLOCFG_BRANCH=${OSLOCFG_BRANCH:-master}
 OSLOMSG_REPO=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}
 OSLOMSG_BRANCH=${OSLOMSG_BRANCH:-master}
 
+# oslo.rootwrap
+OSLORWRAP_REPO=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git}
+OSLORWRAP_BRANCH=${OSLORWRAP_BRANCH:-master}
+
 # pbr drives the setuptools configs
 PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}
 PBR_BRANCH=${PBR_BRANCH:-master}