openstack/devstack
Code Issues Proposed changes

Merge "Revert "Update auth params in Nova Hypervisor-Ironic""

Browse Source
This commit is contained in:
Jenkins 2016-05-09 16:44:31 +00:00 committed by Gerrit Code Review
commit ab7e062f5d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nova_plugins/hypervisor-ironic
View File

@ -45,12 +45,10 @@ 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 username admin iniset $NOVA_CONF ironic admin_username admin
iniset $NOVA_CONF ironic password $ADMIN_PASSWORD iniset $NOVA_CONF ironic admin_password $ADMIN_PASSWORD
iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI/v3 iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/v2.0
iniset $NOVA_CONF ironic project_domain_id default iniset $NOVA_CONF ironic admin_tenant_name demo
iniset $NOVA_CONF ironic user_domain_id default
iniset $NOVA_CONF ironic project_name demo
iniset $NOVA_CONF ironic api_endpoint $IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT/v1 iniset $NOVA_CONF ironic api_endpoint $IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT/v1
} }