heat : Remove heat-metadata as it has been removed in heat master
The heat-metadata service has been removed as of the following commit
in heat master: 6ae3ff0 Remove heat-metadata service
So remove the heat-metadata service and related config-file items
Change-Id: If36efe5924e9e0a7697f51dd3c9fc140fed8090b
Signed-off-by: Steven Hardy <shardy@redhat.com>
diff --git a/lib/heat b/lib/heat
index 396c8a0..b640fbc 100644
--- a/lib/heat
+++ b/lib/heat
@@ -1,7 +1,7 @@
# lib/heat
# Install and start Heat service
# To enable, add the following to localrc
-# ENABLED_SERVICES+=,heat,h-api-cfn,h-api-cw,h-eng,h-meta
+# ENABLED_SERVICES+=,heat,h-api-cfn,h-api-cw,h-eng
# Dependencies:
# - functions
@@ -52,8 +52,6 @@
HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST}
HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001}
- HEAT_METADATA_HOST=${HEAT_METADATA_HOST:-$SERVICE_HOST}
- HEAT_METADATA_PORT=${HEAT_METADATA_PORT:-8002}
HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST}
HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003}
HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST}
@@ -126,7 +124,7 @@
iniset $HEAT_ENGINE_CONF DEFAULT bind_host $HEAT_ENGINE_HOST
iniset $HEAT_ENGINE_CONF DEFAULT bind_port $HEAT_ENGINE_PORT
iniset $HEAT_ENGINE_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT
- iniset $HEAT_ENGINE_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_METADATA_HOST:$HEAT_METADATA_PORT
+ iniset $HEAT_ENGINE_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_CFN_HOST:$HEAT_CFN_PORT/v1/waitcondition
iniset $HEAT_ENGINE_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT
local dburl
database_connection_url dburl heat
@@ -141,26 +139,6 @@
iniset $HEAT_ENGINE_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid
fi
- # metadata api
- HEAT_METADATA_CONF=$HEAT_CONF_DIR/heat-metadata.conf
- cp $HEAT_DIR/etc/heat/heat-metadata.conf $HEAT_METADATA_CONF
- iniset $HEAT_METADATA_CONF DEFAULT debug True
- inicomment $HEAT_METADATA_CONF DEFAULT log_file
- iniset $HEAT_METADATA_CONF DEFAULT use_syslog $SYSLOG
- iniset $HEAT_METADATA_CONF DEFAULT bind_host $HEAT_METADATA_HOST
- iniset $HEAT_METADATA_CONF DEFAULT bind_port $HEAT_METADATA_PORT
-
- if is_service_enabled rabbit; then
- iniset $HEAT_METADATA_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu
- iniset $HEAT_METADATA_CONF DEFAULT rabbit_password $RABBIT_PASSWORD
- iniset $HEAT_METADATA_CONF DEFAULT rabbit_host $RABBIT_HOST
- elif is_service_enabled qpid; then
- iniset $HEAT_METADATA_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid
- fi
-
- HEAT_METADATA_PASTE_INI=$HEAT_CONF_DIR/heat-metadata-paste.ini
- cp $HEAT_DIR/etc/heat/heat-metadata-paste.ini $HEAT_METADATA_PASTE_INI
-
# cloudwatch api
HEAT_API_CW_CONF=$HEAT_CONF_DIR/heat-api-cloudwatch.conf
cp $HEAT_DIR/etc/heat/heat-api-cloudwatch.conf $HEAT_API_CW_CONF
@@ -217,13 +195,12 @@
screen_it h-api "cd $HEAT_DIR; bin/heat-api --config-dir=$HEAT_CONF_DIR/heat-api.conf"
screen_it h-api-cfn "cd $HEAT_DIR; bin/heat-api-cfn --config-dir=$HEAT_CONF_DIR/heat-api-cfn.conf"
screen_it h-api-cw "cd $HEAT_DIR; bin/heat-api-cloudwatch --config-dir=$HEAT_CONF_DIR/heat-api-cloudwatch.conf"
- screen_it h-meta "cd $HEAT_DIR; bin/heat-metadata --config-dir=$HEAT_CONF_DIR/heat-metadata.conf"
}
# stop_heat() - Stop running processes
function stop_heat() {
# Kill the cinder screen windows
- for serv in h-eng h-api-cfn h-api-cw h-meta; do
+ for serv in h-eng h-api-cfn h-api-cw; do
screen -S $SCREEN_NAME -p $serv -X kill
done
}