openstack/devstack
Code Issues Proposed changes

Merge "iniset_rpc_backend default section"

Browse Source
This commit is contained in:
Jenkins 2015-03-22 02:41:03 +00:00 committed by Gerrit Code Review
commit 743d03bf7d
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ceilometer
View File

@ -165,7 +165,7 @@ function _config_ceilometer_apache_wsgi {
function configure_ceilometer { function configure_ceilometer {
sudo install -d -o $STACK_USER -m 755 $CEILOMETER_CONF_DIR $CEILOMETER_API_LOG_DIR sudo install -d -o $STACK_USER -m 755 $CEILOMETER_CONF_DIR $CEILOMETER_API_LOG_DIR
iniset_rpc_backend ceilometer $CEILOMETER_CONF DEFAULT iniset_rpc_backend ceilometer $CEILOMETER_CONF
iniset $CEILOMETER_CONF DEFAULT notification_topics "$CEILOMETER_NOTIFICATION_TOPICS" iniset $CEILOMETER_CONF DEFAULT notification_topics "$CEILOMETER_NOTIFICATION_TOPICS"
iniset $CEILOMETER_CONF DEFAULT verbose True iniset $CEILOMETER_CONF DEFAULT verbose True

2
lib/cinder
View File

@ -277,7 +277,7 @@ function configure_cinder {
iniset $CINDER_CONF DEFAULT use_syslog True iniset $CINDER_CONF DEFAULT use_syslog True
fi fi
iniset_rpc_backend cinder $CINDER_CONF DEFAULT iniset_rpc_backend cinder $CINDER_CONF
if [[ "$CINDER_SECURE_DELETE" == "False" ]]; then if [[ "$CINDER_SECURE_DELETE" == "False" ]]; then
iniset $CINDER_CONF DEFAULT secure_delete False iniset $CINDER_CONF DEFAULT secure_delete False

4
lib/glance
View File

@ -104,7 +104,7 @@ function configure_glance {
if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then
iniset $GLANCE_REGISTRY_CONF DEFAULT notification_driver messaging iniset $GLANCE_REGISTRY_CONF DEFAULT notification_driver messaging
fi fi
iniset_rpc_backend glance $GLANCE_REGISTRY_CONF DEFAULT iniset_rpc_backend glance $GLANCE_REGISTRY_CONF
cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF
iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
@ -117,7 +117,7 @@ function configure_glance {
if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then if is_service_enabled qpid || [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then
iniset $GLANCE_API_CONF DEFAULT notification_driver messaging iniset $GLANCE_API_CONF DEFAULT notification_driver messaging
fi fi
iniset_rpc_backend glance $GLANCE_API_CONF DEFAULT iniset_rpc_backend glance $GLANCE_API_CONF
if [ "$VIRT_DRIVER" = 'xenserver' ]; then if [ "$VIRT_DRIVER" = 'xenserver' ]; then
iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz" iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"
iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,raw,iso" iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,raw,iso"

2
lib/heat
View File

@ -106,7 +106,7 @@ function configure_heat {
cp $HEAT_DIR/etc/heat/policy.json $HEAT_POLICY_FILE cp $HEAT_DIR/etc/heat/policy.json $HEAT_POLICY_FILE
# common options # common options
iniset_rpc_backend heat $HEAT_CONF DEFAULT iniset_rpc_backend heat $HEAT_CONF
iniset $HEAT_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT iniset $HEAT_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT
iniset $HEAT_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition iniset $HEAT_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition
iniset $HEAT_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT iniset $HEAT_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT

2
lib/ironic
View File

@ -305,7 +305,7 @@ function configure_ironic_api {
iniset $IRONIC_CONF_FILE keystone_authtoken cafile $SSL_BUNDLE_FILE iniset $IRONIC_CONF_FILE keystone_authtoken cafile $SSL_BUNDLE_FILE
iniset $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api iniset $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api
iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT iniset_rpc_backend ironic $IRONIC_CONF_FILE
iniset $IRONIC_CONF_FILE api port $IRONIC_SERVICE_PORT iniset $IRONIC_CONF_FILE api port $IRONIC_SERVICE_PORT
cp -p $IRONIC_DIR/etc/ironic/policy.json $IRONIC_POLICY_JSON cp -p $IRONIC_DIR/etc/ironic/policy.json $IRONIC_POLICY_JSON

2
lib/keystone
View File

@ -222,7 +222,7 @@ function configure_keystone {
iniset $KEYSTONE_CONF assignment driver "keystone.assignment.backends.$KEYSTONE_ASSIGNMENT_BACKEND.Assignment" iniset $KEYSTONE_CONF assignment driver "keystone.assignment.backends.$KEYSTONE_ASSIGNMENT_BACKEND.Assignment"
fi fi
iniset_rpc_backend keystone $KEYSTONE_CONF DEFAULT iniset_rpc_backend keystone $KEYSTONE_CONF
# Set the URL advertised in the ``versions`` structure returned by the '/' route # Set the URL advertised in the ``versions`` structure returned by the '/' route
iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/" iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/"

2
lib/neutron
View File

@ -426,7 +426,7 @@ function is_neutron_enabled {
# Set common config for all neutron server and agents. # Set common config for all neutron server and agents.
function configure_neutron { function configure_neutron {
_configure_neutron_common _configure_neutron_common
iniset_rpc_backend neutron $NEUTRON_CONF DEFAULT iniset_rpc_backend neutron $NEUTRON_CONF
# goes before q-svc to init Q_SERVICE_PLUGIN_CLASSES # goes before q-svc to init Q_SERVICE_PLUGIN_CLASSES
if is_service_enabled q-lbaas; then if is_service_enabled q-lbaas; then

2
lib/nova
View File

@ -532,7 +532,7 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST" iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"
iniset $NOVA_CONF DEFAULT keystone_ec2_url $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens iniset $NOVA_CONF DEFAULT keystone_ec2_url $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens
iniset_rpc_backend nova $NOVA_CONF DEFAULT iniset_rpc_backend nova $NOVA_CONF
iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}" iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS" iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS"

2
lib/rpc_backend
View File

@ -246,7 +246,7 @@ function get_transport_url {
function iniset_rpc_backend { function iniset_rpc_backend {
local package=$1 local package=$1
local file=$2 local file=$2
local section=$3 local section=${3:-DEFAULT}
if is_service_enabled zeromq; then if is_service_enabled zeromq; then
iniset $file $section rpc_backend "zmq" iniset $file $section rpc_backend "zmq"
iniset $file $section rpc_zmq_host `hostname` iniset $file $section rpc_zmq_host `hostname`

2
lib/sahara
View File

@ -118,7 +118,7 @@ function configure_sahara {
if is_service_enabled ceilometer; then if is_service_enabled ceilometer; then
iniset $SAHARA_CONF_FILE DEFAULT enable_notifications "true" iniset $SAHARA_CONF_FILE DEFAULT enable_notifications "true"
iniset $SAHARA_CONF_FILE DEFAULT notification_driver "messaging" iniset $SAHARA_CONF_FILE DEFAULT notification_driver "messaging"
iniset_rpc_backend sahara $SAHARA_CONF_FILE DEFAULT iniset_rpc_backend sahara $SAHARA_CONF_FILE
fi fi
iniset $SAHARA_CONF_FILE DEFAULT verbose True iniset $SAHARA_CONF_FILE DEFAULT verbose True

2
lib/zaqar
View File

@ -132,7 +132,7 @@ function configure_zaqar {
iniset $ZAQAR_CONF DEFAULT notification_driver messaging iniset $ZAQAR_CONF DEFAULT notification_driver messaging
iniset $ZAQAR_CONF DEFAULT control_exchange zaqar iniset $ZAQAR_CONF DEFAULT control_exchange zaqar
fi fi
iniset_rpc_backend zaqar $ZAQAR_CONF DEFAULT iniset_rpc_backend zaqar $ZAQAR_CONF
cleanup_zaqar cleanup_zaqar
} }