Browse code
Set os_region_name for cinder
Region name should be set to nova.conf and cinder.conf so that
cinder volume can work in multiregion env.
Closes-Bug: #1429738
Change-Id: Ib20911c24d8daabc07e6515f4a23a745d77593ff
Ethan Lynn authored on 2015/03/10 00:45:18Showing 2 changed files
| ... | ... |
@@ -242,6 +242,8 @@ function configure_cinder {
|
| 242 | 242 |
# supported. |
| 243 | 243 |
iniset $CINDER_CONF DEFAULT enable_v1_api true |
| 244 | 244 |
|
| 245 |
+ iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME" |
|
| 246 |
+ |
|
| 245 | 247 |
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then |
| 246 | 248 |
local enabled_backends="" |
| 247 | 249 |
local default_name="" |
| ... | ... |
@@ -544,6 +544,8 @@ function create_nova_conf {
|
| 544 | 544 |
iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS" |
| 545 | 545 |
iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS" |
| 546 | 546 |
|
| 547 |
+ iniset $NOVA_CONF cinder os_region_name "$REGION_NAME" |
|
| 548 |
+ |
|
| 547 | 549 |
if [[ "$NOVA_BACKEND" == "LVM" ]]; then |
| 548 | 550 |
iniset $NOVA_CONF libvirt images_type "lvm" |
| 549 | 551 |
iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME |