openstack/devstack
Code Issues Proposed changes

Merge "Make Nova/Ironic communication use Identity v3"

Browse Source
This commit is contained in:
Jenkins 2016-10-13 19:55:05 +00:00 committed by Gerrit Code Review
commit 8caeb035f4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/nova_plugins/hypervisor-ironic
View File

@ -45,11 +45,13 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
# ironic section # ironic section
iniset $NOVA_CONF ironic admin_username admin iniset $NOVA_CONF ironic auth_type password
iniset $NOVA_CONF ironic admin_password $ADMIN_PASSWORD iniset $NOVA_CONF ironic username admin
iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/v2.0 iniset $NOVA_CONF ironic password $ADMIN_PASSWORD
iniset $NOVA_CONF ironic admin_tenant_name demo iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI/v3
iniset $NOVA_CONF ironic api_endpoint $IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT/v1 iniset $NOVA_CONF ironic project_domain_id default
iniset $NOVA_CONF ironic user_domain_id default
iniset $NOVA_CONF ironic project_name demo
} }
# install_nova_hypervisor() - Install external components # install_nova_hypervisor() - Install external components