Browse code
Merge "Configure region name in neutron & ceilometer config files"
Jenkins authored on 2015/01/29 18:24:56Showing 2 changed files
| ... | ... |
@@ -203,6 +203,8 @@ function configure_ceilometer {
|
| 203 | 203 |
iniset $CEILOMETER_CONF service_credentials os_username ceilometer |
| 204 | 204 |
iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD |
| 205 | 205 |
iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME |
| 206 |
+ iniset $CEILOMETER_CONF service_credentials os_region_name $REGION_NAME |
|
| 207 |
+ iniset $CEILOMETER_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0 |
|
| 206 | 208 |
|
| 207 | 209 |
configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR |
| 208 | 210 |
|
| ... | ... |
@@ -1026,6 +1026,7 @@ function _configure_neutron_service {
|
| 1026 | 1026 |
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES |
| 1027 | 1027 |
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES |
| 1028 | 1028 |
iniset $NEUTRON_CONF DEFAULT nova_url "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2" |
| 1029 |
+ iniset $NEUTRON_CONF DEFAULT nova_region_name $REGION_NAME |
|
| 1029 | 1030 |
iniset $NEUTRON_CONF DEFAULT nova_admin_username nova |
| 1030 | 1031 |
iniset $NEUTRON_CONF DEFAULT nova_admin_password $SERVICE_PASSWORD |
| 1031 | 1032 |
ADMIN_TENANT_ID=$(openstack project list | awk "/ service / { print \$2 }")
|