diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-04 19:19:08 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 05:33:55 -0700 |
| commit | 35c17ebb5a100c536e4979102ba73c003c2a5b04 (patch) | |
| tree | d26edde00dc907536b21dd0bcdfdbafd3bfe5737 /docker | |
| parent | ea0f5c7efaaefbc7c7ccc0db29560b780358097d (diff) | |
| download | kolla-35c17ebb5a100c536e4979102ba73c003c2a5b04.tar.gz kolla-35c17ebb5a100c536e4979102ba73c003c2a5b04.zip | |
Setup nova networking properly for Icehouse
This sets up nova networking properly to work with Neutron in the Icehouse
release.
Partially-implements: blueprint port-kilo
Change-Id: I0d37411c61d0d705d1ddf39c25c6610ea04f56f1
Diffstat (limited to 'docker')
| -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 f8f7788e3..cb2c66850 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 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} + 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} else echo "Incorrect NETWORK_MANAGER ${NETWORK_MANAGER}. Supported options are nova and neutron." exit 1 |