commit 3dc5a99e3710bc00e3fa58c0180992073e111b85
author Jenkins <jenkins@review.openstack.org> Thu Feb 13 03:33:49 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 13 03:33:49 2014 +0000
tree 5e28ce29ce6342b99f035ad771471a462ef737de
parent 3fe7ad470921b298f086e6a5699c507ae64e1896
parent 061c14da01bb25ff86e0bfdb5e1bed887cb63997

Merge "ironic: remove notifier_strategy option"

lib/ironic

diff --git a/lib/ironic b/lib/ironic
index 0b9df57..3c0e3cb 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -112,11 +112,6 @@
     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_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 $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api