Browse code
Configure region name in neutron & ceilometer config files
Because of lacking some options in multi-region env, neutron and
ceilometer can not work after setup a multi-region env using
devstack.
This patch adds related options for multi-region env.
Change-Id: I4de890b233366f9526fa283aa9078a4d6ed0ca23
Closes-Bug: #1409589
Ethan Lynn authored on 2015/01/12 13:59:30Showing 2 changed files
| ... | ... |
@@ -200,6 +200,8 @@ function configure_ceilometer {
|
| 200 | 200 |
iniset $CEILOMETER_CONF service_credentials os_username ceilometer |
| 201 | 201 |
iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD |
| 202 | 202 |
iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME |
| 203 |
+ iniset $CEILOMETER_CONF service_credentials os_region_name $REGION_NAME |
|
| 204 |
+ iniset $CEILOMETER_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0 |
|
| 203 | 205 |
|
| 204 | 206 |
configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR |
| 205 | 207 |
|
| ... | ... |
@@ -1011,6 +1011,7 @@ function _configure_neutron_service {
|
| 1011 | 1011 |
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES |
| 1012 | 1012 |
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES |
| 1013 | 1013 |
iniset $NEUTRON_CONF DEFAULT nova_url "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2" |
| 1014 |
+ iniset $NEUTRON_CONF DEFAULT nova_region_name $REGION_NAME |
|
| 1014 | 1015 |
iniset $NEUTRON_CONF DEFAULT nova_admin_username nova |
| 1015 | 1016 |
iniset $NEUTRON_CONF DEFAULT nova_admin_password $SERVICE_PASSWORD |
| 1016 | 1017 |
ADMIN_TENANT_ID=$(openstack project list | awk "/ service / { print \$2 }")
|