diff --git a/cyborg/common/utils.py b/cyborg/common/utils.py index 0cd088bd..c60e3cfb 100644 --- a/cyborg/common/utils.py +++ b/cyborg/common/utils.py @@ -17,6 +17,7 @@ import six +from keystoneauth1 import exceptions as ks_exc from keystoneauth1 import loading as ks_loading from os_service_types import service_types from oslo_concurrency import lockutils diff --git a/devstack/lib/cyborg b/devstack/lib/cyborg index 7a53f4f3..4ba9932d 100644 --- a/devstack/lib/cyborg +++ b/devstack/lib/cyborg @@ -202,6 +202,20 @@ function configure_cyborg_placement { # testing. } +function configure_cyborg_glance { + local section=${1:-glance} + local auth_section=${2:-keystone_authtoken} + iniset $CYBORG_CONF_FILE $section auth_section $auth_section + iniset $CYBORG_CONF_FILE $section auth_type "password" + iniset $CYBORG_CONF_FILE $section auth_url "$KEYSTONE_SERVICE_URI" + iniset $CYBORG_CONF_FILE $section username $section + iniset $CYBORG_CONF_FILE $section password "$SERVICE_PASSWORD" + iniset $CYBORG_CONF_FILE $section user_domain_name "$SERVICE_DOMAIN_NAME" + iniset $CYBORG_CONF_FILE $section project_name "$SERVICE_TENANT_NAME" + iniset $CYBORG_CONF_FILE $section project_domain_name "$SERVICE_DOMAIN_NAME" + iniset $CYBORG_CONF_FILE $section api_servers "$GLANCE_URL" +} + # configure_cyborg_conductor() - Is used by configure_cyborg(). # Sets conductor specific settings. function configure_cyborg_conductor { @@ -212,6 +226,7 @@ function configure_cyborg_conductor { # this one is needed for lookup of Cyborg API endpoint via Keystone configure_auth_for service_catalog configure_cyborg_placement + configure_cyborg_glance sudo cp $CYBORG_DIR/etc/cyborg/rootwrap.conf $CYBORG_ROOTWRAP_CONF sudo cp -r $CYBORG_DIR/etc/cyborg/rootwrap.d $CYBORG_CONF_DIR