diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-04 19:24:03 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 09:58:43 -0700 |
| commit | 6e11af5985464fa54bacdd85d681a2ea157a44c8 (patch) | |
| tree | 5255b87177c042885313ef31533b1505fc7bd0e5 | |
| parent | d30f69bc8327bf37e013c9647c99d9192eec8830 (diff) | |
| download | kolla-6e11af5985464fa54bacdd85d681a2ea157a44c8.tar.gz kolla-6e11af5985464fa54bacdd85d681a2ea157a44c8.zip | |
Change nova net config to work properly with Neutron for Juno and later
Change nova networking config to work properly with Neutron Juno and later.
Partially-implements: blueprint port-kilo
Change-Id: I18c324c34b4c3af8526d32b3e42f426ec519750b
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index cb2c66850..f8f7788e3 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -97,12 +97,12 @@ elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then fi crudini --set $cfg DEFAULT libvirt_vif_driver nova.virt.libvirt.vif.LibvirtGenericVIFDriver crudini --set $cfg DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver - crudini --set $cfg DEFAULT neutron url http://${NEUTRON_SERVER_SERVICE_HOST}:${NEUTRON_SERVER_SERVICE_PORT} - crudini --set $cfg DEFAULT neutron_auth_strategy keystone - crudini --set $cfg neutron_admin_auth_url ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0 - crudini --set $cfg DEFAULT neutron_admin_tenant_name ${ADMIN_TENANT_NAME} - crudini --set $cfg DEFAULT neutron_admin_username ${NEUTRON_KEYSTONE_USER} - crudini --set $cfg DEFAULT neutron_admin_password ${NEUTRON_KEYSTONE_PASSWORD} + crudini --set $cfg neutron url http://${NEUTRON_SERVER_SERVICE_HOST}:${NEUTRON_SERVER_SERVICE_PORT} + crudini --set $cfg neutron auth_strategy keystone + crudini --set $cfg neutron admin_auth_url ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0 + crudini --set $cfg neutron admin_tenant_name ${ADMIN_TENANT_NAME} + crudini --set $cfg neutron admin_username ${NEUTRON_KEYSTONE_USER} + crudini --set $cfg neutron admin_password ${NEUTRON_KEYSTONE_PASSWORD} else echo "Incorrect NETWORK_MANAGER ${NETWORK_MANAGER}. Supported options are nova and neutron." exit 1 |