Browse code
install oslo from upstream in devstack
the libraries that have graduated from oslo incubation need to be
made available in devstack so that projects can develop against
upstream versions of these libraries, and that we can test their
compatibility in the gate.
This should also allow us to force global requirements on all the
projects during installation.
Change-Id: Idf527b16b50eb58564ec74428290cd31424f5de2
Sean Dague authored on 2013/07/31 19:46:34Showing 3 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,42 @@ |
| 0 |
+# lib/oslo |
|
| 1 |
+# |
|
| 2 |
+# Functions to install oslo libraries from git |
|
| 3 |
+# |
|
| 4 |
+# We need this to handle the fact that projects would like to use |
|
| 5 |
+# pre-released versions of oslo libraries. |
|
| 6 |
+ |
|
| 7 |
+# Dependencies: |
|
| 8 |
+# ``functions`` file |
|
| 9 |
+ |
|
| 10 |
+# ``stack.sh`` calls the entry points in this order: |
|
| 11 |
+# |
|
| 12 |
+# install_oslo |
|
| 13 |
+ |
|
| 14 |
+# Save trace setting |
|
| 15 |
+XTRACE=$(set +o | grep xtrace) |
|
| 16 |
+set +o xtrace |
|
| 17 |
+ |
|
| 18 |
+ |
|
| 19 |
+# Defaults |
|
| 20 |
+# -------- |
|
| 21 |
+OSLOCFG_DIR=$DEST/oslo.config |
|
| 22 |
+OSLOMSG_DIR=$DEST/oslo.messaging |
|
| 23 |
+ |
|
| 24 |
+# Entry Points |
|
| 25 |
+# ------------ |
|
| 26 |
+ |
|
| 27 |
+# install_oslo() - Collect source and prepare |
|
| 28 |
+function install_oslo() {
|
|
| 29 |
+ git_clone $OSLOCFG_REPO $OSLOCFG_DIR $OSLOCFG_BRANCH |
|
| 30 |
+ setup_develop $OSLOCFG_DIR |
|
| 31 |
+ |
|
| 32 |
+ git_clone $OSLOMSG_REPO $OSLOMSG_DIR $OSLOMSG_BRANCH |
|
| 33 |
+ setup_develop $OSLOMSG_DIR |
|
| 34 |
+} |
|
| 35 |
+ |
|
| 36 |
+# Restore xtrace |
|
| 37 |
+$XTRACE |
|
| 38 |
+ |
|
| 39 |
+# Local variables: |
|
| 40 |
+# mode: shell-script |
|
| 41 |
+# End: |
| ... | ... |
@@ -299,6 +299,7 @@ SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
|
| 299 | 299 |
|
| 300 | 300 |
# Source project function libraries |
| 301 | 301 |
source $TOP_DIR/lib/tls |
| 302 |
+source $TOP_DIR/lib/oslo |
|
| 302 | 303 |
source $TOP_DIR/lib/horizon |
| 303 | 304 |
source $TOP_DIR/lib/keystone |
| 304 | 305 |
source $TOP_DIR/lib/glance |
| ... | ... |
@@ -661,6 +662,9 @@ echo_summary "Installing OpenStack project source" |
| 661 | 661 |
git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH |
| 662 | 662 |
setup_develop $PBR_DIR |
| 663 | 663 |
|
| 664 |
+# Install oslo libraries that have graduated |
|
| 665 |
+install_oslo |
|
| 666 |
+ |
|
| 664 | 667 |
# Install clients libraries |
| 665 | 668 |
install_keystoneclient |
| 666 | 669 |
install_glanceclient |
| ... | ... |
@@ -116,6 +116,14 @@ NOVACLIENT_BRANCH=${NOVACLIENT_BRANCH:-master}
|
| 116 | 116 |
OPENSTACKCLIENT_REPO=${OPENSTACKCLIENT_REPO:-${GIT_BASE}/openstack/python-openstackclient.git}
|
| 117 | 117 |
OPENSTACKCLIENT_BRANCH=${OPENSTACKCLIENT_BRANCH:-master}
|
| 118 | 118 |
|
| 119 |
+# oslo.config |
|
| 120 |
+OSLOCFG_REPO=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git}
|
|
| 121 |
+OSLOCFG_BRANCH=${OSLOCFG_BRANCH:-master}
|
|
| 122 |
+ |
|
| 123 |
+# oslo.messaging |
|
| 124 |
+OSLOMSG_REPO=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}
|
|
| 125 |
+OSLOMSG_BRANCH=${OSLOMSG_BRANCH:-master}
|
|
| 126 |
+ |
|
| 119 | 127 |
# pbr drives the setuptools configs |
| 120 | 128 |
PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}
|
| 121 | 129 |
PBR_BRANCH=${PBR_BRANCH:-master}
|