openstack/zun
Code Issues Proposed changes

Remove conductor from devstack setting

Browse Source 
Now that we don't have conductor in Zun, let's remove from devstack
setting.

Change-Id: Ica5e5e55f81741b8ffb0c1f127db9e8b64afdee0
This commit is contained in:
Madhuri Kumari 2016-08-10 21:23:19 +05:30
parent d740149945
commit ae83aaeb24
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/lib/zun
View File

@ -246,12 +246,6 @@ function start_zun_api {
fi fi
} }
# start_zun_conductor() - Start Zun conductor
function start_zun_conductor {
echo "start zun conductor "
run_process zun-conductor "$ZUN_BIN_DIR/zun-conductor"
}
# start_zun_compute() - Start Zun compute agent # start_zun_compute() - Start Zun compute agent
function start_zun_compute { function start_zun_compute {
echo "start zun compute" echo "start zun compute"
@ -263,13 +257,12 @@ function start_zun {
# ``run_process`` checks ``is_service_enabled``, it is not needed here # ``run_process`` checks ``is_service_enabled``, it is not needed here
start_zun_api start_zun_api
start_zun_conductor
start_zun_compute start_zun_compute
} }
# stop_zun() - Stop running processes (non-screen) # stop_zun() - Stop running processes (non-screen)
function stop_zun { function stop_zun {
for serv in zun-api zun-conductor zun-compute; do for serv in zun-api zun-compute; do
stop_process $serv stop_process $serv
done done
} }

4
devstack/plugin.sh
View File

@ -8,7 +8,7 @@ echo_summary "zun's plugin.sh was called..."
source $DEST/higgins/devstack/lib/zun source $DEST/higgins/devstack/lib/zun
(set -o posix; set) (set -o posix; set)
if is_service_enabled zun-api zun-conductor; then if is_service_enabled zun-api zun-compute; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing zun" echo_summary "Installing zun"
install_zun install_zun
@ -30,7 +30,7 @@ if is_service_enabled zun-api zun-conductor; then
# Initialize zun # Initialize zun
init_zun init_zun
# Start the zun API and zun conductor # Start the zun API and zun compute
echo_summary "Starting zun" echo_summary "Starting zun"
start_zun start_zun

1
devstack/settings
View File

@ -17,5 +17,4 @@
# Enable Zun services # Enable Zun services
enable_service zun-api enable_service zun-api
enable_service zun-conductor
enable_service zun-compute enable_service zun-compute