aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
AgeCommit message (Collapse)AuthorFilesLines
2016-02-24Remove duplicate code in neutron extend_start.shÉric Lemoine6-19/+8
Change-Id: I74aa68d809e9b38a605093abc4e2b8ca14335dee Partial-Bug: #1546944
2016-02-19Make Heka collect Neutron logsÉric Lemoine4-3/+28
Partially implements: blueprint heka Change-Id: I70e94f4ef7380c6f376a3066d7ddda042c703637
2016-02-09Cleanup dependencies for neutron-baseMartin André1-2/+0
The python-neutron package now pulls the required dependency on python-oslo-reports: https://github.com/openstack-packages/neutron/blob/774036f7f99cd54bdd1c94f70d28bfe15f47af83/openstack-neutron.spec#L125 TrivialFix Change-Id: I6cb4d0d9601c910cf631dddcf715a7f4fc9754e3
2016-02-06Convert Neutron to thin containersSamYaple20-187/+75
*** Requires Docker 1.10 which is released *** Documentation will be in the next patch. You must set the following in your docker.service daemon control file for propogation to work: [Service] MountFlags=shared ====================================================================== Thanks to mount propagation in Docker 1.10 we can use thin containers finally! This is extremely useful to operators since now they can access the network namespaces from the hosts (outside the neutron container). But additionally it allows us to implement the VPN agent and other services easier. Neutron containers and the neutron role are brought into the standards of the new Kolla. Completely with drop-root and ansible formating updates. The ip_wrapper.py script was (thankfully) not needed so it has been removed from the repo. Partially-Implements: blueprint upgrade-neutron Change-Id: Iaf5555283240457e1912459f397a6393d886fba1
2016-02-06Correct issue with virtualenv rootwrapSamYaple1-1/+2
Because we use rootwrap in a venv we need to update the exec_dirs. Without doing this *some* commands will break for various reasons that I won't get into in this review in detail. But this is required for neutron-l3-agent in a container + drop-root. Change-Id: I1a09f7188fdd501b7ce251d9f2fb0e5b10222142 Partially-Implements: blueprint drop-root
2016-02-03Fix some words spellingsvenkatamahesh2-2/+2
Trivial Fix Change-Id: Ic14778bb4e894490a3b6af9471ba01ab4da94601
2015-10-20Fix typos in docstrings:malei1-2/+2
Change 'formating' to 'formatting' change 'seperate' to 'separate' Change-Id: I3093461c91cc71654c3ba86d7d662259262c09f5
2016-01-08Docker run scripts with sh which doesn't support [[Artur Zarzycki1-1/+1
Change-Id: I368f5b89fbfded0f173b97058061a03783ce1829 Closes-Bug: #1531883
2016-01-05Fix neutron-server for centos-binaryMartin André1-0/+2
openstack-neutron package is missing a dependency on python-oslo-reports. Add it to Kolla until RDO packaging is fixed. Change-Id: Idfdc1139b790ed8778540a763e0f205101140db7 Closes-Bug: #1531107
2016-01-05Cleanup dependencies for neutron-baseMartin André1-3/+0
Rely on packagers for managing dependencies. openstack-neutron now pulls the required packages: https://github.com/openstack-packages/neutron/blob/rpm-master/openstack-neutron.spec TrivialFix Change-Id: I7e24d59822ff9f97900b46d44bee16c56fff673f
2015-12-31Merge "Neutron ubuntu binary container"Jenkins4-0/+34
2015-12-31Neutron ubuntu binary containerArtur Zarzycki4-0/+34
Change-Id: Iae33dfd72755ddc29961d8624fef2f4eb045816b Partially-Implements: blueprint binary-ubuntu
2015-12-27Fix pip install settingsSamYaple2-2/+2
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
2015-12-27Add missing contraintsSamYaple1-1/+1
There were some missing constraint caps on our pip installs TrivialFix Change-Id: I3d0af9556d08a9a0a99248a9992637d08fd3ad01
2015-11-30Install plugins in neutron-server if availablePaul Bourke1-1/+5
Implements: blueprint neutron-third-party-plugins Change-Id: I56c56bacd2f06c120b14b00c0b97dd4e39c0afc0
2015-11-27Source installation in virtualenvMichal Rostecki4-4/+4
Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)5-5/+5
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-16Fix namespace regression for neutronSam Yaple2-0/+6
Due the to way network namespaces work, they will not survive a container restart. This is not an issue related to Kolla or Neutron but rather an issue with how network namespaces work. This is putting back into place a workaround that was in correctly removed in the past. We simply cleanup the namespace cruft when the neutron-agents container restarts thus avoiding this issue. Change-Id: Ic16f2f766b4fa46347ea14a1ece5a4653c69d779 Closes-Bug: #1511216
2015-11-09Fix validate-all-maintainer.sh to look for Dockerfile.j2Angus Salkeld5-5/+5
And fix the fallout. Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
2015-10-13Fix issue with su and bad kernelsSam Yaple1-1/+1
Long story short, some kernels before 3.15 had an issue with using su in a container when the network namespace was --net=host. The gate has a 3.10 and a 3.13 kernel and has a problem with this. This changes everything to use sudo backport: liberty Partially-Implements: blueprint functional-testing-gate Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
2015-10-07Remove an oslo.message 2.2.0 pinSteven Dake1-10/+0
In https://bugs.launchpad.net/kolla/+bug/1483667, oslo.messaging was pinned to 2.2.0. This pin is no longer necessary as this bug has been fixed upstream. backport: liberty TrivialFix Change-Id: Ica9ae41876a754291d4c6ee1235f6e69a4213463
2015-10-08Merge "Remove which from neutron-server"Jenkins1-12/+0
2015-10-06Install agent dependencies from source for CentOSSteven Dake1-1/+10
Several packages are not installed from RPM packages which are required in order for CentOS from source to operate correctly. This looked like sudo was failing to execute, but it was because the dnsmasq binary was not found. backport: liberty Change-Id: If23cfbacd55d9089ffec442399ee0151adea923f Closes-Bug: #1503412
2015-10-06Remove which from neutron-serverSteven Dake1-12/+0
The which tool is installed in the base image now and this extra install is duplicated and has no effect. backport:liberty TrivialFix Change-Id: I70c3edb11f5c847063b6e4ab4f9de7184356ce57
2015-10-06Bring Kolla inline with FHSSam Yaple7-15/+15
This brings Kolla images inline with FHS and should make finding locations of things more consistent and reliable with the linux world at large. Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8 Closes-Bug: #1485742
2015-10-06Common start.shSam Yaple12-39/+33
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
2015-09-28Neutron Agents json supportRyan Hallisey8-137/+19
Neutron Agents is a special case for json support. Since it's a fat container, there will be multiple commnds that will need to be run in the container. In order to account for this, the commands will be hardcoded until the agents are split out to their own containers. The files will be copied the normal way. Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I9fc226cc7b82c2594db5814d30d453a29a4af8c0 Partially-Implements: blueprint replace-config-external Closes-Bug: #1500566
2015-09-28Merge "Implement a install_type and install_metatype"Jenkins5-5/+5
2015-09-28Merge "remove set_configs"Jenkins3-12/+0
2015-09-28Implement a install_type and install_metatypeSteven Dake5-5/+5
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-27remove set_configsSam Yaple3-12/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-27Remove all fail sections for UbuntuSam Yaple1-9/+4
Ubuntu binary is not supported and may never be. Installing from cloud-archive packaging is only for the current stable distros, Ubuntu does not have a Delorean type repo. We place a fail message in the base image to catch this and remove the messages throughout the project. An additional fail message is placed to catch all other things. Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7 Implements: blueprint install-from-ubuntu
2015-09-25Fix removal of config-externalSam Yaple3-3/+0
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
2015-09-25Remove config-external.shSam Yaple3-60/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-24Replace config-external with a JSON file for Neutron (thin)Ryan Hallisey3-18/+12
This is only for the Neutron thin containers. The Neutron agents are still in a fat container. I'll replace in another patch. Change-Id: I8533af52bfa3f268aa8ffb1c16ae49f5a300da27 Partially-Implements: blueprint replace-config-external
2015-09-17Fix broken centos-source- build: add rdo repositoryVladislav Belogrudov3-8/+4
openvswitch requires rdo repository to be installed Change-Id: I173bb3d32bcef2b890ab482083b0ffb830c3b7fb Closes-Bug: #1495470
2015-09-14Source type nova-compute and neutron-agents - no ovs-vsctlVladislav Belogrudov1-1/+5
When booting a vm with centos-source nova-compute and some of neutron-agents fails to find ovs-vsctl binary Change-Id: If1e7b6513babd5623666f01c68815ea8d0a05428 Closes-Bug: #1495470
2015-09-04Add 'rhel' for RPM distrosSteven Dake5-8/+9
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
2015-09-04Merge "Allow arbitrary source archive name to be imported into Dockerfile"Jenkins1-2/+2
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-2/+2
Currently we cannot import source archives with names different than expected by hardcoded line in Dockerfiles. This worked well for Openstack services' tarballs where we expected SERVICE-* root folder after extraction or kanaka-noVNC for nova-novncproxy docker. The latter fails if one tries to clone or get tarball under other names. This fix allows any archive (tar,tgz,zip) or repo name to be imported into dockerfile. Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9 Closes-Bug: #1491415
2015-09-03Create openstack-base containerSam Yaple1-1/+1
This creates and moves the dependencies for Ubuntu into a common openstack-base container. This commit shows dramatically smaller sizes for all non-openstack containers. The Openstack container remain the same size. Change-Id: I2f46420d4b9edcfddda374caddcce906fc708f6c Partially-Implements: blueprint openstack-common-container
2015-08-31Merge "Fix KOLLA_CONFIG_STRATEGY in neutron agents"Jenkins3-6/+6
2015-08-31Remove dest_filename from build.iniSam Yaple1-1/+1
We can, and should, figure out the filename dynamically rather than hardcode that value in build.ini since it is not actually a configurable paramater. Change-Id: I496d6555e9fa356ab09e62063fd707f43ed08121 Closes-Bug: #1490386
2015-08-30Fix KOLLA_CONFIG_STRATEGY in neutron agentsSteven Dake3-6/+6
The change from: I01220077d8d25db5f69802ad27e745d90826d69b In some way was lost by the gerrit. This patch just basically redoes that work so the neutron agents will work properly. Change-Id: I92ac1b8601d145a0722b37eda937ee2baac7a7c5 Closes-Bug: #1489664
2015-08-28Move docker_templates to docker dirSam Yaple22-0/+563
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir
2015-05-15Restructure builds to allow more flexibilitySam Yaple20-783/+0
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
2015-05-08linuxbridge check.sh not rightFang Fenghua1-1/+1
linuxbridge check.sh script got wrong value of status. Change-Id: I975562a62c9ebf7afc22289dc96e672ed877537c Closes-Bug: #1452626
2015-05-06Make neutron work with KiloSteven Dake1-1/+1
Neutron was loading a bunch of modules that are not currently supported in Kolla. Remove them as they were causing problems loading Neutron. Partially-Implements: blueprint port-kilo Change-Id: If53071bbb0a22aa05219b9e99ca6d693f96db4ce
2015-05-06Move dnsmasq-neutron.conf to /etc/neutron/dnsmasqSteven Dake1-1/+3
The default dnsmasq configuration file doesn't operate with the Kilo agents in /etc/neutron when used with the --config-dir option. Instead move it to a subdirectory. Change-Id: Iab8a54e879f8e630ba38205750ca9670e82834df Partially-Implements: blueprint port-kilo
2015-05-06The Neutron agents need their configuration directory specifiedSteven Dake4-4/+4
Add a --config-dir specification to each agent run. Change-Id: I0426caf2ca17185c0789753d4aa9637c5b4327ec Partially-Implements: blueprint port-kilo