diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2014-11-11 21:16:53 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2014-11-25 17:30:41 +0000 |
| commit | fe28973675eeec96199f2c2c70ea65e2de9c561d (patch) | |
| tree | 8976de928602c6c50547150dd615f6c86181ae8a /docker/nova-base | |
| parent | 1520f41a653b947817bbe2ca9c8910fb11ed538b (diff) | |
| download | kolla-fe28973675eeec96199f2c2c70ea65e2de9c561d.tar.gz kolla-fe28973675eeec96199f2c2c70ea65e2de9c561d.zip | |
Adds Neutron Networking Support
Implements: blueprint kube-neutron-container
Previously, only the neutron-server service was functional. This
patch adds support the the rest of the neutron services need by
Nova instances to function. The linux-bridge agent is used instead
of the OVS agent to realize network abstractions. This is because
the ovs-agent package will install the kernel module version of OVS
instead of the userspace version. Additionally, the OVS
userspace code is still very experimental and reduces performance.
Requires:
https://github.com/larsks/heat-kubernetes/pull/8
Change-Id: I5ef34ddeb48d4954934571a928cc82ae7f3a0f20
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 3f8e4c624..359468e92 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -9,6 +9,7 @@ : ${ADMIN_TENANT_NAME:=admin} : ${RABBIT_USERID:=guest} : ${RABBIT_PASSWORD:=guest} +: ${NETWORK_MANAGER:=nova} check_required_vars KEYSTONE_ADMIN_TOKEN \ NOVA_DB_PASSWORD @@ -61,6 +62,30 @@ crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}" crudini --set $cfg conductor workers 8 +if [ "${NETWORK_MANAGER}" == "nova" ] ; then + crudini --set $cfg DEFAULT network_manager nova.network.manager.FlatDHCPManager + crudini --set $cfg DEFAULT firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver + crudini --set $cfg DEFAULT network_size 254 + crudini --set $cfg DEFAULT allow_same_net_traffic False + crudini --set $cfg DEFAULT multi_host True + crudini --set $cfg DEFAULT send_arp_for_ha True + crudini --set $cfg DEFAULT share_dhcp_address True + crudini --set $cfg DEFAULT force_dhcp_release True + crudini --set $cfg DEFAULT flat_interface eth0 + crudini --set $cfg DEFAULT flat_network_bridge br100 + crudini --set $cfg DEFAULT public_interface eth1 +elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then + crudini --set $cfg DEFAULT service_neutron_metadata_proxy True + crudini --set $cfg DEFAULT neutron_metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET} + 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 firewall_driver nova.virt.firewall.NoopFirewallDriver +else + echo "Incorrect NETWORK_MANAGER ${NETWORK_MANAGER}. Supported options are nova and neutron." + exit 1 +fi + # disabled pending answers to http://lists.openstack.org/pipermail/openstack/2014-October/009997.html #for option in auth_protocol auth_host auth_port; do # crudini --del $cfg \ |