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/neutron/agents | |
| 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/neutron/agents')
20 files changed, 329 insertions, 0 deletions
diff --git a/docker/neutron/agents/dhcp/Dockerfile b/docker/neutron/agents/dhcp/Dockerfile new file mode 100644 index 000000000..021940c9c --- /dev/null +++ b/docker/neutron/agents/dhcp/Dockerfile @@ -0,0 +1,14 @@ +FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +# Install required packages +RUN yum install -y openstack-neutron \ + yum clean all; + +# Add required scripts +ADD ./start.sh /start.sh +ADD ./check.sh /check.sh +ADD ./sudoers.sh /sudoers.sh + +# Configure and run the service +CMD ["/start.sh"] diff --git a/docker/neutron/agents/dhcp/build b/docker/neutron/agents/dhcp/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/neutron/agents/dhcp/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/neutron/agents/dhcp/check.sh b/docker/neutron/agents/dhcp/check.sh new file mode 100755 index 000000000..9c36f1996 --- /dev/null +++ b/docker/neutron/agents/dhcp/check.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +RES=0 + +check=$(/usr/bin/neutron agent-list | awk '/ DHCP / {print $9}') +error="ERROR: Neutron DHCP Agent is not alive." + +if [[ $check != ":-)" ]]; then + echo $error >&2 + RES=1 +fi + +exit $RES diff --git a/docker/neutron/agents/dhcp/start.sh b/docker/neutron/agents/dhcp/start.sh new file mode 100755 index 000000000..81f35dd87 --- /dev/null +++ b/docker/neutron/agents/dhcp/start.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-neutron.sh +. /sudoers.sh + +: ${INTERFACE_DRIVER:=neutron.agent.linux.interface.BridgeInterfaceDriver} +: ${DHCP_DRIVER:=neutron.agent.linux.dhcp.Dnsmasq} +: ${USE_NAMESPACES:=false} + +cfg=/etc/neutron/dhcp_agent.ini + +# Configure dhcp_agent.ini +crudini --set $cfg \ + DEFAULT \ + verbose \ + "${VERBOSE_LOGGING}" +crudini --set $cfg \ + DEFAULT \ + debug \ + "${DEBUG_LOGGING}" +crudini --set $cfg \ + DEFAULT \ + interface_driver \ + "${INTERFACE_DRIVER}" +crudini --set $cfg \ + DEFAULT \ + dhcp_driver \ + "${DHCP_DRIVER}" +crudini --set $cfg \ + DEFAULT \ + use_namespaces \ + "${USE_NAMESPACES}" + +# Start DHCP Agent +exec /usr/bin/neutron-dhcp-agent diff --git a/docker/neutron/agents/dhcp/sudoers.sh b/docker/neutron/agents/dhcp/sudoers.sh new file mode 100644 index 000000000..198420026 --- /dev/null +++ b/docker/neutron/agents/dhcp/sudoers.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Neutron uses rootwrap which requires a tty for sudo. +# Since the container is running in daemon mode, a tty +# is not present and requiretty must be commented out. +if [ ! -f /var/run/sudo-modified ]; then + chmod 0640 /etc/sudoers + sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers + chmod 0440 /etc/sudoers +fi + +touch /var/run/sudo-modified diff --git a/docker/neutron/agents/l3/Dockerfile b/docker/neutron/agents/l3/Dockerfile new file mode 100644 index 000000000..021940c9c --- /dev/null +++ b/docker/neutron/agents/l3/Dockerfile @@ -0,0 +1,14 @@ +FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +# Install required packages +RUN yum install -y openstack-neutron \ + yum clean all; + +# Add required scripts +ADD ./start.sh /start.sh +ADD ./check.sh /check.sh +ADD ./sudoers.sh /sudoers.sh + +# Configure and run the service +CMD ["/start.sh"] diff --git a/docker/neutron/agents/l3/build b/docker/neutron/agents/l3/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/neutron/agents/l3/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/neutron/agents/l3/check.sh b/docker/neutron/agents/l3/check.sh new file mode 100755 index 000000000..b79caf8ff --- /dev/null +++ b/docker/neutron/agents/l3/check.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +RES=0 + +check=$(/usr/bin/neutron agent-list | awk '/ L3 / {print $9}') +error="ERROR: Neutron L3 Agent is not alive." + +if [[ $check != ":-)" ]]; then + echo $error >&2 + RES=1 +fi + +exit $RES diff --git a/docker/neutron/agents/l3/start.sh b/docker/neutron/agents/l3/start.sh new file mode 100755 index 000000000..602bf3193 --- /dev/null +++ b/docker/neutron/agents/l3/start.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-neutron.sh +. /sudoers.sh + +: ${INTERFACE_DRIVER:=neutron.agent.linux.interface.BridgeInterfaceDriver} +: ${USE_NAMESPACES:=false} + +cfg=/etc/neutron/l3_agent.ini + +# Configure l3_agent.ini +crudini --set $cfg \ + DEFAULT \ + verbose \ + "${VERBOSE_LOGGING}" +crudini --set $cfg \ + DEFAULT \ + debug \ + "${DEBUG_LOGGING}" +crudini --set $cfg \ + DEFAULT \ + interface_driver \ + "${INTERFACE_DRIVER}" +crudini --set $cfg \ + DEFAULT \ + gateway_external_network_id \ + "" +crudini --set $cfg \ + DEFAULT \ + external_network_bridge \ + "" +crudini --set $cfg \ + DEFAULT \ + use_namespaces \ + "${USE_NAMESPACES}" + +if [ "${USE_NAMESPACES}" == "false" ] || [ "${USE_NAMESPACES}" == "False" ] ; then + # source Keystone credential file + source /openrc + # Create router if it does not exist + /usr/bin/neutron router-list | grep admin-router || /usr/bin/neutron router-create admin-router + # Set router-id + crudini --set $cfg \ + DEFAULT \ + router_id \ + "$(/usr/bin/neutron router-list | awk '/ admin-router / {print $2}')" +fi + +# Start L3 Agent +exec /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini diff --git a/docker/neutron/agents/l3/sudoers.sh b/docker/neutron/agents/l3/sudoers.sh new file mode 100644 index 000000000..198420026 --- /dev/null +++ b/docker/neutron/agents/l3/sudoers.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Neutron uses rootwrap which requires a tty for sudo. +# Since the container is running in daemon mode, a tty +# is not present and requiretty must be commented out. +if [ ! -f /var/run/sudo-modified ]; then + chmod 0640 /etc/sudoers + sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers + chmod 0440 /etc/sudoers +fi + +touch /var/run/sudo-modified diff --git a/docker/neutron/agents/linux-bridge/Dockerfile b/docker/neutron/agents/linux-bridge/Dockerfile new file mode 100644 index 000000000..40e4d17a9 --- /dev/null +++ b/docker/neutron/agents/linux-bridge/Dockerfile @@ -0,0 +1,15 @@ +FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +# Install required packages +RUN yum install -y openstack-neutron \ + openstack-neutron-linuxbridge \ + yum clean all; + +# Add required scripts +ADD ./start.sh /start.sh +ADD ./check.sh /check.sh +ADD ./sudoers.sh /sudoers.sh + +# Configure and run the service +CMD ["/start.sh"] diff --git a/docker/neutron/agents/linux-bridge/build b/docker/neutron/agents/linux-bridge/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/neutron/agents/linux-bridge/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/neutron/agents/linux-bridge/check.sh b/docker/neutron/agents/linux-bridge/check.sh new file mode 100755 index 000000000..6b7db95e7 --- /dev/null +++ b/docker/neutron/agents/linux-bridge/check.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +RES=0 + +if ! /usr/sbin/brctl show; then + echo "ERROR: brctl show failed" >&2 + RES=1 +fi + +exit $RES diff --git a/docker/neutron/agents/linux-bridge/start.sh b/docker/neutron/agents/linux-bridge/start.sh new file mode 100755 index 000000000..e5982fe66 --- /dev/null +++ b/docker/neutron/agents/linux-bridge/start.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-neutron.sh +. /sudoers.sh + +: ${BRIDGE_PHYSICAL_INTERFACE:=eth1} +: ${ML2_FLAT_NETWORK:=physnet1} + +cfg=/etc/neutron/plugins/ml2/ml2_conf.ini + +# Configure ml2_conf.ini +crudini --set $cfg \ + ml2_type_flat \ + flat_networks \ + "${ML2_FLAT_NETWORK}" +crudini --set $cfg \ + vxlan \ + local_ip \ + "${PUBLIC_IP}" +crudini --set $cfg \ + linux_bridge \ + physical_interface_mappings \ + "${ML2_FLAT_NETWORK}:${BRIDGE_PHYSICAL_INTERFACE}" + +#Initialization scripts expect a symbolic link +/usr/bin/ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini + +# Start the linux bridge agent. +exec /usr/bin/neutron-linuxbridge-agent diff --git a/docker/neutron/agents/linux-bridge/sudoers.sh b/docker/neutron/agents/linux-bridge/sudoers.sh new file mode 100644 index 000000000..198420026 --- /dev/null +++ b/docker/neutron/agents/linux-bridge/sudoers.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Neutron uses rootwrap which requires a tty for sudo. +# Since the container is running in daemon mode, a tty +# is not present and requiretty must be commented out. +if [ ! -f /var/run/sudo-modified ]; then + chmod 0640 /etc/sudoers + sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers + chmod 0440 /etc/sudoers +fi + +touch /var/run/sudo-modified diff --git a/docker/neutron/agents/metadata/Dockerfile b/docker/neutron/agents/metadata/Dockerfile new file mode 100644 index 000000000..021940c9c --- /dev/null +++ b/docker/neutron/agents/metadata/Dockerfile @@ -0,0 +1,14 @@ +FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +# Install required packages +RUN yum install -y openstack-neutron \ + yum clean all; + +# Add required scripts +ADD ./start.sh /start.sh +ADD ./check.sh /check.sh +ADD ./sudoers.sh /sudoers.sh + +# Configure and run the service +CMD ["/start.sh"] diff --git a/docker/neutron/agents/metadata/build b/docker/neutron/agents/metadata/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/neutron/agents/metadata/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/neutron/agents/metadata/check.sh b/docker/neutron/agents/metadata/check.sh new file mode 100755 index 000000000..ba2474d48 --- /dev/null +++ b/docker/neutron/agents/metadata/check.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +RES=0 + +check=$(/usr/bin/neutron agent-list | awk '/ Metadata / {print $9}') +error="ERROR: Neutron Metadata Agent is not alive." + +if [[ $check != ":-)" ]]; then + echo $error >&2 + RES=1 +fi + +exit $RES diff --git a/docker/neutron/agents/metadata/start.sh b/docker/neutron/agents/metadata/start.sh new file mode 100755 index 000000000..fbe72e18f --- /dev/null +++ b/docker/neutron/agents/metadata/start.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +set -e + +. /opt/kolla/config-neutron.sh +. /sudoers.sh + +: ${KEYSTONE_REGION:=RegionOne} + +cfg=/etc/neutron/metadata_agent.ini + +# Configure metadata_agent.ini +crudini --set $cfg \ + DEFAULT \ + verbose \ + "${VERBOSE_LOGGING}" +crudini --set $cfg \ + DEFAULT \ + debug \ + "${DEBUG_LOGGING}" +crudini --set $cfg \ + DEFAULT \ + auth_region \ + "${KEYSTONE_REGION}" +crudini --set $cfg \ + DEFAULT \ + auth_url \ + "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" +crudini --set $cfg \ + DEFAULT \ + admin_tenant_name \ + "${ADMIN_TENANT_NAME}" +crudini --set $cfg \ + DEFAULT \ + admin_user \ + "${NEUTRON_KEYSTONE_USER}" +crudini --set $cfg \ + DEFAULT \ + admin_password \ + "${NEUTRON_KEYSTONE_PASSWORD}" +crudini --set $cfg \ + DEFAULT \ + nova_metadata_ip \ + "${NOVA_API_SERVICE_HOST}" +crudini --set $cfg \ + DEFAULT \ + metadata_proxy_shared_secret \ + "${NEUTRON_SHARED_SECRET}" + +# Start Metadata Agent +exec /usr/bin/neutron-metadata-agent diff --git a/docker/neutron/agents/metadata/sudoers.sh b/docker/neutron/agents/metadata/sudoers.sh new file mode 100644 index 000000000..198420026 --- /dev/null +++ b/docker/neutron/agents/metadata/sudoers.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Neutron uses rootwrap which requires a tty for sudo. +# Since the container is running in daemon mode, a tty +# is not present and requiretty must be commented out. +if [ ! -f /var/run/sudo-modified ]; then + chmod 0640 /etc/sudoers + sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers + chmod 0440 /etc/sudoers +fi + +touch /var/run/sudo-modified |
