Now that we have a working external plugin mechanism stackforge
projects definitely don't need to be directly in devstack. These were
largely unused previously anyway.
Change-Id: I300686b2ac976d9b454404842b3f210fd7c239d9
| ... | ... |
@@ -167,7 +167,6 @@ Scripts |
| 167 | 167 |
* `lib/oslo <lib/oslo.html>`__ |
| 168 | 168 |
* `lib/rpc\_backend <lib/rpc_backend.html>`__ |
| 169 | 169 |
* `lib/sahara <lib/sahara.html>`__ |
| 170 |
-* `lib/stackforge <lib/stackforge.html>`__ |
|
| 171 | 170 |
* `lib/swift <lib/swift.html>`__ |
| 172 | 171 |
* `lib/tempest <lib/tempest.html>`__ |
| 173 | 172 |
* `lib/tls <lib/tls.html>`__ |
| 174 | 173 |
deleted file mode 100644 |
| ... | ... |
@@ -1,56 +0,0 @@ |
| 1 |
-#!/bin/bash |
|
| 2 |
-# |
|
| 3 |
-# lib/stackforge |
|
| 4 |
-# |
|
| 5 |
-# Functions to install stackforge libraries that we depend on so |
|
| 6 |
-# that we can try their git versions during devstack gate. |
|
| 7 |
-# |
|
| 8 |
-# This is appropriate for python libraries that release to pypi and are |
|
| 9 |
-# expected to be used beyond OpenStack like, but are requirements |
|
| 10 |
-# for core services in global-requirements. |
|
| 11 |
-# |
|
| 12 |
-# * wsme |
|
| 13 |
-# * pecan |
|
| 14 |
-# |
|
| 15 |
-# This is not appropriate for stackforge projects which are early stage |
|
| 16 |
-# OpenStack tools |
|
| 17 |
- |
|
| 18 |
-# Dependencies: |
|
| 19 |
-# ``functions`` file |
|
| 20 |
- |
|
| 21 |
-# ``stack.sh`` calls the entry points in this order: |
|
| 22 |
-# |
|
| 23 |
-# install_stackforge |
|
| 24 |
- |
|
| 25 |
-# Save trace setting |
|
| 26 |
-XTRACE=$(set +o | grep xtrace) |
|
| 27 |
-set +o xtrace |
|
| 28 |
- |
|
| 29 |
- |
|
| 30 |
-# Defaults |
|
| 31 |
-# -------- |
|
| 32 |
-WSME_DIR=$DEST/wsme |
|
| 33 |
-PECAN_DIR=$DEST/pecan |
|
| 34 |
-SQLALCHEMY_MIGRATE_DIR=$DEST/sqlalchemy-migrate |
|
| 35 |
- |
|
| 36 |
-# Entry Points |
|
| 37 |
-# ------------ |
|
| 38 |
- |
|
| 39 |
-# install_stackforge() - Collect source and prepare |
|
| 40 |
-function install_stackforge {
|
|
| 41 |
- git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH |
|
| 42 |
- setup_package $WSME_DIR |
|
| 43 |
- |
|
| 44 |
- git_clone $PECAN_REPO $PECAN_DIR $PECAN_BRANCH |
|
| 45 |
- setup_package $PECAN_DIR |
|
| 46 |
- |
|
| 47 |
- git_clone $SQLALCHEMY_MIGRATE_REPO $SQLALCHEMY_MIGRATE_DIR $SQLALCHEMY_MIGRATE_BRANCH |
|
| 48 |
- setup_package $SQLALCHEMY_MIGRATE_DIR |
|
| 49 |
-} |
|
| 50 |
- |
|
| 51 |
-# Restore xtrace |
|
| 52 |
-$XTRACE |
|
| 53 |
- |
|
| 54 |
-# Local variables: |
|
| 55 |
-# mode: shell-script |
|
| 56 |
-# End: |
| ... | ... |
@@ -500,7 +500,6 @@ source $TOP_DIR/lib/tls |
| 500 | 500 |
# Source project function libraries |
| 501 | 501 |
source $TOP_DIR/lib/infra |
| 502 | 502 |
source $TOP_DIR/lib/oslo |
| 503 |
-source $TOP_DIR/lib/stackforge |
|
| 504 | 503 |
source $TOP_DIR/lib/lvm |
| 505 | 504 |
source $TOP_DIR/lib/horizon |
| 506 | 505 |
source $TOP_DIR/lib/keystone |
| ... | ... |
@@ -699,11 +698,6 @@ install_infra |
| 699 | 699 |
# Install oslo libraries that have graduated |
| 700 | 700 |
install_oslo |
| 701 | 701 |
|
| 702 |
-# Install stackforge libraries for testing |
|
| 703 |
-if is_service_enabled stackforge_libs; then |
|
| 704 |
- install_stackforge |
|
| 705 |
-fi |
|
| 706 |
- |
|
| 707 | 702 |
# Install clients libraries |
| 708 | 703 |
install_keystoneclient |
| 709 | 704 |
install_glanceclient |
| ... | ... |
@@ -436,26 +436,6 @@ TIE_BRANCH=${TIE_BRANCH:-master}
|
| 436 | 436 |
|
| 437 | 437 |
################# |
| 438 | 438 |
# |
| 439 |
-# Additional Libraries |
|
| 440 |
-# |
|
| 441 |
-################# |
|
| 442 |
- |
|
| 443 |
-# stackforge libraries that are used by OpenStack core services |
|
| 444 |
-# wsme |
|
| 445 |
-WSME_REPO=${WSME_REPO:-${GIT_BASE}/stackforge/wsme.git}
|
|
| 446 |
-WSME_BRANCH=${WSME_BRANCH:-master}
|
|
| 447 |
- |
|
| 448 |
-# pecan |
|
| 449 |
-PECAN_REPO=${PECAN_REPO:-${GIT_BASE}/stackforge/pecan.git}
|
|
| 450 |
-PECAN_BRANCH=${PECAN_BRANCH:-master}
|
|
| 451 |
- |
|
| 452 |
-# sqlalchemy-migrate |
|
| 453 |
-SQLALCHEMY_MIGRATE_REPO=${SQLALCHEMY_MIGRATE_REPO:-${GIT_BASE}/stackforge/sqlalchemy-migrate.git}
|
|
| 454 |
-SQLALCHEMY_MIGRATE_BRANCH=${SQLALCHEMY_MIGRATE_BRANCH:-master}
|
|
| 455 |
- |
|
| 456 |
- |
|
| 457 |
-################# |
|
| 458 |
-# |
|
| 459 | 439 |
# 3rd Party Components (non pip installable) |
| 460 | 440 |
# |
| 461 | 441 |
# NOTE(sdague): these should be converted to release version installs or removed |