openstack
/
dragonflow
Code Issues Proposed changes

Zookeeper Devstack support for Fedora 

Change-Id: Id62563cd4662a1f1a85d1e92f6c8080dd47b7690
Closes-Bug: #1638171
This commit is contained in:
Li Ma 2016-11-01 15:15:18 +08:00
parent e39019b0e4
commit df8a811561
3 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/zookeeper.service.fedora Normal file
View File

@ -0,0 +1,13 @@
[Unit]
Description=Zookeeper Service
After=network.target
[Service]
Type=simple
User=root
Group=root
SyslogIdentifier=zookeeper
ExecStart=/usr/bin/java -Dzookeeper.log.dir=/var/log/zookeeper -Dzookeeper.root.logger=INFO,ROLLINGFILE -cp /etc/zookeeper:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/simple.jar:/usr/share/java/log4j.jar:/usr/share/java/log4j-1.jar:/usr/share/java/log4j/log4j-slf4j-impl.jar:/usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false org.apache.zookeeper.server.quorum.QuorumPeerMain /etc/zookeeper/zoo.cfg
[Install]
WantedBy=multi-user.target

0
devstack/zookeeper.service → devstack/zookeeper.service.ubuntu
View File

59
devstack/zookeeper_driver
View File

@ -20,39 +20,64 @@ ZOOKEEPER_PORT=${REMOTE_DB_PORT:-2181}
ZOOKEEPER_DATA_DIR="/var/lib/zookeeper"
ZOOKEEPER_LOG_DIR="/var/log/zookeeper"
ZOOKEEPER_DIR="/etc/zookeeper"
ZOOKEEPER_CONF_DIR="${ZOOKEEPER_DIR}/conf"
ZOOKEEPER_CONF_FILE="${ZOOKEEPER_CONF_DIR}/zoo.cfg"
ZOOKEEPER_CONF_SAMPLE_DIR="/etc/zookeeper/conf_example"
function nb_db_driver_install_server {
if is_service_enabled df-zookeeper-server ; then
echo "Installing Zookeeper server"
if is_ubuntu; then
echo "Installing Zookeeper server"
ZOOKEEPER_CONF_DIR="${ZOOKEEPER_DIR}/conf"
ZOOKEEPER_CONF_FILE="${ZOOKEEPER_CONF_DIR}/zoo.cfg"
ZOOKEEPER_CONF_SAMPLE_DIR="/etc/zookeeper/conf_example"
sudo mkdir -p $ZOOKEEPER_DATA_DIR
sudo mkdir -p $ZOOKEEPER_LOG_DIR
sudo mkdir -p $ZOOKEEPER_CONF_DIR
install_package "zookeeperd"
install_package zookeeperd
if [ $UBUNTU_RELEASE_BASE_NUM -ge 16 ] ; then
sudo systemctl stop zookeeper.service || true
sudo cp $DEST/dragonflow/devstack/zookeeper.service /etc/systemd/system/
sudo cp $DEST/dragonflow/devstack/zookeeper.service.ubuntu /etc/systemd/system/zookeeper.service
sudo systemctl daemon-reload
else
else
sudo service zookeeper stop || true
fi
echo "Configuring Zookeeper"
if [ -d $ZOOKEEPER_CONF_SAMPLE_DIR ] ; then
sudo cp $ZOOKEEPER_CONF_SAMPLE_DIR/* $ZOOKEEPER_CONF_DIR/ -rf
fi
sudo sed -i "/^dataDir=/c dataDir=${ZOOKEEPER_DATA_DIR}" $ZOOKEEPER_CONF_FILE
sudo sed -i "/^dataLogDir=/c dataLogDir=${ZOOKEEPER_LOG_DIR}" $ZOOKEEPER_CONF_FILE
sudo sed -i "/^[#server.1=|server.1=]/c server.1=${HOSTNAME}:2888:3888" $ZOOKEEPER_CONF_FILE
echo "1" | sudo tee $ZOOKEEPER_CONF_DIR/myid
elif is_fedora; then
ZOOKEEPER_CONF_DIR="${ZOOKEEPER_DIR}"
ZOOKEEPER_CONF_FILE="${ZOOKEEPER_CONF_DIR}/zoo.cfg"
ZOOKEEPER_CONF_SAMPLE_FILE="${ZOOKEEPER_CONF_DIR}/zoo_sample.cfg"
sudo mkdir -p $ZOOKEEPER_DATA_DIR
sudo mkdir -p $ZOOKEEPER_LOG_DIR
sudo mkdir -p $ZOOKEEPER_CONF_DIR
install_package zookeeper jline netty jetty
sudo cp $DEST/dragonflow/devstack/zookeeper.service.fedora /etc/systemd/system/zookeeper.service
sudo systemctl daemon-reload
if [ -f $ZOOKEEPER_CONF_SAMPLE_FILE ] ; then
sudo cp $ZOOKEEPER_CONF_SAMPLE_FILE $ZOOKEEPER_CONF_FILE
fi
else
die $LINENO "Other distributions are not supported"
fi
echo "Configuring Zookeeper"
if [ -f $ZOOKEEPER_CONF_FILE ] ; then
sudo sed -i "/^dataDir=/c dataDir=${ZOOKEEPER_DATA_DIR}" $ZOOKEEPER_CONF_FILE
sudo sed -i "/^dataLogDir=/c dataLogDir=${ZOOKEEPER_LOG_DIR}" $ZOOKEEPER_CONF_FILE
local result=`grep "server.1" $ZOOKEEPER_CONF_FILE`
if [ $result -eq 0 ]; then
sudo sed -i "/^[#server.1=|server.1=]/c server.1=${HOSTNAME}:2888:3888" $ZOOKEEPER_CONF_FILE
else
echo "server.1=${HOSTNAME}:2888:3888" | sudo tee -a $ZOOKEEPER_CONF_FILE
fi
fi
echo "1" | sudo tee $ZOOKEEPER_CONF_DIR/myid
fi
}
function nb_db_driver_clean {
if [ -f "/etc/systemd/system/zookeeper.service" ] ; then
sudo rm /etc/systemd/system/zookeeper.service
sudo systemctl daemon-reload
fi
}
@ -79,6 +104,8 @@ function nb_db_driver_start_server {
else
sudo service zookeeper restart
fi
elif is_fedora; then
sudo systemctl restart zookeeper.service
fi
fi
}
@ -91,6 +118,8 @@ function nb_db_driver_stop_server {
else
sudo service zookeeper stop || true
fi
elif is_fedora; then
sudo systemctl stop zookeeper.service || true
fi
fi
}