Commit 7710a219 authored by David Johnson's avatar David Johnson

Fixup a few more rabbitmq/memcache config bits a la bdc2c9db .

parent 3b23f69b
......@@ -44,7 +44,6 @@ fi
maybe_install_packages ceilometer-agent-compute
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT auth_strategy keystone
crudini --set /etc/ceilometer/ceilometer.conf glance host $CONTROLLER
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT verbose $VERBOSE_LOGGING
......@@ -53,10 +52,24 @@ crudini --set /etc/ceilometer/ceilometer.conf DEFAULT \
log_dir /var/log/ceilometer
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_host $CONTROLLER
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_userid ${RABBIT_USER}
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_password "${RABBIT_PASS}"
elif [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit
crudini --set /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
else
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT \
transport_url $RABBIT_URL
fi
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
......@@ -68,13 +81,6 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
admin_password "${CEILOMETER_PASS}"
else
crudini --set /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
......
This diff is collapsed.
......@@ -48,7 +48,6 @@ crudini --del /etc/manila/manila.conf keystone_authtoken auth_host
crudini --del /etc/manila/manila.conf keystone_authtoken auth_port
crudini --del /etc/manila/manila.conf keystone_authtoken auth_protocol
crudini --set /etc/manila/manila.conf DEFAULT rpc_backend rabbit
crudini --set /etc/manila/manila.conf DEFAULT auth_strategy keystone
crudini --set /etc/manila/manila.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/manila/manila.conf DEFAULT debug ${DEBUG_LOGGING}
......@@ -58,13 +57,17 @@ crudini --set /etc/manila/manila.conf DEFAULT \
crudini --set /etc/manila/manila.conf DEFAULT \
rootwrap_config /etc/manila/rootwrap.conf
crudini --set /etc/manila/manila.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/manila/manila.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/manila/manila.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
if [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/manila/manila.conf DEFAULT rpc_backend rabbit
crudini --set /etc/manila/manila.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/manila/manila.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/manila/manila.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
else
crudini --set /etc/manila/manila.conf DEFAULT transport_url $RABBIT_URL
fi
crudini --set /etc/manila/manila.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
crudini --set /etc/manila/manila.conf keystone_authtoken \
......
......@@ -96,17 +96,29 @@ crudini --del /etc/cinder/cinder.conf keystone_authtoken auth_host
crudini --del /etc/cinder/cinder.conf keystone_authtoken auth_port
crudini --del /etc/cinder/cinder.conf keystone_authtoken auth_protocol
crudini --set /etc/cinder/cinder.conf DEFAULT rpc_backend rabbit
crudini --set /etc/cinder/cinder.conf DEFAULT auth_strategy keystone
crudini --set /etc/cinder/cinder.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/cinder/cinder.conf DEFAULT debug ${DEBUG_LOGGING}
crudini --set /etc/cinder/cinder.conf DEFAULT my_ip ${MGMTIP}
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/cinder/cinder.conf DEFAULT rpc_backend rabbit
crudini --set /etc/cinder/cinder.conf DEFAULT rabbit_host $CONTROLLER
crudini --set /etc/cinder/cinder.conf DEFAULT rabbit_userid ${RABBIT_USER}
crudini --set /etc/cinder/cinder.conf DEFAULT rabbit_password "${RABBIT_PASS}"
elif [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/cinder/cinder.conf DEFAULT rpc_backend rabbit
crudini --set /etc/cinder/cinder.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/cinder/cinder.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/cinder/cinder.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
else
crudini --set /etc/cinder/cinder.conf DEFAULT transport_url $RABBIT_URL
fi
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
......@@ -118,13 +130,6 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
admin_password "${CINDER_PASS}"
else
crudini --set /etc/cinder/cinder.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/cinder/cinder.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/cinder/cinder.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment