diff options
| author |   Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> | 2017-02-23 14:21:55 +0100 |
|---|---|---|
| committer | Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> | 2017-02-23 14:25:27 +0100 |
| commit | a668bff893aa303d371e59692d70ded31e29bbf1 (patch) | |
| tree | ac9cc68d658753bb66666e6627110835193ee36f | |
| parent | 7dbbb63739db4aac973fb6d5f3f16b5e9206ce14 (diff) | |
Fix installation script
Remove the check if kingbird is running.
Remove nohup from service startup.
Change-Id: I85e4e1fd8be47440c4d3f81229970b084dd5cb08
JIRA: MULTISITE-35
Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
| -rwxr-xr-x | tools/kingbird/install_kingbird.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/kingbird/install_kingbird.sh b/tools/kingbird/install_kingbird.sh index 8fb7a32..4842db0 100755 --- a/tools/kingbird/install_kingbird.sh +++ b/tools/kingbird/install_kingbird.sh @@ -116,7 +116,7 @@ if [ $? -eq 0 ]; then else echo "Creating Kingbird endpoints.." openstack service create --name=kingbird --description="Kingbird" multisite - + openstack endpoint create kingbird public http://${KINGBIRD_PUBLIC_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} --region ${OS_REGION_NAME} openstack endpoint create kingbird admin http://${KINGBIRD_ADMIN_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} --region ${OS_REGION_NAME} openstack endpoint create kingbird internal http://${KINGBIRD_INTERNAL_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} --region ${OS_REGION_NAME} @@ -169,13 +169,10 @@ iniset ${KINGBIRD_CONF_FILE} database connection "mysql://$mysql_user:$mysql_pas iniset ${KINGBIRD_CONF_FILE} database max_overflow -1 iniset ${KINGBIRD_CONF_FILE} database max_pool_size 1000 -# Kill kingbird -if pgrep kingbird-api &> /dev/null ; then pkill -f kingbird-api ; fi -if pgrep kingbird-engine &> /dev/null ; then pkill -f kingbird-engine ; fi # Run kingbird mkdir -p /var/log/kingbird kingbird-manage --config-file ${KINGBIRD_CONF_FILE} db_sync -nohup kingbird-engine --config-file ${KINGBIRD_CONF_FILE} --log-file /var/log/kingbird/kingbird-engine.log & -nohup kingbird-api --config-file ${KINGBIRD_CONF_FILE} --log-file /var/log/kingbird/kingbird-api.log & +kingbird-engine --config-file ${KINGBIRD_CONF_FILE} --log-file /var/log/kingbird/kingbird-engine.log & +kingbird-api --config-file ${KINGBIRD_CONF_FILE} --log-file /var/log/kingbird/kingbird-api.log & |