From 117c6c2048e232660613666b9e606991a5ad32b6 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 10 Feb 2015 07:53:36 -0500 Subject: [PATCH] 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 --- doc/source/index.rst | 1 - lib/stackforge | 56 -------------------------------------------- stack.sh | 6 ----- stackrc | 20 ---------------- unstack.sh | 1 - 5 files changed, 84 deletions(-) delete mode 100644 lib/stackforge diff --git a/doc/source/index.rst b/doc/source/index.rst index 0790d1e7e1..be77dc12a5 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -167,7 +167,6 @@ Scripts * `lib/oslo `__ * `lib/rpc\_backend `__ * `lib/sahara `__ -* `lib/stackforge `__ * `lib/swift `__ * `lib/tempest `__ * `lib/tls `__ diff --git a/lib/stackforge b/lib/stackforge deleted file mode 100644 index cc3a689973..0000000000 --- a/lib/stackforge +++ /dev/null @@ -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: diff --git a/stack.sh b/stack.sh index eaecea075c..3f97919e0e 100755 --- a/stack.sh +++ b/stack.sh @@ -500,7 +500,6 @@ source $TOP_DIR/lib/tls # Source project function libraries source $TOP_DIR/lib/infra source $TOP_DIR/lib/oslo -source $TOP_DIR/lib/stackforge source $TOP_DIR/lib/lvm source $TOP_DIR/lib/horizon source $TOP_DIR/lib/keystone @@ -699,11 +698,6 @@ install_infra # Install oslo libraries that have graduated install_oslo -# Install stackforge libraries for testing -if is_service_enabled stackforge_libs; then - install_stackforge -fi - # Install clients libraries install_keystoneclient install_glanceclient diff --git a/stackrc b/stackrc index ff821401d7..7bb4cc29d9 100644 --- a/stackrc +++ b/stackrc @@ -434,26 +434,6 @@ ORC_BRANCH=${ORC_BRANCH:-master} TIE_REPO=${TIE_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git} 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) diff --git a/unstack.sh b/unstack.sh index b8b7f4a130..bc439e90bf 100755 --- a/unstack.sh +++ b/unstack.sh @@ -54,7 +54,6 @@ source $TOP_DIR/lib/tls # Source project function libraries source $TOP_DIR/lib/infra source $TOP_DIR/lib/oslo -source $TOP_DIR/lib/stackforge source $TOP_DIR/lib/lvm source $TOP_DIR/lib/horizon source $TOP_DIR/lib/keystone