diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-13 16:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-13 16:55:26 +0000 |
| commit | 1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1 (patch) | |
| tree | 4b7e888d5db85e069ba10a441c18f97f6b5da846 /docker/nova-base | |
| parent | db860f148e251a5eb0a24538c90e3893fd46675d (diff) | |
| parent | 2f2bb366e0aa856803c0d21a7a541802d814d180 (diff) | |
| download | kolla-1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1.tar.gz kolla-1a7c3e67a2047f0a7c789fe2471b5d65825fb9e1.zip | |
Merge "Adds neutron-server to neutron container-set"
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 6350ed695..0b1dc39d3 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -14,6 +14,7 @@ : ${PUBLIC_NETWORK:=eth0} : ${ENABLED_APIS:=ec2,osapi_compute,metadata} : ${METADATA_HOST:=$PUBLIC_IP} +: ${NEUTRON_SHARED_SECRET:=sharedsecret} check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ @@ -89,7 +90,15 @@ elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then crudini --set $cfg DEFAULT neutron_default_tenant_id default crudini --set $cfg DEFAULT network_api_class nova.network.neutronv2.api.API crudini --set $cfg DEFAULT security_group_api neutron + crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver + 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} else echo "Incorrect NETWORK_MANAGER ${NETWORK_MANAGER}. Supported options are nova and neutron." exit 1 |