Merge "Add manila service to configuration"
This commit is contained in:
commit
cc80aa221c
16
lib/nova
16
lib/nova
@ -509,6 +509,10 @@ function create_nova_conf {
|
|||||||
configure_cinder_access
|
configure_cinder_access
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if is_service_enabled manila; then
|
||||||
|
configure_manila_access
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "$NOVA_STATE_PATH" ]; then
|
if [ -n "$NOVA_STATE_PATH" ]; then
|
||||||
iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"
|
iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"
|
||||||
iniset $NOVA_CONF oslo_concurrency lock_path "$NOVA_STATE_PATH"
|
iniset $NOVA_CONF oslo_concurrency lock_path "$NOVA_STATE_PATH"
|
||||||
@ -654,6 +658,18 @@ function configure_cinder_access {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Configure access to manila.
|
||||||
|
function configure_manila_access {
|
||||||
|
iniset $NOVA_CONF manila os_region_name "$REGION_NAME"
|
||||||
|
iniset $NOVA_CONF manila auth_type "password"
|
||||||
|
iniset $NOVA_CONF manila auth_url "$KEYSTONE_SERVICE_URI"
|
||||||
|
iniset $NOVA_CONF manila username nova
|
||||||
|
iniset $NOVA_CONF manila password "$SERVICE_PASSWORD"
|
||||||
|
iniset $NOVA_CONF manila user_domain_name "$SERVICE_DOMAIN_NAME"
|
||||||
|
iniset $NOVA_CONF manila project_name "$SERVICE_TENANT_NAME"
|
||||||
|
iniset $NOVA_CONF manila project_domain_name "$SERVICE_DOMAIN_NAME"
|
||||||
|
}
|
||||||
|
|
||||||
function configure_console_compute {
|
function configure_console_compute {
|
||||||
# If we are running multiple cells (and thus multiple console proxies) on a
|
# If we are running multiple cells (and thus multiple console proxies) on a
|
||||||
# single host, we offset the ports to avoid collisions. We need to
|
# single host, we offset the ports to avoid collisions. We need to
|
||||||
|
Loading…
x
Reference in New Issue
Block a user