111 Commits

Author SHA1 Message Date
liyingjun
0a024d9d7a Fix vpnaas for neutron
1. Install the missing vpnaas python module in neutron-server Dockerfile
2. Remove duplicated neutron-lbaas-common package from neutron-server,
since it is installed in neutron-base
3. Fix service plugin config, it's not vpn`ass` ;)) 'vpnass' ->
'neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin' [1]

[1]:
https://github.com/openstack/neutron-vpnaas/blob/stable/newton/devstack/settings#L8

Change-Id: I5250b6875d96ef5df9cf39bce10ce072982aa80d
Closes-bug: #1625020
2016-09-19 07:19:00 +00:00
Jenkins
37ec5ecb52 Merge "Add Networking-SFC role" 2016-09-14 20:03:12 +00:00
Jenkins
56da49b561 Merge "Add neutron-vpnaas-agent container" 2016-09-14 18:18:58 +00:00
Christian Berendt
ce2a00a0e9 Add neutron-vpnaas-agent container
This implements the neutron-vpnaas-agent container for Ubuntu/Debian
with installation from source packages.

Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>

Implements: blueprint neutron-vpnaas-agent

Change-Id: I3e4b513fb8e1670c4df0edb4951610f777ff72e6
2016-09-14 14:03:16 +00:00
prithiv
8a01ed3270 Add Networking-SFC role
Networking-SFC is a neutron big-tent project support Service Function
Chaining in Neutron.

* Rename the image from neutron-networking-sfc-agent to
  neutron-sfc-agent.
* Add networking-sfc role in playbooks.

Co-Authored-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Change-Id: I1f99650eed85f59929d4ab6b2226603c54f29577
Implements: blueprint enable-networking-sfc-support
2016-09-14 15:41:03 +08:00
Paul Bourke
b41247c656 Add header blocks to all Dockerfiles
Change needed to add header blocks to all Dockerfiles, similar to the
base.

Use case is to easily run something before packages are installed, e.g.
to COPY a local rpm in that can be added to the package list.

Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee
Closes-Bug: 1618969
2016-09-13 16:53:31 +01:00
Jeffrey Zhang
f59ddb3527
Add neutron-lbaas-agent to exlude image for Ubuntu binary
UCA latest Newton release lack of neutron-lbaas-common package, disable
neutron-lbaas-agent for Ubuntu binary until they fix it.

TrivialFix

Change-Id: I2c02fc578cffe82918ae6affe6cf0e6095ae47e4
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-09-11 02:22:45 +08:00
Christian Berendt
9688f95f58 Customizations for Neutron
Change-Id: I5dbb030943abfa7eccc424859b694a508358c123
Partially-implements: blueprint third-party-plugin-support
Co-Authored-By: Michal (inc0) Jastrzebski <inc007@gmail.com>
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>
2016-08-31 12:40:09 +01:00
Eduardo Gonzalez
8e98e5f15e Change source with dot at extend_start files
Is a best practice in Unix/Linux scripts to use dots
instead of source command.
Using dots will avoid issues with non BASH shells

TrivialFix
Change-Id: Ie6480a1954f853f79faffa093452715ebd9f7d90
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
2016-08-29 07:29:16 +02:00
Jenkins
1fd2d434b1 Merge "Fix bandit gate jobs" 2016-08-28 15:51:00 +00:00
Paul Bourke
fc30d583f9 Fix bandit gate jobs
* Inspected each error and fixed / added nosec where appropriate.
* build-swift-ring.py which was throwing sec errors is no longer used so
  removed it.
* Removed the dev/ directory from being checked.

Closes-Bug: #1617713
Change-Id: I25664cabca4137e5c9f499c1af3f5ce78b86fb56
2016-08-28 08:52:44 +00:00
Jeffrey Zhang
2a1c25d6e3
Fix Ubuntu binary build and deploy gate
Signed-off-by: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Closes-Bug: #1616349
Change-Id: I82a245474392d22017faf30fa89d6dc5e01ab2c2
2016-08-24 16:14:04 +08:00
Jeffrey Zhang
04d6736e89 Pin to Ubuntu 16.04
Upgrade Ubuntu base image to Xenial

Closes-Bug: #1593599
Change-Id: I5832a729a9a4fa73c02442047c92ba088ce20db3
2016-08-20 22:30:28 +08:00
Shaun Smekel
a9d08726f5 Handle empty package list for install_packages
Currently if the install_packages macro is run with an empty
package list, it will add a yum or apt-get command with no
packages listed.

This bug fix aims to omit this line when no packages have
been given, or, the operator wants to use the "_override" /
"_remove" functionality to disable all packages being
installed in a Dockerfile.

Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>
Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb
Closes-bug: 1612446
2016-08-19 10:49:03 +00:00
Jenkins
ec569e752d Merge "Fix the neutron-lbaas-agent container issues" 2016-08-15 15:53:34 +00:00
Jenkins
4adc366d92 Merge "Dockerfiles for Networking-SFC Container" 2016-08-15 15:37:18 +00:00
prithiv
eb41179a73 Dockerfiles for Networking-SFC Container
Networking-SFC is a neutron big-tent project
Kolla does not have Networking-SFC agent support for now. This
is essential for Service Function Chaining use case. Build Networking-SFC
Container.

Change-Id: I67b4d6e061dbe31e2211cd3210726ab4c30cd087
Partially-Implements: blueprint enable-networking-sfc-support
2016-08-06 12:06:39 +00:00
Dennis Mueller
1f0afeb3ad Added neutron-metering-agent
Added neutron-metering-agent container

Change-Id: Ie72475a61e557a78ea0099940462a73699963642
Partially-Implements: blueprint support-neutron-metering-agent
2016-08-04 13:12:59 +02:00
Jeffrey Zhang
512be70cee Fix the neutron-lbaas-agent container issues
* copy the ml2_conf.ini file to the container
* map the host /etc/localtime file to the container
* remove the output_file and wrap_with options in the lbaas_agent.ini
  file, which are useless
* remove the interface_driver in the lbaas_agent, which is configured
  in the neutron.conf file
* install net-tools package into the container, which is used by the
  neutron-lbaas

Change-Id: Ia58d825e41d3b843d8c6e6b3c9ee1756c1aed1ac
Closes-Bug: #1606755
2016-07-27 11:42:34 +08:00
liyingjun
9cbceda259 Fixes Dockerfile for neutron-lbaas-agent
Remove the extra '\' after RUN command for ubuntu, otherwise the later
COPY will not run correctly for ubuntu image.

Change-Id: Ie7de201711c6e684f58665027888c34f4c245487
Closes-bug: #1605453
2016-07-26 16:06:41 +08:00
Jeffrey Zhang
3f79e37d21 Fix the overwrite sudoers file issue
Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98
Closes-Bug: #1598423
2016-07-05 05:49:13 +00:00
Jeffrey Zhang
10258f138b Fix the native ovsdb_interace failed
Closes-Bug: #1598977
Change-Id: I8be53531c2ba000c3b73d0f957dcc50fe947c925
2016-07-05 09:02:06 +08:00
Christian Berendt
2592a46c14 Copy lbaas-haproxy.filters file to /etc/neutron/rootwrap.d
The copy instructions do copy the README.txt file and the oslo-config-generator
directory to /etc/neutron. This makes no sense. Only the
neutron/rootwrap.d/lbaas-haproxy.filters should be copied to /etc/neutron/rootwrap.d.

TrivialFix

Change-Id: I2dfd86b718166d1d3e348dd9ba14056bb763e64f
2016-06-29 13:13:47 +00:00
liyingjun
5c1ca9e012 neutron-lbaas TO neutron-lbaas-agent
When building image for neutron-base on ubuntu, it failed with
installing neutron-lbaas, it should be neutron-lbaas-agent

Change-Id: Ia8ba9c4b578368940b44c7943648a15a9f9f7518
Closes-bug: #1597141
2016-06-29 08:26:54 +08:00
Jenkins
cb1e665a8a Merge "Use --subproject instead of deprecated --service option" 2016-06-03 20:07:33 +00:00
Christian Berendt
d511ee363b Install keepalived in neutron_l3_agent container
L3 HA requires keepalived. It has to be installed when install_type
is source.

Change-Id: I3265b74490559ca9b22a19917a76925a55e32cdd
Closes-bug: 1588829
2016-06-03 16:03:06 +02:00
Henry Gessau
95c7d83ea7 Use --subproject instead of deprecated --service option
The --service option to neutron-db-manage is deprecated and will be
removed soon. Use --subproject instead.

Related-Bug: #1501380

Change-Id: I2f64634d6f01c06a071abf064caf11a134800d04
2016-05-30 15:39:06 +00:00
Daneyon Hansen
ba30579b3b Adds Neutron LBaaS Support
Previously, kolla did not support neutron lbaas functionality.
Only Lbaasv2 is supported in Mitaka. Additional information can
be found here:
http://docs.openstack.org/mitaka/networking-guide/adv-config-lbaas.html
Magnum uses Neutron Lbaas to provide high availability to COE API
and Etcd endpoints within a bay. Therefore, Neutron Lbaas is required
for Kolla to support Magnum.

Co-Authored-By: Serguei Bezverkhi <sbezverk@cisco.com>
Partial-Bug: #1551992

Change-Id: I05360b7c447c601fcb3c2b6b2a913ef5cc0f3a1b
2016-05-27 11:41:25 -04:00
Serguei Bezverkhi
c51e315523 Install correct version of arping
Currently Ubuntu source installation loads arping package which is version
2.11. It does not support -U keyword which is used by lbaas.
iputil-arping package should be used instead.

Change-Id: I64c5e5b40e561d309281204b4f6aeaf0fb395cb5
Closes-Bug: #1586085
2016-05-26 12:00:19 -04:00
Swapnil Kulkarni (coolsvap)
435b21b90d Update ubuntu dockerfiles for formatting
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug: #1569417
2016-05-26 04:09:22 +00:00
Swapnil Kulkarni (coolsvap)
22c9cb3a42 Update Neutron dockerfiles for formatting
Change-Id: I19298f750e3bbf6fee12129d424b2c2b8810464c
Partial-Bug:#1569417
2016-04-13 10:16:37 +05:30
Jenkins
3e1acf005e Merge "Fix launch vm failed in neutron-linuxbridge-agent env" 2016-04-13 04:34:03 +00:00
Jeffrey Zhang
4417571b9b Fix the wrong package name in Ubuntu binary build
neutron-plugin-linuxbridge and neutron-plugin-openvswitch package
is useless and removed in Mitaka on Ubuntu

Change-Id: Ia156d58410198af969f579cd5e7461c31ea63408
Closes-Bug: #1568281
2016-04-12 01:18:54 +00:00
Jeffrey Zhang
eec09486a3 Fix launch vm failed in neutron-linuxbridge-agent env
Fix following two issues

* neutron-linuxbridge-agent container lacks bridge-utils package
* neutron-dhcp-agent container lacks dnsmasq-utils

Co-Authored-By: Manjeet Singh Bhatia <manjeet.s.bhatia@intel.com>
Closes-Bug: #1567406
Change-Id: I93a445b06612671f0331cd94573da41d2d3b60a0
2016-04-08 15:53:31 -04:00
SamYaple
27975f8ab5 Add conntrack-tools
Conntrack is used by neutron as a dep, but not installed in the source
containers. This leads to errors in the log and in some cases network
instability.

Change-Id: Ie6eae7530bf4e378eedb852a16ed8595402113a6
Closes-Bug: #1561008
2016-03-23 14:26:27 +00:00
Vikram Hosakote
6770ed4c5d Drop root user for neutron-linuxbridge-agent
Change-Id: Ic4448469ac31f6804b517c916e9b41c39e527081
Closes-Bug: #1553522
2016-03-09 20:35:05 +00:00
Hui Kang
55b50b121c ADD user neutron to the neutron-openvswitch-agent docker file
Neutron containers share the same log directory. So all containers
should use same username to create directories.

Change-Id: Id95a3205b53dd87ba21d55ebecada89d9f86d37b
Closes-Bug: #1551829
2016-03-01 13:51:16 -05:00
Éric Lemoine
509acbb83f Remove duplicate code in neutron extend_start.sh
Change-Id: I74aa68d809e9b38a605093abc4e2b8ca14335dee
Partial-Bug: #1546944
2016-02-24 11:29:10 +01:00
Éric Lemoine
a2b130d6ba Make Heka collect Neutron logs
Partially implements: blueprint heka
Change-Id: I70e94f4ef7380c6f376a3066d7ddda042c703637
2016-02-19 21:49:21 +00:00
Martin André
ed8d911881 Cleanup dependencies for neutron-base
The python-neutron package now pulls the required dependency on
python-oslo-reports:

774036f7f9/openstack-neutron.spec (L125)

TrivialFix

Change-Id: I6cb4d0d9601c910cf631dddcf715a7f4fc9754e3
2016-02-09 09:23:01 +09:00
SamYaple
ddb7cd88c5 Convert Neutron to thin containers
*** 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-06 07:13:47 +00:00
SamYaple
2514bcf0c3 Correct issue with virtualenv rootwrap
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-06 06:48:59 +00:00
venkatamahesh
23b1a8c03a Fix some words spellings
Trivial Fix

Change-Id: Ic14778bb4e894490a3b6af9471ba01ab4da94601
2016-02-03 10:01:30 +00:00
malei
bdda9e40ea Fix typos in docstrings:
Change 'formating' to 'formatting'
change 'seperate' to 'separate'

Change-Id: I3093461c91cc71654c3ba86d7d662259262c09f5
2015-10-20 17:23:05 +08:00
Artur Zarzycki
1bd0d2a1f7 Docker run scripts with sh which doesn't support [[
Change-Id: I368f5b89fbfded0f173b97058061a03783ce1829
Closes-Bug: #1531883
2016-01-08 14:05:37 +01:00
Martin André
8d96569fd8 Fix neutron-server for centos-binary
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-05 18:29:04 +09:00
Martin André
2a6ec2c9b5 Cleanup dependencies for neutron-base
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
2016-01-05 10:24:31 +09:00
Jenkins
28ef995398 Merge "Neutron ubuntu binary container" 2015-12-31 15:22:25 +00:00
Artur Zarzycki
0ce55a9edd Neutron ubuntu binary container
Change-Id: Iae33dfd72755ddc29961d8624fef2f4eb045816b
Partially-Implements: blueprint binary-ubuntu
2015-12-31 01:04:00 +01:00
SamYaple
cda0459ad1 Fix pip install settings
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-27 03:35:35 +00:00