Commit Graph

49 Commits

Author SHA1 Message Date
Marcin Juszkiewicz 016c5ed30c adjust permissions on _extend_start files (part II)
Tim Shearer started it in 1d96a2bbe1.

Since all extend_start files are sourced rather than executed, the executable
bits are now cleared throughout the project.

Change-Id: Ia1797c32fc6a35f9f077c673abf4d8e16e51a760
2022-04-22 11:34:55 +02:00
Marcin Juszkiewicz e21aeb5ae9 flatten images a bit
As we have one type of images now some RUN calls could be merged so we
will have less layers in resulting images.

Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0
2022-04-21 18:53:14 +00:00
Marcin Juszkiewicz 1749da2fbf docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
2022-04-09 17:44:26 +02:00
Mark Goddard 928c4648a4 ironic-neutron-agent: enable for Debuntu binary
Packages are available for focal and bullseye.

Change-Id: I61623748d1149adb1b096adf2fffb5a902df3181
2021-08-12 09:00:52 +02:00
Marcin Juszkiewicz 8d70e3f0cc neutron-server: make it build again
1. stop pinning networking-hyperv

Pike release was long time ago so maybe it is time to unpin it?

commit 6dc8e97846
Author: Dan Ardelean <dardelean@cloudbasesolutions.com>
Date:   Mon Aug 28 12:56:25 2017 +0300

    Change networking-hyperv version for Pike

2. stop install vmware-nsxlib as a plugin

vmware-nsx is a plugin and we install it already
vmware-nsxlib can be fetched from Pypi

Solves:

INFO:kolla.common.utils.neutron-server:The conflict is caused by:
INFO:kolla.common.utils.neutron-server:    The user requested vmware-nsxlib 15.0.8.dev129 (from /plugins/vmware-nsxlib-15.0.8.dev129)
INFO:kolla.common.utils.neutron-server:    vmware-nsx 15.0.1.dev424 depends on vmware-nsxlib>=17.0.0

Change-Id: I6ef344d463333e5cdc3a0850c8e068218779fdbd
2021-03-01 14:30:59 +01:00
Marcin Juszkiewicz 53443c5c71 Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.

We also no longer have to support yum as a value for
distro_package_manager.

Partially-Implements: blueprint centos-rhel-8

Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
2020-04-15 09:32:06 +00:00
Christian Berendt 861f55fbfd Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-03-01 17:25:58 +00:00
Carlos Goncalves 43ecacaffb Remove Neutron LBaaS support
The project has been retired and there will be no Train release [1].
This patch removes Neutron LBaaS support in Kolla.

[1] https://review.opendev.org/#/c/658494/

Depends-On: https://review.opendev.org/#/c/663875/
Change-Id: I99484c48ed09f7e015e134bdff1f298c359c6905
2019-06-07 09:56:44 +00:00
Alex Schultz 3e5d8e2653 Add python3 packages for RHEL systems
RDO is currently working on python3 support for the next version of
CentOS/RHEL based systems.  This package uses the distro_python3 flag
that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to
use the python3 specific package names.  This change only adds python3
package names for RHEL systems.

Conflicts-With: https://review.openstack.org/#/c/636457/
Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a
Related-Blueprint: python3-support
2019-03-12 17:48:18 +00:00
Marcin Juszkiewicz 43b74ccc15 debian/ubuntu: make use of Python3 based packages
Both Ubuntu Stein UCA and Debian 'buster' migrated their OpenStack
packages to Python 3.

Note that Debian 'buster' is not released yet and contains Rocky
packages. Stein ones will be available later.

Co-Authored-By: Lee Yarwood <lyarwood@redhat.com>
Co-Authored-By: Eduardo Gonzalez <dabarren@gmail.com>

Change-Id: I160f79cc57f54ec3eac857c5babd1a6e2656d228
2019-02-28 13:06:24 +01:00
Alex Schultz ae1322ec10 Use base_package_type
This change updates the docker files to use base_package_type instead
of doing specific distro checks for the rhel/deb generic cases. The
base_distro is still available and is used when a specific distro needs
a customization but if the differences are purely rpm vs deb, then the
base_package_type can be used.

Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
2019-01-17 08:23:41 -07:00
Will Miller a708c7cbba Add networking-generic-switch to neutron-server
Change-Id: I75c460bda4c85016446f6a8df14e53806f8ef414
2018-08-16 11:52:44 +01:00
Zuul 00d37c53ca Merge "Remove the unnecessary "openstack-neutron-lbaas" from neutron-server" 2018-03-19 10:39:05 +00:00
Martin André 6b81f91c5e Remove customizable for plugins_pip_packages
The pip packages are normally already configurable with the
<image_name>_pip_packages variable. It doesn't make much sense to make
the list of packages installed with the plugins mechanism configurable
via the <image_name>_plugins_pip_packages variable too.

And even if we wanted to, the parameter to the `customizable()`
function should be 'plugins_pip_packages' and not 'pip_packages'.

This commit removes the customizable bits from the plugins install
macro, at least until we get a good use case for it.

Change-Id: I90dd28b8c5d981e6028af353e34645712ef09b0b
2018-01-23 14:15:51 +01:00
caoyuan b26802f03b Remove the unnecessary "openstack-neutron-lbaas" from neutron-server
since openstack-neutron-lbaas has beed installed in neutron-base image,
it's no need to install it again install neutron-server.

Change-Id: I5219b1d37a408dfeb61fa54133e36751af1ee389
2018-01-16 17:57:44 +08:00
Michal Nasiadka 0478080477 Fix missing bgp library in neutron-server
Closes-Bug: #1730629

Change-Id: Iae9ab6f3bba8185cf1bf53c3a5748e801404aeb7
Signed-off-by: Michal Nasiadka <michal.nasiadka@pl.ibm.com>
2017-11-08 15:02:16 +01:00
Dan Ardelean 6dc8e97846 Change networking-hyperv version for Pike
Change-Id: I56b9ef9ceb449d3fe6f2aa4cf856d6d1d7af7ee9
2017-08-28 12:56:25 +03:00
jimmygc 388bad5cdc Support VMware DVS
Move vmware_nsx and oslo.vmware to neutron_base image to
 support this change: I6d1629e93f0efeddd2a9000f66cc6f714bebb07c

Change-Id: I4655086a3f058ec769d3d37ec6a19565b5ea0841
Partially-implements: blueprint kolla-ansible-support-vsphere
2017-06-12 02:28:36 +00:00
Jenkins 3443eaddcd Merge "Add networking-hyperv driver when building neutron-server image" 2017-06-04 15:58:14 +00:00
Jenkins 399b2f1d5f Merge "Only copy plugin-archive into image for source builds" 2017-06-02 10:10:37 +00:00
Marcin Juszkiewicz ea9228c753 use proper package name for python-oslo.vmware
python-oslo-vmware was transitional package name

Change-Id: Ieb355e30fe7162c035f342fd5b0fb2573365f428
2017-05-24 11:01:12 +02:00
Dan Ardelean e5ca556b42 Add networking-hyperv driver when building neutron-server image
Change-Id: I31dd5054ea9bf341323f6d093c0667b98491cc2b
2017-05-18 19:51:19 +03:00
Martin André 15543949b1 Only copy plugin-archive into image for source builds
The plugin mechanism is meant to be for source install type only.

Change-Id: I1371a253236b09dc62ea91dce6d652e1c5603015
Closes-Bug: #1681345
2017-05-10 17:10:28 +02:00
Jawon Choo 31259fa595 Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
2017-05-03 11:08:17 +09:00
Chen 8c463a47a9 Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
Use LABEL instruction instead of MAINTAINER (deprecated) instruc-
tion as suggested by Docker's official dockerfile guide.
docs.docker.com/engine/reference/builder/#maintainer-deprecated

Closes-Bug: #1683652

Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-20 16:50:05 +09:00
Jenkins 3bd8fe8e10 Merge "debian: enable all images enabled for Ubuntu" 2017-04-06 10:14:03 +00:00
jimmygc 6f02261248 Add vSphere Support
Add oslo.vmware and vmware_nsx packages into kolla.

Change-Id: I2a1ed314b970a4832f7f8256c1929921f36069f2
Implements: blueprint kolla-support-vsphere
Co-Authored-By: shaofeng cheng <chengsf@winhong.com>
2017-04-05 09:19:35 +08:00
Marcin Juszkiewicz 69fef5cd59 debian: enable all images enabled for Ubuntu
Debian support is not maintained in Kolla so it got a bit behind Ubuntu
one. This changeset enables Debian for all images. Jessie (even with
backports) may be too old for some images though.

Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order
like it is done for RPM distributions.

Partially-Implements: blueprint multiarch-and-arm64-containers

Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
2017-04-04 22:48:18 +02:00
Chao Guo 961224c6cf Use install-pip macro in most source images
1. Enable customization of pip packages in source
branch of most images
2. All pip packages install uniformly through
install-pip macro, user can easily customize his
own pip command (For example using a mirror)

Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
2017-02-17 08:49:32 -03:00
Jeffrey Zhang e5903d5fa9 Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-02-05 10:44:48 +08:00
Christian Berendt 5cd30d4914 Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-03 10:50:22 +01:00
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
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
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
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
É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
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
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
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
Paul Bourke acb13dc5b9 Install plugins in neutron-server if available
Implements: blueprint neutron-third-party-plugins

Change-Id: I56c56bacd2f06c120b14b00c0b97dd4e39c0afc0
2015-11-30 10:01:06 +00:00
Swapnil Kulkarni (coolsvap) 59a1c8b9fb Remove hardcoded MAINTAINER in Dockerfiles
Added new option in kolla-build.conf

Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56
Closes-Bug:#1514304
2015-11-23 11:03:47 +00:00
Angus Salkeld 33d39f2942 Fix validate-all-maintainer.sh to look for Dockerfile.j2
And fix the fallout.

Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
2015-11-09 15:20:13 +10:00
Steven Dake 52eb4d8403 Remove an oslo.message 2.2.0 pin
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-07 22:20:28 -07:00
Steven Dake e6391aff36 Remove which from neutron-server
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-06 21:50:44 -07:00
Sam Yaple cb4e875ae1 Common start.sh
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-10-06 03:30:26 +00:00
Steven Dake 0e99b69de4 Implement a install_type and install_metatype
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-28 03:16:48 -07:00
Sam Yaple a1b0518b9a Fix removal of config-external
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-25 20:08:40 +00:00
Steven Dake 6992049323 Add 'rhel' for RPM distros
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-04 03:12:15 -07:00
Sam Yaple cbd42ca6e9 Move docker_templates to docker dir
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-08-28 13:33:50 +00:00