diff options
| author | Sam Yaple <sam@yaple.net> | 2015-05-13 06:46:24 -0500 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-05-15 01:32:22 -0500 |
| commit | 13062e23e86b5d86020949754540460cb5b0b4fe (patch) | |
| tree | e0b3c8411418949a3d8df221da7c8cb2831b6d5d /docker/nova-compute/nova-network | |
| parent | 354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9 (diff) | |
| download | kolla-13062e23e86b5d86020949754540460cb5b0b4fe.tar.gz kolla-13062e23e86b5d86020949754540460cb5b0b4fe.zip | |
Restructure builds to allow more flexibility
As a restructure, nothing is changed from the original behaviour and
naming despite the file structure changing. The symlinks to build had
to be updated generating lots of "deleted" and "new_file".
The new structure is:
docker/${base_distro}/${type}/${container}
base_distro == centos, ubuntu, fedora, etc
type == source, binary, rdo
type rdo is a symlink to binary for backwards compatibility
Two new flags are added to the build-all script to support the ability
to support different base distros and a flag to support binary or source
containers.
There are several added folders that are empty to hold the directory
structure for future containers of these types.
To use a prefix other than centos-rdo- you can set PREFIX in the toplevel
directory .buildconf file
Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
Diffstat (limited to 'docker/nova-compute/nova-network')
| -rw-r--r-- | docker/nova-compute/nova-network/Dockerfile | 10 | ||||
| l--------- | docker/nova-compute/nova-network/build | 1 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/config-nova-network.sh | 30 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/start.sh | 8 |
4 files changed, 0 insertions, 49 deletions
diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile deleted file mode 100644 index 2434dbdf0..000000000 --- a/docker/nova-compute/nova-network/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-network \ - bridge-utils initscripts && yum clean all - -ADD config-nova-network.sh /opt/kolla/config-nova-network.sh -ADD ./start.sh /start.sh - -CMD ["/start.sh"] diff --git a/docker/nova-compute/nova-network/build b/docker/nova-compute/nova-network/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker/nova-compute/nova-network/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh deleted file mode 100755 index 6976d3a20..000000000 --- a/docker/nova-compute/nova-network/config-nova-network.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -. /opt/kolla/config-nova.sh - -cfg=/etc/nova/nova.conf - -# configure logging -crudini --set $cfg DEFAULT log_file "${NOVA_NETWORK_LOG_FILE}" - -# Configure eth1 as a physcial interface for nova flat network -cat > /etc/sysconfig/network-scripts/ifcfg-$FLAT_INTERFACE <<EOF -DEVICE="$FLAT_INTERFACE" -BOOTPROTO="none" -ONBOOT="yes" -TYPE="Ethernet" -EOF - -/usr/sbin/ifup $FLAT_INTERFACE - -cfg=/etc/nova/nova.conf - -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_network_bridge br100 diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh deleted file mode 100755 index 92381b720..000000000 --- a/docker/nova-compute/nova-network/start.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-nova-network.sh - -# Start nova-network -exec /usr/bin/nova-network --config-file /etc/nova/nova.conf |
