Browse code

Merge "ironic: remove notifier_strategy option"

Jenkins authored on 2014/02/13 12:33:49
Showing 1 changed files
... ...
@@ -112,11 +112,6 @@ function configure_ironic_api() {
112 112
     iniset $IRONIC_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
113 113
     iniset $IRONIC_CONF_FILE keystone_authtoken admin_user ironic
114 114
     iniset $IRONIC_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
115
-    if is_service_enabled qpid; then
116
-        iniset $IRONIC_CONF_FILE DEFAULT notifier_strategy qpid
117
-    elif [ -n "$RABBIT_HOST" ] &&  [ -n "$RABBIT_PASSWORD" ]; then
118
-        iniset $IRONIC_CONF_FILE DEFAULT notifier_strategy rabbit
119
-    fi
120 115
     iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT
121 116
     iniset $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api
122 117