Commit bdc2c9db authored by David Johnson's avatar David Johnson

Update rabbit config; handle memcache better.

In particular, glance wasn't using memcache at all; oops.
parent a0466f4b
......@@ -68,11 +68,10 @@ else
crudini --set /etc/nova/nova.conf neutron project_name service
crudini --set /etc/nova/nova.conf neutron username neutron
crudini --set /etc/nova/nova.conf neutron password ${NEUTRON_PASS}
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/nova/nova.conf neutron \
memcached_servers ${CONTROLLER}:11211
fi
fi
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/nova/nova.conf neutron \
memcached_servers ${CONTROLLER}:11211
fi
touch $OURDIR/setup-compute-network-done
......
......@@ -79,7 +79,7 @@ else
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
if [ $OSVERSION -ge $OSMITAKA ]; then
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
......
......@@ -63,7 +63,6 @@ if [ "$COMPUTE_EXTRA_NOVA_DISK_SPACE" = "1" ]; then
fi
fi
crudini --set /etc/nova/nova.conf DEFAULT rpc_backend rabbit
crudini --set /etc/nova/nova.conf DEFAULT auth_strategy keystone
crudini --set /etc/nova/nova.conf DEFAULT my_ip ${MGMTIP}
if [ $OSVERSION -lt $OSNEWTON ]; then
......@@ -75,10 +74,23 @@ crudini --set /etc/nova/nova.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/nova/nova.conf DEFAULT debug ${DEBUG_LOGGING}
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/nova/nova.conf DEFAULT rpc_backend rabbit
crudini --set /etc/nova/nova.conf DEFAULT rabbit_host $CONTROLLER
crudini --set /etc/nova/nova.conf DEFAULT rabbit_userid ${RABBIT_USER}
crudini --set /etc/nova/nova.conf DEFAULT rabbit_password "${RABBIT_PASS}"
elif [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/nova/nova.conf DEFAULT rpc_backend rabbit
crudini --set /etc/nova/nova.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/nova/nova.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/nova/nova.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
else
crudini --set /etc/nova/nova.conf DEFAULT transport_url $RABBIT_URL
fi
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/v2.0
crudini --set /etc/nova/nova.conf keystone_authtoken \
......@@ -90,13 +102,6 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
admin_password "${NOVA_PASS}"
else
crudini --set /etc/nova/nova.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/nova/nova.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/nova/nova.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/nova/nova.conf keystone_authtoken \
......@@ -113,11 +118,11 @@ else
username nova
crudini --set /etc/nova/nova.conf keystone_authtoken \
password "${NOVA_PASS}"
fi
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
if [ $OSVERSION -ge $OSKILO ]; then
......@@ -140,8 +145,10 @@ if [ $OSVERSION -ge $OSLIBERTY ]; then
fi
VNCSECTION="DEFAULT"
VNCENABLEKEY="vnc_enabled"
if [ $OSVERSION -ge $OSLIBERTY ]; then
VNCSECTION="vnc"
VNCENABLEKEY="enabled"
fi
cname=`getfqdn $CONTROLLER`
......@@ -160,19 +167,19 @@ else
fi
#
# Change vnc_enabled = True for x86 -- but for aarch64, there is
# Change $VNCENABLEKEY = True for x86 -- but for aarch64, there is
# no video device, for KVM mode, anyway, it seems.
#
ARCH=`uname -m`
if [ "$ARCH" = "aarch64" ] ; then
if [ $OSVERSION -le $OSKILO ]; then
crudini --set /etc/nova/nova.conf $VNCSECTION vnc_enabled False
crudini --set /etc/nova/nova.conf $VNCSECTION $VNCENABLEKEY False
else
# QEMU/Nova on Liberty gives aarch64 a vga adapter/bus.
crudini --set /etc/nova/nova.conf $VNCSECTION vnc_enabled True
crudini --set /etc/nova/nova.conf $VNCSECTION $VNCENABLEKEY True
fi
else
crudini --set /etc/nova/nova.conf $VNCSECTION vnc_enabled True
crudini --set /etc/nova/nova.conf $VNCSECTION $VNCENABLEKEY True
fi
if [ ${ENABLE_NEW_SERIAL_SUPPORT} = 1 ]; then
......
This diff is collapsed.
......@@ -361,7 +361,7 @@ fi
# Figure out Nova API string.
#
NAPISTR="v2"
if [ $OSVERSION -ge $OSNEWTON ]; then
if [ $OSVERSION -ge $OSMITAKA ]; then
NAPISTR="v2.1"
fi
......@@ -393,6 +393,16 @@ else
AUTH_TYPE_PARAM="auth_plugin"
fi
#
# Set the database package name and driver string.
#
if [ $OSVERSION -ge $OSNEWTON ]; then
DBDPACKAGE="python-pymysql"
DBDSTRING="mysql+pymysql"
else
DBDPACKAGE="python-mysqldb"
DBDSTRING="mysql"
fi
if [ $GENIUSER -eq 1 ]; then
SWAPPER_EMAIL=`geni-get slice_email`
......
......@@ -51,7 +51,6 @@ crudini --del /etc/neutron/neutron.conf keystone_authtoken auth_host
crudini --del /etc/neutron/neutron.conf keystone_authtoken auth_port
crudini --del /etc/neutron/neutron.conf keystone_authtoken auth_protocol
crudini --set /etc/neutron/neutron.conf DEFAULT rpc_backend rabbit
crudini --set /etc/neutron/neutron.conf DEFAULT auth_strategy keystone
crudini --set /etc/neutron/neutron.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/neutron/neutron.conf DEFAULT debug ${DEBUG_LOGGING}
......@@ -61,10 +60,23 @@ crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips True
crudini --set /etc/neutron/neutron.conf DEFAULT notification_driver messagingv2
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT rpc_backend rabbit
crudini --set /etc/neutron/neutron.conf DEFAULT rabbit_host $CONTROLLER
crudini --set /etc/neutron/neutron.conf DEFAULT rabbit_userid ${RABBIT_USER}
crudini --set /etc/neutron/neutron.conf DEFAULT rabbit_password "${RABBIT_PASS}"
elif [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT rpc_backend rabbit
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
else
crudini --set /etc/neutron/neutron.conf DEFAULT transport_url $RABBIT_URL
fi
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -76,21 +88,10 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
admin_password "${NEUTRON_PASS}"
else
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -104,6 +105,10 @@ else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
password "${NEUTRON_PASS}"
fi
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
crudini --set /etc/neutron/neutron.conf DEFAULT \
notify_nova_on_port_status_changes True
......@@ -127,10 +132,6 @@ else
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf nova \
auth_url http://${CONTROLLER}:35357
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/neutron/neutron.conf nova \
memcached_servers ${CONTROLLER}:11211
fi
crudini --set /etc/neutron/neutron.conf nova \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf nova \
......@@ -144,6 +145,10 @@ else
crudini --set /etc/neutron/neutron.conf nova \
password "${NOVA_PASS}"
fi
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/neutron/neutron.conf nova \
memcached_servers ${CONTROLLER}:11211
fi
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \
type_drivers ${network_types}
......
......@@ -51,7 +51,6 @@ crudini --del /etc/neutron/neutron.conf keystone_authtoken auth_host
crudini --del /etc/neutron/neutron.conf keystone_authtoken auth_port
crudini --del /etc/neutron/neutron.conf keystone_authtoken auth_protocol
crudini --set /etc/neutron/neutron.conf DEFAULT rpc_backend rabbit
crudini --set /etc/neutron/neutron.conf DEFAULT auth_strategy keystone
crudini --set /etc/neutron/neutron.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/neutron/neutron.conf DEFAULT debug ${DEBUG_LOGGING}
......@@ -61,10 +60,23 @@ crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips True
crudini --set /etc/neutron/neutron.conf DEFAULT notification_driver messagingv2
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT rpc_backend rabbit
crudini --set /etc/neutron/neutron.conf DEFAULT rabbit_host $CONTROLLER
crudini --set /etc/neutron/neutron.conf DEFAULT rabbit_userid ${RABBIT_USER}
crudini --set /etc/neutron/neutron.conf DEFAULT rabbit_password "${RABBIT_PASS}"
elif [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT rpc_backend rabbit
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
else
crudini --set /etc/neutron/neutron.conf DEFAULT transport_url $RABBIT_URL
fi
if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -76,21 +88,10 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
admin_password "${NEUTRON_PASS}"
else
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_host $CONTROLLER
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_userid ${RABBIT_USER}
crudini --set /etc/neutron/neutron.conf oslo_messaging_rabbit \
rabbit_password "${RABBIT_PASS}"
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -104,6 +105,10 @@ else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
password "${NEUTRON_PASS}"
fi
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \
type_drivers ${network_types}
......
......@@ -39,10 +39,10 @@ fi
#
$DIRNAME/setup-network-plugin.sh
maybe_install_packages manila-share python-pymysql
maybe_install_packages manila-share $DBDPACKAGE
crudini --set /etc/manila/manila.conf \
database connection "mysql://manila:$MANILA_DBPASS@$CONTROLLER/manila"
database connection "${DBDSTRING}://manila:$MANILA_DBPASS@$CONTROLLER/manila"
crudini --del /etc/manila/manila.conf keystone_authtoken auth_host
crudini --del /etc/manila/manila.conf keystone_authtoken auth_port
......
......@@ -87,10 +87,10 @@ if [ $LVM -eq 0 ] ; then
vgcreate $VGNAME /dev/loop0
fi
maybe_install_packages cinder-volume python-mysqldb
maybe_install_packages cinder-volume $DBDPACKAGE
crudini --set /etc/cinder/cinder.conf \
database connection "mysql://cinder:$CINDER_DBPASS@$CONTROLLER/cinder"
database connection "${DBDSTRING}://cinder:$CINDER_DBPASS@$CONTROLLER/cinder"
crudini --del /etc/cinder/cinder.conf keystone_authtoken auth_host
crudini --del /etc/cinder/cinder.conf keystone_authtoken auth_port
......@@ -144,6 +144,10 @@ else
fi
crudini --set /etc/cinder/cinder.conf DEFAULT glance_host ${CONTROLLER}
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/cinder/cinder.conf \
glance api_servers http://${CONTROLLER}:9292
fi
if [ $OSVERSION -eq $OSKILO ]; then
crudini --set /etc/cinder/cinder.conf oslo_concurrency \
......
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