Move setup_develop call
Move setup_develop() call into the install_XXX() function as the
distinction has no real purpose. This eliminates the configure_XXXclient()
function for Nova and Swift.
Also create install_cinderclient() as we will need it to handle dependencies
in a followup patch.
Chasing down another #$^%&&^^^$%%#$ prettytable version pin
Change-Id: I61d761bc57a31caf2ed0ade326ab236eb2bb7358
diff --git a/lib/swift b/lib/swift
index 3e7ee20..eb57477 100644
--- a/lib/swift
+++ b/lib/swift
@@ -106,8 +106,6 @@
local swift_node_config
local swift_log_dir
- setup_develop $SWIFT_DIR
-
# Make sure to kill all swift processes first
swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
@@ -281,11 +279,6 @@
tee /etc/rsyslog.d/10-swift.conf
}
-# configure_swiftclient() - Set config files, create data dirs, etc
-function configure_swiftclient() {
- setup_develop $SWIFTCLIENT_DIR
-}
-
# create_swift_disk - Create Swift backing disk
function create_swift_disk() {
local node_number
@@ -374,13 +367,14 @@
function install_swift() {
git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
+ setup_develop $SWIFT_DIR
}
function install_swiftclient() {
git_clone $SWIFTCLIENT_REPO $SWIFTCLIENT_DIR $SWIFTCLIENT_BRANCH
+ setup_develop $SWIFTCLIENT_DIR
}
-
# start_swift() - Start running processes, including screen
function start_swift() {
# (re)start rsyslog