remove lib/stackforge
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
This commit is contained in:
parent
fdb00b4b56
commit
117c6c2048
@ -167,7 +167,6 @@ Scripts
|
|||||||
* `lib/oslo <lib/oslo.html>`__
|
* `lib/oslo <lib/oslo.html>`__
|
||||||
* `lib/rpc\_backend <lib/rpc_backend.html>`__
|
* `lib/rpc\_backend <lib/rpc_backend.html>`__
|
||||||
* `lib/sahara <lib/sahara.html>`__
|
* `lib/sahara <lib/sahara.html>`__
|
||||||
* `lib/stackforge <lib/stackforge.html>`__
|
|
||||||
* `lib/swift <lib/swift.html>`__
|
* `lib/swift <lib/swift.html>`__
|
||||||
* `lib/tempest <lib/tempest.html>`__
|
* `lib/tempest <lib/tempest.html>`__
|
||||||
* `lib/tls <lib/tls.html>`__
|
* `lib/tls <lib/tls.html>`__
|
||||||
|
@ -1,56 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# lib/stackforge
|
|
||||||
#
|
|
||||||
# Functions to install stackforge libraries that we depend on so
|
|
||||||
# that we can try their git versions during devstack gate.
|
|
||||||
#
|
|
||||||
# This is appropriate for python libraries that release to pypi and are
|
|
||||||
# expected to be used beyond OpenStack like, but are requirements
|
|
||||||
# for core services in global-requirements.
|
|
||||||
#
|
|
||||||
# * wsme
|
|
||||||
# * pecan
|
|
||||||
#
|
|
||||||
# This is not appropriate for stackforge projects which are early stage
|
|
||||||
# OpenStack tools
|
|
||||||
|
|
||||||
# Dependencies:
|
|
||||||
# ``functions`` file
|
|
||||||
|
|
||||||
# ``stack.sh`` calls the entry points in this order:
|
|
||||||
#
|
|
||||||
# install_stackforge
|
|
||||||
|
|
||||||
# Save trace setting
|
|
||||||
XTRACE=$(set +o | grep xtrace)
|
|
||||||
set +o xtrace
|
|
||||||
|
|
||||||
|
|
||||||
# Defaults
|
|
||||||
# --------
|
|
||||||
WSME_DIR=$DEST/wsme
|
|
||||||
PECAN_DIR=$DEST/pecan
|
|
||||||
SQLALCHEMY_MIGRATE_DIR=$DEST/sqlalchemy-migrate
|
|
||||||
|
|
||||||
# Entry Points
|
|
||||||
# ------------
|
|
||||||
|
|
||||||
# install_stackforge() - Collect source and prepare
|
|
||||||
function install_stackforge {
|
|
||||||
git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH
|
|
||||||
setup_package $WSME_DIR
|
|
||||||
|
|
||||||
git_clone $PECAN_REPO $PECAN_DIR $PECAN_BRANCH
|
|
||||||
setup_package $PECAN_DIR
|
|
||||||
|
|
||||||
git_clone $SQLALCHEMY_MIGRATE_REPO $SQLALCHEMY_MIGRATE_DIR $SQLALCHEMY_MIGRATE_BRANCH
|
|
||||||
setup_package $SQLALCHEMY_MIGRATE_DIR
|
|
||||||
}
|
|
||||||
|
|
||||||
# Restore xtrace
|
|
||||||
$XTRACE
|
|
||||||
|
|
||||||
# Local variables:
|
|
||||||
# mode: shell-script
|
|
||||||
# End:
|
|
6
stack.sh
6
stack.sh
@ -500,7 +500,6 @@ source $TOP_DIR/lib/tls
|
|||||||
# Source project function libraries
|
# Source project function libraries
|
||||||
source $TOP_DIR/lib/infra
|
source $TOP_DIR/lib/infra
|
||||||
source $TOP_DIR/lib/oslo
|
source $TOP_DIR/lib/oslo
|
||||||
source $TOP_DIR/lib/stackforge
|
|
||||||
source $TOP_DIR/lib/lvm
|
source $TOP_DIR/lib/lvm
|
||||||
source $TOP_DIR/lib/horizon
|
source $TOP_DIR/lib/horizon
|
||||||
source $TOP_DIR/lib/keystone
|
source $TOP_DIR/lib/keystone
|
||||||
@ -699,11 +698,6 @@ install_infra
|
|||||||
# Install oslo libraries that have graduated
|
# Install oslo libraries that have graduated
|
||||||
install_oslo
|
install_oslo
|
||||||
|
|
||||||
# Install stackforge libraries for testing
|
|
||||||
if is_service_enabled stackforge_libs; then
|
|
||||||
install_stackforge
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install clients libraries
|
# Install clients libraries
|
||||||
install_keystoneclient
|
install_keystoneclient
|
||||||
install_glanceclient
|
install_glanceclient
|
||||||
|
20
stackrc
20
stackrc
@ -434,26 +434,6 @@ ORC_BRANCH=${ORC_BRANCH:-master}
|
|||||||
TIE_REPO=${TIE_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
|
TIE_REPO=${TIE_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
|
||||||
TIE_BRANCH=${TIE_BRANCH:-master}
|
TIE_BRANCH=${TIE_BRANCH:-master}
|
||||||
|
|
||||||
#################
|
|
||||||
#
|
|
||||||
# Additional Libraries
|
|
||||||
#
|
|
||||||
#################
|
|
||||||
|
|
||||||
# stackforge libraries that are used by OpenStack core services
|
|
||||||
# wsme
|
|
||||||
WSME_REPO=${WSME_REPO:-${GIT_BASE}/stackforge/wsme.git}
|
|
||||||
WSME_BRANCH=${WSME_BRANCH:-master}
|
|
||||||
|
|
||||||
# pecan
|
|
||||||
PECAN_REPO=${PECAN_REPO:-${GIT_BASE}/stackforge/pecan.git}
|
|
||||||
PECAN_BRANCH=${PECAN_BRANCH:-master}
|
|
||||||
|
|
||||||
# sqlalchemy-migrate
|
|
||||||
SQLALCHEMY_MIGRATE_REPO=${SQLALCHEMY_MIGRATE_REPO:-${GIT_BASE}/stackforge/sqlalchemy-migrate.git}
|
|
||||||
SQLALCHEMY_MIGRATE_BRANCH=${SQLALCHEMY_MIGRATE_BRANCH:-master}
|
|
||||||
|
|
||||||
|
|
||||||
#################
|
#################
|
||||||
#
|
#
|
||||||
# 3rd Party Components (non pip installable)
|
# 3rd Party Components (non pip installable)
|
||||||
|
@ -54,7 +54,6 @@ source $TOP_DIR/lib/tls
|
|||||||
# Source project function libraries
|
# Source project function libraries
|
||||||
source $TOP_DIR/lib/infra
|
source $TOP_DIR/lib/infra
|
||||||
source $TOP_DIR/lib/oslo
|
source $TOP_DIR/lib/oslo
|
||||||
source $TOP_DIR/lib/stackforge
|
|
||||||
source $TOP_DIR/lib/lvm
|
source $TOP_DIR/lib/lvm
|
||||||
source $TOP_DIR/lib/horizon
|
source $TOP_DIR/lib/horizon
|
||||||
source $TOP_DIR/lib/keystone
|
source $TOP_DIR/lib/keystone
|
||||||
|
Loading…
Reference in New Issue
Block a user