openstack/devstack
Code Issues Proposed changes

Merge "ironic: remove notifier_strategy option"

Browse Source
This commit is contained in:
Jenkins 2014-02-13 03:33:49 +00:00 committed by Gerrit Code Review
commit 3dc5a99e37
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ironic
View File

@ -112,11 +112,6 @@ function configure_ironic_api() {
iniset $IRONIC_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME iniset $IRONIC_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $IRONIC_CONF_FILE keystone_authtoken admin_user ironic iniset $IRONIC_CONF_FILE keystone_authtoken admin_user ironic
iniset $IRONIC_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD iniset $IRONIC_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
if is_service_enabled qpid; then
iniset $IRONIC_CONF_FILE DEFAULT notifier_strategy qpid
elif [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; then
iniset $IRONIC_CONF_FILE DEFAULT notifier_strategy rabbit
fi
iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT
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