35 Commits

Author SHA1 Message Date
Swapnil Kulkarni (coolsvap)
b60d8bc629 Add support for magnum ubuntu binary containers
Change-Id: I5ad90f96aa58a99765feb2a3bc96157a4a61310f
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582518
2016-05-25 12:25:09 +00:00
Swapnil Kulkarni (coolsvap)
2a19d8e6e3 Update Magnum dockerfiles for formatting
Change-Id: Ieaad94d423d58b153bbf7f634be44a0e48ac775f
Partial-Bug:#1569417
2016-04-12 21:37:56 +05:30
Éric Lemoine
feca4a3f4a Remove duplicate code in magnum extend_start.sh
Change-Id: Iaa7049834be784c7410970fb9f0b25086891211d
Partial-Bug: #1546944
2016-02-24 12:04:03 +01:00
Éric Lemoine
d935f2da68 Make Heka collect Magnum logs
Partially implements: blueprint heka
Change-Id: I91a977c6a3632c570f7a6054c8de3f5e3cb6932c
2016-02-19 21:56:10 +00:00
Vikas Jain
8eb2f83eee Use rdo magnum instead of sdake's copr for magnum
Steve is tired of maintaining a copr for Magnum.  People bug him
all the time to update the rpm for RDO.  The RDO community
has offered to take on the maintainance of the Magnum RPM. As this
RPM won't be in current-passed-ci for some time so it needs
to be pulled from current repo for the foreseeable future,
possibly nearing the release of Mitaka.

Change-Id: I9cfb02ab828251ef5bf40ca236f18b5f0f715e34
Closes-Bug: #1539325
2016-01-28 20:32:50 -08:00
David Moreau Simard
d0026fad3d Have curl follow redirects when downloading magnum repository
Otherwise curl downloads an html 302 found file

Closes-Bug: 1537100
Change-Id: Ib77ef0efea54f03f187b97fac4322b473ff35dac
2016-01-22 10:31:32 -05: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
Jeffrey Zhang
b39c8e2918 import the gpg public key properly
include:
* CentOS 7 RPM GPG key
* Percona repo GPG key
* OpenStack Magnum repo GPG key

Closes-Bug: #1528988
Change-Id: I2419d1d130c2cc4466e884e4022b64d81109943b
2015-12-24 15:54:51 +08:00
Michal Rostecki
febcb600f1 Source installation in virtualenv
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-27 10:22:17 +01:00
Paul Bourke
31cee99d28 Add missing usermod for magnum
Change-Id: I19921f38c858ee7a88830773423d50a1a8162204
Trivial-Fix
2015-11-24 15:55:11 +00:00
Paul Bourke
b3fa0fefee Install magnum-common packages for binary builds
User magnum is missing from the binary image, install magnum-common to
fix this.

Closes-Bug: 1519390
Change-Id: I23e1206ab14b02de716374d28be2ef42e75e5beb
2015-11-24 15:54:33 +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
Paul Bourke
2e50ead57e Fix missing policy.json in Magnum
The magnum api falls over on a request without this file in place

Change-Id: Ic7ff8af22c3142d93e0dcf2b2ed5455685dec658
Closes-Bug: #1517152
2015-11-18 12:10:38 +00:00
Jenkins
3e97fdf4d8 Merge "Drop root for Magnum" 2015-11-18 00:50:40 +00:00
Jenkins
e63c0458f5 Merge "Remove old config-external.sh scripts for magnum" 2015-11-18 00:48:10 +00:00
Paul Bourke
1a536124ad Drop root for Magnum
This change ensures commands run in the magnum containers are done as the
'magnum' user rather than root.

Change-Id: I18e2febae98aae6d6fc6c61cc2817442f408cb75
Partially-Implements: blueprint drop-root
2015-11-17 18:02:18 +00:00
Paul Bourke
9f6106c8f5 Remove old config-external.sh scripts for magnum
These are no longer used.

Trivial-Fix

Change-Id: Ia4dced3b8ac8512097f5cafbb1b06661c6f3eb88
2015-11-17 17:39:25 +00:00
Paul Bourke
1d0b8afa8b Use pip upper-constraints in magnum-base
Change-Id: Ibb5636d897c2b9177c54dfc13f6193e00107776b
Closes-Bug: #1517144
2015-11-17 17:13:15 +00:00
Michal Rostecki
2cd5d9ed74 Add Ansible support for Magnum
Change-Id: Idb25ac4d3148c9b9400cf675ac2e47d35cce6224
Implements: blueprint ansible-magnum
2015-11-13 11:31:34 +01:00
Sam Yaple
5f200e0446 Fix issue with su and bad kernels
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-13 15:13:55 +00:00
Sam Yaple
94162bd08f Bring Kolla inline with FHS
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-06 03:30:53 +00: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
Jenkins
6a622ec82c Merge "Implement a install_type and install_metatype" 2015-09-28 10:49:53 +00:00
Jenkins
aadbbcbee0 Merge "remove set_configs" 2015-09-28 10:34:58 +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
160f1cc011 remove set_configs
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279
Partially-Implements: blueprint replace-config-external
2015-09-27 13:44:50 +00:00
Sam Yaple
39aba34b2a Remove all fail sections for Ubuntu
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-27 08:10:59 +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
Jenkins
91bc4b094c Merge "Allow arbitrary source archive name to be imported into Dockerfile" 2015-09-04 06:24:28 +00:00
Vladislav Belogrudov
c22cf33268 Allow arbitrary source archive name to be imported into Dockerfile
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-03 16:49:50 +03:00
Sam Yaple
9d3f3f28e2 Create openstack-base container
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-09-03 10:37:45 +00:00
Sam Yaple
45f625a73e Remove dest_filename from build.ini
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-31 04:09:59 +00: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
Sam Yaple
13062e23e8 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
2015-05-15 01:32:22 -05:00
Steven Dake
5a06901664 Add Magnum Containers as a Service to Kolla
This adds Magnum Containers as a Service to Kolla.

Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24
Implements-blueprint: container-magnum
2015-05-11 09:26:02 -07:00