Browse code
Merge "Move Heat to a single heat.conf"
Jenkins authored on 2013/08/31 02:59:24Showing 1 changed files
| ... | ... |
@@ -32,6 +32,7 @@ HEATCLIENT_DIR=$DEST/python-heatclient |
| 32 | 32 |
HEAT_AUTH_CACHE_DIR=${HEAT_AUTH_CACHE_DIR:-/var/cache/heat}
|
| 33 | 33 |
HEAT_STANDALONE=`trueorfalse False $HEAT_STANDALONE` |
| 34 | 34 |
HEAT_CONF_DIR=/etc/heat |
| 35 |
+HEAT_CONF=$HEAT_CONF_DIR/heat.conf |
|
| 35 | 36 |
HEAT_ENV_DIR=$HEAT_CONF_DIR/environment.d |
| 36 | 37 |
HEAT_TEMPLATES_DIR=$HEAT_CONF_DIR/templates |
| 37 | 38 |
|
| ... | ... |
@@ -54,6 +55,8 @@ function configure_heat() {
|
| 54 | 54 |
sudo mkdir -p $HEAT_CONF_DIR |
| 55 | 55 |
fi |
| 56 | 56 |
sudo chown $STACK_USER $HEAT_CONF_DIR |
| 57 |
+ # remove old config files |
|
| 58 |
+ rm -f $HEAT_CONF_DIR/heat-*.conf |
|
| 57 | 59 |
|
| 58 | 60 |
HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST}
|
| 59 | 61 |
HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
|
| ... | ... |
@@ -68,96 +71,55 @@ function configure_heat() {
|
| 68 | 68 |
|
| 69 | 69 |
cp $HEAT_DIR/etc/heat/api-paste.ini $HEAT_API_PASTE_FILE |
| 70 | 70 |
cp $HEAT_DIR/etc/heat/policy.json $HEAT_POLICY_FILE |
| 71 |
+ cp $HEAT_DIR/etc/heat/heat.conf.sample $HEAT_CONF |
|
| 72 |
+ |
|
| 73 |
+ # common options |
|
| 74 |
+ iniset_rpc_backend heat $HEAT_CONF DEFAULT |
|
| 75 |
+ iniset $HEAT_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT |
|
| 76 |
+ iniset $HEAT_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition |
|
| 77 |
+ iniset $HEAT_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT |
|
| 78 |
+ iniset $HEAT_CONF DEFAULT sql_connection `database_connection_url heat` |
|
| 79 |
+ iniset $HEAT_CONF DEFAULT auth_encryption_key `hexdump -n 16 -v -e '/1 "%02x"' /dev/random` |
|
| 80 |
+ |
|
| 81 |
+ # logging |
|
| 82 |
+ iniset $HEAT_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
|
| 83 |
+ iniset $HEAT_CONF DEFAULT use_syslog $SYSLOG |
|
| 84 |
+ if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then |
|
| 85 |
+ # Add color to logging output |
|
| 86 |
+ iniset $HEAT_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[01;36m%(request_id)s [00;36m%(user_name)s %(project_name)s%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" |
|
| 87 |
+ iniset $HEAT_CONF DEFAULT logging_default_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[00;36m-%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" |
|
| 88 |
+ iniset $HEAT_CONF DEFAULT logging_debug_format_suffix "[00;33mfrom (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d[00m" |
|
| 89 |
+ iniset $HEAT_CONF DEFAULT logging_exception_prefix "%(color)s%(asctime)s.%(msecs)03d TRACE %(name)s [01;35m%(instance)s[00m" |
|
| 90 |
+ fi |
|
| 71 | 91 |
|
| 72 |
- # Cloudformation API |
|
| 73 |
- HEAT_API_CFN_CONF=$HEAT_CONF_DIR/heat-api-cfn.conf |
|
| 74 |
- cp $HEAT_DIR/etc/heat/heat-api-cfn.conf $HEAT_API_CFN_CONF |
|
| 75 |
- iniset $HEAT_API_CFN_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
|
| 76 |
- inicomment $HEAT_API_CFN_CONF DEFAULT log_file |
|
| 77 |
- iniset $HEAT_API_CFN_CONF DEFAULT use_syslog $SYSLOG |
|
| 78 |
- iniset $HEAT_API_CFN_CONF DEFAULT bind_host $HEAT_API_CFN_HOST |
|
| 79 |
- iniset $HEAT_API_CFN_CONF DEFAULT bind_port $HEAT_API_CFN_PORT |
|
| 80 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
|
| 81 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |
|
| 82 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 83 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 84 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 85 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken admin_user heat |
|
| 86 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 87 |
- iniset $HEAT_API_CFN_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR/api-cfn |
|
| 88 |
- iniset $HEAT_API_CFN_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 89 |
- iniset $HEAT_API_CFN_CONF ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens |
|
| 90 |
- [[ "$HEAT_STANDALONE" = "True" ]] && iniset $HEAT_API_CFN_CONF paste_deploy flavor standalone |
|
| 91 |
- |
|
| 92 |
- iniset_rpc_backend heat $HEAT_API_CFN_CONF DEFAULT |
|
| 92 |
+ # keystone authtoken |
|
| 93 |
+ iniset $HEAT_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
|
| 94 |
+ iniset $HEAT_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |
|
| 95 |
+ iniset $HEAT_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 96 |
+ iniset $HEAT_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 97 |
+ iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 98 |
+ iniset $HEAT_CONF keystone_authtoken admin_user heat |
|
| 99 |
+ iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 100 |
+ iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR/api-cfn |
|
| 101 |
+ |
|
| 102 |
+ # ec2authtoken |
|
| 103 |
+ iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 104 |
+ iniset $HEAT_CONF ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens |
|
| 105 |
+ |
|
| 106 |
+ # paste_deploy |
|
| 107 |
+ [[ "$HEAT_STANDALONE" = "True" ]] && iniset $HEAT_CONF paste_deploy flavor standalone |
|
| 93 | 108 |
|
| 94 | 109 |
# OpenStack API |
| 95 |
- HEAT_API_CONF=$HEAT_CONF_DIR/heat-api.conf |
|
| 96 |
- cp $HEAT_DIR/etc/heat/heat-api.conf $HEAT_API_CONF |
|
| 97 |
- iniset $HEAT_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
|
| 98 |
- inicomment $HEAT_API_CONF DEFAULT log_file |
|
| 99 |
- iniset $HEAT_API_CONF DEFAULT use_syslog $SYSLOG |
|
| 100 |
- iniset $HEAT_API_CONF DEFAULT bind_host $HEAT_API_HOST |
|
| 101 |
- iniset $HEAT_API_CONF DEFAULT bind_port $HEAT_API_PORT |
|
| 102 |
- iniset $HEAT_API_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
|
| 103 |
- iniset $HEAT_API_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |
|
| 104 |
- iniset $HEAT_API_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 105 |
- iniset $HEAT_API_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 106 |
- iniset $HEAT_API_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 107 |
- iniset $HEAT_API_CONF keystone_authtoken admin_user heat |
|
| 108 |
- iniset $HEAT_API_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 109 |
- iniset $HEAT_API_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR/api |
|
| 110 |
- iniset $HEAT_API_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 111 |
- iniset $HEAT_API_CONF ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens |
|
| 112 |
- [[ "$HEAT_STANDALONE" = "True" ]] && iniset $HEAT_API_CONF paste_deploy flavor standalone |
|
| 113 |
- iniset_rpc_backend heat $HEAT_API_CONF DEFAULT |
|
| 114 |
- |
|
| 115 |
- |
|
| 116 |
- # engine |
|
| 117 |
- HEAT_ENGINE_CONF=$HEAT_CONF_DIR/heat-engine.conf |
|
| 118 |
- cp $HEAT_DIR/etc/heat/heat-engine.conf $HEAT_ENGINE_CONF |
|
| 119 |
- iniset $HEAT_ENGINE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
|
| 120 |
- inicomment $HEAT_ENGINE_CONF DEFAULT log_file |
|
| 121 |
- iniset $HEAT_ENGINE_CONF DEFAULT use_syslog $SYSLOG |
|
| 122 |
- iniset $HEAT_ENGINE_CONF DEFAULT bind_host $HEAT_ENGINE_HOST |
|
| 123 |
- iniset $HEAT_ENGINE_CONF DEFAULT bind_port $HEAT_ENGINE_PORT |
|
| 124 |
- iniset $HEAT_ENGINE_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT |
|
| 125 |
- iniset $HEAT_ENGINE_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition |
|
| 126 |
- iniset $HEAT_ENGINE_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT |
|
| 127 |
- iniset $HEAT_ENGINE_CONF DEFAULT sql_connection `database_connection_url heat` |
|
| 128 |
- iniset $HEAT_ENGINE_CONF DEFAULT auth_encryption_key `hexdump -n 16 -v -e '/1 "%02x"' /dev/random` |
|
| 129 |
- |
|
| 130 |
- iniset_rpc_backend heat $HEAT_ENGINE_CONF DEFAULT |
|
| 110 |
+ iniset $HEAT_CONF heat_api bind_host $HEAT_API_HOST |
|
| 111 |
+ iniset $HEAT_CONF heat_api bind_port $HEAT_API_PORT |
|
| 131 | 112 |
|
| 132 |
- if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then |
|
| 133 |
- # Add color to logging output |
|
| 134 |
- iniset $HEAT_ENGINE_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[01;36m%(request_id)s [00;36m%(user_name)s %(project_name)s%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" |
|
| 135 |
- iniset $HEAT_ENGINE_CONF DEFAULT logging_default_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[00;36m-%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" |
|
| 136 |
- iniset $HEAT_ENGINE_CONF DEFAULT logging_debug_format_suffix "[00;33mfrom (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d[00m" |
|
| 137 |
- iniset $HEAT_ENGINE_CONF DEFAULT logging_exception_prefix "%(color)s%(asctime)s.%(msecs)03d TRACE %(name)s [01;35m%(instance)s[00m" |
|
| 138 |
- fi |
|
| 113 |
+ # Cloudformation API |
|
| 114 |
+ iniset $HEAT_CONF heat_api_cfn bind_host $HEAT_API_CFN_HOST |
|
| 115 |
+ iniset $HEAT_CONF heat_api_cfn bind_port $HEAT_API_CFN_PORT |
|
| 139 | 116 |
|
| 140 | 117 |
# Cloudwatch API |
| 141 |
- HEAT_API_CW_CONF=$HEAT_CONF_DIR/heat-api-cloudwatch.conf |
|
| 142 |
- cp $HEAT_DIR/etc/heat/heat-api-cloudwatch.conf $HEAT_API_CW_CONF |
|
| 143 |
- iniset $HEAT_API_CW_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
|
| 144 |
- inicomment $HEAT_API_CW_CONF DEFAULT log_file |
|
| 145 |
- iniset $HEAT_API_CW_CONF DEFAULT use_syslog $SYSLOG |
|
| 146 |
- iniset $HEAT_API_CW_CONF DEFAULT bind_host $HEAT_API_CW_HOST |
|
| 147 |
- iniset $HEAT_API_CW_CONF DEFAULT bind_port $HEAT_API_CW_PORT |
|
| 148 |
- iniset $HEAT_API_CW_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
|
| 149 |
- iniset $HEAT_API_CW_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |
|
| 150 |
- iniset $HEAT_API_CW_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 151 |
- iniset $HEAT_API_CW_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 152 |
- iniset $HEAT_API_CW_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 153 |
- iniset $HEAT_API_CW_CONF keystone_authtoken admin_user heat |
|
| 154 |
- iniset $HEAT_API_CW_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 155 |
- iniset $HEAT_API_CW_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR/api-cloudwatch |
|
| 156 |
- iniset $HEAT_API_CW_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
|
| 157 |
- iniset $HEAT_API_CW_CONF ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens |
|
| 158 |
- [[ "$HEAT_STANDALONE" = "True" ]] && iniset $HEAT_API_CW_CONF paste_deploy flavor standalone |
|
| 159 |
- |
|
| 160 |
- iniset_rpc_backend heat $HEAT_API_CW_CONF DEFAULT |
|
| 118 |
+ iniset $HEAT_CONF heat_api_cloudwatch bind_host $HEAT_API_CW_HOST |
|
| 119 |
+ iniset $HEAT_CONF heat_api_cloudwatch bind_port $HEAT_API_CW_PORT |
|
| 161 | 120 |
|
| 162 | 121 |
# heat environment |
| 163 | 122 |
sudo mkdir -p $HEAT_ENV_DIR |
| ... | ... |
@@ -207,10 +169,10 @@ function install_heat() {
|
| 207 | 207 |
|
| 208 | 208 |
# start_heat() - Start running processes, including screen |
| 209 | 209 |
function start_heat() {
|
| 210 |
- screen_it h-eng "cd $HEAT_DIR; bin/heat-engine --config-file=$HEAT_CONF_DIR/heat-engine.conf" |
|
| 211 |
- screen_it h-api "cd $HEAT_DIR; bin/heat-api --config-dir=$HEAT_CONF_DIR/heat-api.conf" |
|
| 212 |
- screen_it h-api-cfn "cd $HEAT_DIR; bin/heat-api-cfn --config-dir=$HEAT_CONF_DIR/heat-api-cfn.conf" |
|
| 213 |
- screen_it h-api-cw "cd $HEAT_DIR; bin/heat-api-cloudwatch --config-dir=$HEAT_CONF_DIR/heat-api-cloudwatch.conf" |
|
| 210 |
+ screen_it h-eng "cd $HEAT_DIR; bin/heat-engine --config-file=$HEAT_CONF" |
|
| 211 |
+ screen_it h-api "cd $HEAT_DIR; bin/heat-api --config-file=$HEAT_CONF" |
|
| 212 |
+ screen_it h-api-cfn "cd $HEAT_DIR; bin/heat-api-cfn --config-file=$HEAT_CONF" |
|
| 213 |
+ screen_it h-api-cw "cd $HEAT_DIR; bin/heat-api-cloudwatch --config-file=$HEAT_CONF" |
|
| 214 | 214 |
} |
| 215 | 215 |
|
| 216 | 216 |
# stop_heat() - Stop running processes |