openstack
/
dragonflow
Code Issues Proposed changes

Use devstack-buildin service mgmt script 

Change-Id: Iceb7ac0effb403ed253cf842c3d7e94cd053a653
This commit is contained in:
Li Ma 2016-11-10 10:51:29 +08:00
parent 486581a73e
commit 7d3ccaab73
3 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack/etcd_driver
View File

@ -35,7 +35,7 @@ function _configure_etcd_systemd_service {
iniset $ETCD_CONF DEFAULT ETCD_NAME "$HOSTNAME"
sudo cp $DEST/dragonflow/devstack/etcd.service /lib/systemd/system/
sudo systemctl enable etcd
enable_service etcd
}
function _configure_etcd {
@ -87,21 +87,13 @@ function nb_db_driver_install_client {
function nb_db_driver_start_server {
if is_service_enabled df-etcd-server ; then
if is_ubuntu; then
sudo service etcd start || true
elif is_fedora; then
sudo systemctl start etcd || true
fi
start_service etcd
fi
}
function nb_db_driver_stop_server {
if is_service_enabled df-etcd-server ; then
if is_ubuntu; then
sudo service etcd stop || true
elif is_fedora; then
sudo systemctl stop etcd || true
fi
stop_service etcd
fi
}

2
devstack/redis_driver
View File

@ -127,7 +127,7 @@ function nb_db_driver_start_server {
[ "$create" ] && {
echo "Create the Redis cluster: "$redis_cluster
pushd /opt/redis3/bin/
echo "yes" |sudo ./redis-trib.rb create --replicas 1 $redis_cluster
echo "yes" | sudo ./redis-trib.rb create --replicas 1 $redis_cluster
popd
}

24
devstack/zookeeper_driver
View File

@ -32,12 +32,10 @@ function nb_db_driver_install_server {
sudo mkdir -p $ZOOKEEPER_LOG_DIR
sudo mkdir -p $ZOOKEEPER_CONF_DIR
install_package zookeeperd
stop_service zookeeper
if [ $UBUNTU_RELEASE_BASE_NUM -ge 16 ] ; then
sudo systemctl stop zookeeper.service || true
sudo cp $DEST/dragonflow/devstack/zookeeper.service.ubuntu /etc/systemd/system/zookeeper.service
sudo systemctl daemon-reload
else
sudo service zookeeper stop || true
fi
if [ -d $ZOOKEEPER_CONF_SAMPLE_DIR ] ; then
sudo cp $ZOOKEEPER_CONF_SAMPLE_DIR/* $ZOOKEEPER_CONF_DIR/ -rf
@ -87,28 +85,12 @@ function nb_db_driver_install_client {
function nb_db_driver_start_server {
if is_service_enabled df-zookeeper-server ; then
if is_ubuntu; then
if [ $UBUNTU_RELEASE_BASE_NUM -ge 16 ] ; then
sudo systemctl restart zookeeper.service
else
sudo service zookeeper restart
fi
elif is_fedora; then
sudo systemctl restart zookeeper.service
fi
start_service zookeeper
fi
}
function nb_db_driver_stop_server {
if is_service_enabled df-zookeeper-server ; then
if is_ubuntu; then
if [ $UBUNTU_RELEASE_BASE_NUM -ge 16 ] ; then
sudo systemctl stop zookeeper.service || true
else
sudo service zookeeper stop || true
fi
elif is_fedora; then
sudo systemctl stop zookeeper.service || true
fi
stop_service zookeeper
fi
}