From 9092213aa7ade753db90eaa41755e6f1182ff941 Mon Sep 17 00:00:00 2001 From: Saad Zaher Date: Fri, 14 Oct 2016 01:37:05 +0100 Subject: [PATCH] Install python-freezerclient while using devstack plugin Change-Id: Ibd0ade2ad7bc3313783c400a024589f0d4afb0c1 --- devstack/lib/freezer-web-ui | 6 ++++++ devstack/plugin.sh | 1 + devstack/settings | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/devstack/lib/freezer-web-ui b/devstack/lib/freezer-web-ui index 6978cee..22d6600 100644 --- a/devstack/lib/freezer-web-ui +++ b/devstack/lib/freezer-web-ui @@ -81,6 +81,12 @@ function stop_freezer_web_ui { : } +# Setup python-freezerclient +function install_freezerclient { + + git_clone $FREEZERCLIENT_REPO $FREEZERCLIENT_DIR $FREEZERCLIENT_BRANCH + setup_develop $FREEZERCLIENT_DIR +} # Restore xtrace $XTRACE diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 57be877..c3a9ee2 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -22,6 +22,7 @@ if is_service_enabled freezer-web-ui; then if [[ "$1" == "stack" && "$2" == "install" ]]; then echo_summary "Installing Freezer Web UI" install_freezer_web_ui + install_freezerclient elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then echo_summary "Configuring Freezer Web UI" configure_freezer_web_ui diff --git a/devstack/settings b/devstack/settings index 5af032a..034a8e9 100644 --- a/devstack/settings +++ b/devstack/settings @@ -23,5 +23,10 @@ FREEZER_WEB_UI_FILES=${FREEZER_WEB_UI_DIR}/devstack/files FREEZER_WEB_UI_REPO=${FREEZER_WEB_UI_REPO:-${GIT_BASE}/openstack/freezer-web-ui.git} FREEZER_WEB_UI_BRANCH=${FREEZER_WEB_UI_BRANCH:-master} +# Setup python-freezerclient +FREEZERCLIENT_DIR=$DEST/python-freezerclient +FREEZERCLIENT_REPO=${FREEZERCLIENT_REPO:-${GIT_BASE}/openstack/python-freezerclient.git} +FREEZERCLIENT_BRANCH=${FREEZERCLIENT_BRANCH:-master} + # Enable freezer-web-ui enable_service freezer-web-ui