Browse code
Add cliff, pycadf, stevedore, & taskflow from oslo
Oslo has adopted 4 libraries that were previously on
stackforge, so we can now install them from source.
Change-Id: I6b6e20a7884b47ade466fc38641a5ac1a5f3e146
Doug Hellmann authored on 2014/02/11 02:59:43Showing 2 changed files
| ... | ... |
@@ -20,9 +20,13 @@ set +o xtrace |
| 20 | 20 |
|
| 21 | 21 |
# Defaults |
| 22 | 22 |
# -------- |
| 23 |
+CLIFF_DIR=$DEST/cliff |
|
| 23 | 24 |
OSLOCFG_DIR=$DEST/oslo.config |
| 24 | 25 |
OSLOMSG_DIR=$DEST/oslo.messaging |
| 25 | 26 |
OSLORWRAP_DIR=$DEST/oslo.rootwrap |
| 27 |
+PYCADF_DIR=$DEST/pycadf |
|
| 28 |
+STEVEDORE_DIR=$DEST/stevedore |
|
| 29 |
+TASKFLOW_DIR=$DEST/taskflow |
|
| 26 | 30 |
|
| 27 | 31 |
# Entry Points |
| 28 | 32 |
# ------------ |
| ... | ... |
@@ -33,6 +37,9 @@ function install_oslo() {
|
| 33 | 33 |
# for a smoother transition of existing users. |
| 34 | 34 |
cleanup_oslo |
| 35 | 35 |
|
| 36 |
+ git_clone $CLIFF_REPO $CLIFF_DIR $CLIFF_BRANCH |
|
| 37 |
+ setup_develop $CLIFF_DIR |
|
| 38 |
+ |
|
| 36 | 39 |
git_clone $OSLOCFG_REPO $OSLOCFG_DIR $OSLOCFG_BRANCH |
| 37 | 40 |
setup_develop $OSLOCFG_DIR |
| 38 | 41 |
|
| ... | ... |
@@ -41,6 +48,15 @@ function install_oslo() {
|
| 41 | 41 |
|
| 42 | 42 |
git_clone $OSLORWRAP_REPO $OSLORWRAP_DIR $OSLORWRAP_BRANCH |
| 43 | 43 |
setup_develop $OSLORWRAP_DIR |
| 44 |
+ |
|
| 45 |
+ git_clone $PYCADF_REPO $PYCADF_DIR $PYCADF_BRANCH |
|
| 46 |
+ setup_develop $PYCADF_DIR |
|
| 47 |
+ |
|
| 48 |
+ git_clone $STEVEDORE_REPO $STEVEDORE_DIR $STEVEDORE_BRANCH |
|
| 49 |
+ setup_develop $STEVEDORE_DIR |
|
| 50 |
+ |
|
| 51 |
+ git_clone $TASKFLOW_REPO $TASKFLOW_DIR $TASKFLOW_BRANCH |
|
| 52 |
+ setup_develop $TASKFLOW_DIR |
|
| 44 | 53 |
} |
| 45 | 54 |
|
| 46 | 55 |
# cleanup_oslo() - purge possibly old versions of oslo |
| ... | ... |
@@ -140,6 +140,10 @@ NOVACLIENT_BRANCH=${NOVACLIENT_BRANCH:-master}
|
| 140 | 140 |
OPENSTACKCLIENT_REPO=${OPENSTACKCLIENT_REPO:-${GIT_BASE}/openstack/python-openstackclient.git}
|
| 141 | 141 |
OPENSTACKCLIENT_BRANCH=${OPENSTACKCLIENT_BRANCH:-master}
|
| 142 | 142 |
|
| 143 |
+# cliff command line framework |
|
| 144 |
+CLIFF_REPO=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git}
|
|
| 145 |
+CLIFF_BRANCH=${CLIFF_BRANCH:-master}
|
|
| 146 |
+ |
|
| 143 | 147 |
# oslo.config |
| 144 | 148 |
OSLOCFG_REPO=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git}
|
| 145 | 149 |
OSLOCFG_BRANCH=${OSLOCFG_BRANCH:-master}
|
| ... | ... |
@@ -152,6 +156,18 @@ OSLOMSG_BRANCH=${OSLOMSG_BRANCH:-master}
|
| 152 | 152 |
OSLORWRAP_REPO=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git}
|
| 153 | 153 |
OSLORWRAP_BRANCH=${OSLORWRAP_BRANCH:-master}
|
| 154 | 154 |
|
| 155 |
+# pycadf auditing library |
|
| 156 |
+PYCADF_REPO=${PYCADF_REPO:-${GIT_BASE}/openstack/pycadf.git}
|
|
| 157 |
+PYCADF_BRANCH=${PYCADF_BRANCH:-master}
|
|
| 158 |
+ |
|
| 159 |
+# stevedore plugin manager |
|
| 160 |
+STEVEDORE_REPO=${STEVEDORE_REPO:-${GIT_BASE}/openstack/stevedore.git}
|
|
| 161 |
+STEVEDORE_BRANCH=${STEVEDORE_BRANCH:-master}
|
|
| 162 |
+ |
|
| 163 |
+# taskflow plugin manager |
|
| 164 |
+TASKFLOW_REPO=${TASKFLOW_REPO:-${GIT_BASE}/openstack/taskflow.git}
|
|
| 165 |
+TASKFLOW_BRANCH=${TASKFLOW_BRANCH:-master}
|
|
| 166 |
+ |
|
| 155 | 167 |
# pbr drives the setuptools configs |
| 156 | 168 |
PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}
|
| 157 | 169 |
PBR_BRANCH=${PBR_BRANCH:-master}
|