51 Commits

Author SHA1 Message Date
Jenkins
ba32530fac Merge "Add header blocks to all Dockerfiles" 2016-09-14 05:16:11 +00:00
Michal (inc0) Jastrzebski
3eff4bc0d1 Allow customizations of pip packages
Customizations of packages for source builds

Closes-Bug: #1623083
Change-Id: I99263af53c8f9830bcf0c6fec78194c8f7cd88c5
2016-09-13 16:54:30 +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
Paul Bourke
7bba25a160 Allow operators to override use of get-pip.py
Operators may not want to run get-pip.py from an external source.

TrivialFix

Change-Id: I591b0cef135f9e1e3054c48c93a17b7b74fd0a9a
2016-08-31 17:06:20 +01:00
Paul Bourke
9f5efc5ea6 Import the Murano core libary as part of setup
In order for Murano to be operational the core library package must be
imported [0]

Add Ansible tasks to do this idempotently.

[0] http://docs.openstack.org/developer/murano/install/manual.html

TrivialFix

Change-Id: I2c49e9d663595650b885267839012b543505337a
2016-08-25 16:42:09 +01:00
Jenkins
e1e28f7505 Merge "Remove Kazoo dependency and Kolla Zookeeper helper" 2016-08-23 10:57:30 +00:00
Szymon Konefal
e0a9347ebc Remove Kazoo dependency and Kolla Zookeeper helper
Related-Bug: #1577194

Change-Id: Idad2a78d3b4251a321c1a05b435bff4625d5fe56
2016-08-19 17:07:19 +02: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
Larry Rensing
4218a3bb5b Add support for building vmtp container
Add needed library packages and Dockerfile to build vmtp container.

Co-Authored-By: Larry Rensing <lr699s@att.com>
Partially implements: bp vmtp-container

Change-Id: I54340947f3bdf61d3e4f54884fed90ac318124ff
2016-08-16 15:46:46 +00:00
Shaun Smekel
9b265dd112 Customizations for OpenStack Base
This patchset contains customization of Dockerfile of the
OpenStack Base container.

Change-Id: I20ce24a296ace45169131463c992f6f0e9b4d131
Partially-implements: blueprint third-party-plugin-support
2016-08-12 07:44:48 +10:00
Swapnil Kulkarni (coolsvap)
aa9245f29f Remove deprecated package python-tuskarclient
TrivialFix

Change-Id: I4477b1e9681a34a85baf30e94c63f05e0d24ab7a
2016-06-22 08:27:11 +05:30
Swapnil Kulkarni (coolsvap)
435b21b90d Update ubuntu dockerfiles for formatting
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug: #1569417
2016-05-26 04:09:22 +00:00
Stephane Boisvert
a933ceb39a
Add python-memcache package openstack base
Adding python-memcache package to openstack-base ubuntu docker images.

Closes-Bug: #1577422

Change-Id: I5112c0ba3234a0b3cfc7677f9fbb7c152ab64917
2016-05-02 16:55:49 -04:00
Ryan Hallisey
a8f3da204e Improve openstack-base image for centos binary
TrivialFix
Closes-bug: #1560170
Change-Id: Ia3a9756c58f0ead3b20e435f1d1546408f4a8b36
2016-03-21 10:04:35 -04:00
SamYaple
0da25415f8 Increase usefulness of openstack-base
Just like last cycle, I ran all of the requirements and found the
packages that were installed >=10 times throughout our containers. By
combining them in the openstack-base we reduce the size of the images
by ~600MB (10%) and decrease build time by a measurable amount (5-10m
in the case of Centos)

TrivialFix
Change-Id: I582d75644a8e8b936c6f9fc10c6b5821e1e8c5c4
2016-03-19 17:41:11 +00:00
Steven Dake
0d273e077d mariadb-devel is deprecated
mariadb 10 uses the packaging convention MariaDB-* to not
conflict with mariadb 5.  As such, MariaDB-devel was indicating
a deprecation warning which this patch removes.

TrivialFix

Change-Id: I4b51fcedce3ef9e44c4a6830cd38ca8040a4d3f6
2016-03-09 00:44:50 -05:00
Jeffrey Zhang
937c771ec8 Fix building centos kolla-toolbox
Percona recently updated their package which is now conflicting with
mariadb-libs.

Closes-Bug: #1548589

Change-Id: I9db7ffb8b94b623784cffa3e63804c47375097d1
2016-02-23 02:54:00 +00:00
Allen Gao
98a0b755eb Install python-dogpile-cache for python-ironicclient
Change-Id: I4f41d05be1dc01b00e794b872e7f79d5bee48a21
Closes-Bug: #1546024
2016-02-16 19:14:06 +08:00
Jenkins
6267192c4b Merge "Safely create directories" 2016-02-10 18:41:15 +00:00
Martin André
e6571c0203 Safely create directories
This prevents failure when the directory already exists.

This commit fixes a failure in centos-binary because of a change in the
RDO packaging, where the required directory is now created for us.

Change-Id: Idd3e15802c3e3fd363e1295111ec12948d566781
Closes-Bug: #1543417
2016-02-10 08:25:23 +09:00
Hui Kang
bed9ed97a4 Remove unnecessary patch for oslo.log
Ubuntu binary package includes the fix

TrivialFix

Change-Id: Iaeff250e75565b1f447d97acfffc1b1a3a76c250
2016-02-09 02:35:43 -05:00
Jenkins
6846b3eaec Merge "Install keystonemiddleware for source build swift proxy server" 2016-01-25 20:44:56 +00:00
Qiu Yu
28de849165 Install keystonemiddleware for source build swift proxy server
Swift doesn't have hard dependency on keystone authentication. Hence
keystonemiddleware is not listed in Keystone's requirements.txt. For
Kolla setup, since keystone is by default enabled, ensure
keystonemiddleware is correctly installed in proxy server Dockerfile.

Change-Id: Ie49433772d7ebe13b984dc0eb93840e6ca54a91a
Closes-Bug: #1537407
2016-01-26 03:42:22 +08:00
Allen Gao
b18f47c7de Revert "Pin the pip version to 7.1.2"
This reverts commit 14dfbc13a25b43850be15933ca79a7d701b91bac.
This issue has already been fixed after pip 8.0.1 released.

TrivialFix

Change-Id: Ie559286beac56aa5ac35addd647c1d342ba6562b
2016-01-25 17:29:07 +08:00
Jeffrey Zhang
14dfbc13a2 Pin the pip version to 7.1.2
latest pip 8.0 can not override the system installed package

Closes-Bug: #1536023
Change-Id: Ida07fc9e2e8aaffb3caaffce75ec4cbf8a4994e8
2016-01-20 20:43:06 +08:00
Martin André
92f4e5a04f Remove MariaDB-shared in openstack-base
After we switched to PyMySQL in openstack-base, there is no need to
compile MySQL-python thus to install MariaDB-shared package as
a workaround for busted percona packages.

TrivialFix
Related-Bug: #1526129

Change-Id: I93b4bee9d42427b493dac3a0039e0b1a9cac9f71
2016-01-05 09:49:17 +09:00
Jenkins
19e75e8e71 Merge "Base and openstack-base ubuntu binary containers." 2015-12-30 08:45:20 +00:00
Artur Zarzycki
918cd10bb0 Base and openstack-base ubuntu binary containers.
Change-Id: I93d7f4227f6b4ac04e1af5afd5e46bdbaba84b4f
Partially-Implements: blueprint binary-ubuntu
2015-12-30 00:11:42 +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
SamYaple
026942e9c5 Convert to pymysql
Closes-Bug: #1528432
Change-Id: I6e56f283521b29678964cb655ac3cff2d13b8246
2015-12-22 04:30:32 +00:00
Martin André
b5878b2449 Fix MySQL-python build on Centos
The build of MySQL-python started to fail after the update to
Percona-Server-devel-56-5.6.27-rel76.0.el7.x86_64 with:

  /usr/bin/ld: cannot find -lmysqlclient

It appears Percona-Server-devel package provides a broken
/usr/lib64/libmysqlclient.so that points to nonexistent
libmysqlclient.so.18.

Fix the build by installing MariaDB-shared package from the mariadb
repo that contains the missing file.

Change-Id: Ia95fddfe44f54bd355c6f3d0ac895fdc05cecff9
Closes-Bug: #1526129
2015-12-15 17:35:48 +09:00
Michal Rostecki
dab8cae9b2 Add Python 3.x support in set_configs.py
Change-Id: I348c69e5411135da8434e9278a48a5777ff2a72d
Partially-Implements: blueprint python3
2015-12-07 09:41:31 +01:00
Angus Salkeld
27c0ae0624 Add support for copying files from a "zk://" source
Co-Authored-By: Michal Rostecki <mrostecki@mirantis.com>
Implements: blueprint zookeeper

Change-Id: I176f063d3802716846b921e210c1569d28bd90d8
2015-12-02 10:25:43 +01: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
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
Steven Dake
87c5b6b86b Install keystoneauthv1 in openstack-base image
Lots of tools rqeuire keystoneeauthv1 not just horizon

TrivialFix

Change-Id: I35eb958e35500b04657679371019f2e6f3c2f2dd
2015-11-11 13:49:54 -07:00
Martin André
2405110f3d Remove mysql-devel cruft
This was conflicting with Percona-Server-devel-55 and broke centos
source build for openstack-base image.

Backport: Liberty
Change-Id: Ia2bb2106038e8e2eadb6668f4ae1ad1d95710c09
Closes-Bug: #1513711
2015-11-06 15:07:55 +09:00
Sam Yaple
2e07be310a Download, install, and enable rabbitmq_cluster
Change-Id: I84d7587fca64dc8a9f05e326a27511ded79e902d
Partially-Implements: blueprint rabbitmq-clusterer
2015-11-03 04:51:45 +00:00
Jenkins
12ddac000c Merge "Use memcache for consoleauth and horizon" 2015-10-15 15:01:02 +00:00
Paul Bourke
72a8f5aabd Use openstack/requirements for repeatable builds
Add this repo to the openstack-base image, and use the upper-constraints
to install the client packages. Will follow up with dependant patches
for the child images to reduce the risk of breaking everything at once.

--

Background:

Many dependencies in the requirements.txt of OpenStack components have
quite loose version requirements, in many cases they will just specify a
minimum version (e.g. WebOb>=1.2.3).

The result of this is that given a Kolla image for Keystone built today,
another build of the exact same ref of Keystone could be broken
tomorrow, due to it picking up a later unsupported dependency.

The https://github.com/openstack/requirements repo exists to bring some
sanity to this situation. (It also outlines other problems it solves in
it's readme).

We also may like to checkout the stable/liberty branch of this project
in our liberty branch, once it appears.

Change-Id: Iccb4e99f8e4b6659a19c1817d0f4c697824af25c
Partial-Bug: #1505306
2015-10-15 12:07:48 +01:00
Sam Yaple
2ea87ebdb7 Use memcache for consoleauth and horizon
Unfortunately there was no was to avoid memcache for consoleauth, so
we might as well take advantage of it for Horizon as well.

Change-Id: Idd338a025b031f6b50fe0c9f03c2c8d862f9d4c0
Closes-Bug: #1504606
Closes-Bug: #1504800
2015-10-15 10:47:21 +00:00
Martin André
e9ed7ca403 Remove obsolete backport for oslo.log
The patch was merged upstream. Remove it from kolla tree since it
doesn't apply cleanly anymore and break openstack-base image building.

backport: liberty

Change-Id: Ia82aa10860d24d696a172ec6596076c9b6b2d0a5
Closes-Bug: #1505456
2015-10-13 09:52:45 +09:00
Steven Dake
fbb1842fc8 Enable source for openstack-base for RPM distros
Make openstack-base optimized for from source builds for RPM based
distributions.

backport: liberty

Change-Id: I5f1056ebc09fd55cd5d46da7a09331e38940d888
Implements: blueprint openstack-common-container
2015-10-06 22:59:50 -07:00
Steven Dake
571c5bc878 Make a openstack-common container for CentOS variants
Only implements CentOS (RPM family) binary in openstack-common.

Change-Id: I5249d0ffaf4c0c946ee2347d5519391ded160cea
Partially Implments: blueprint openstack-common-container
2015-09-29 03:45:38 -07:00
Steven Dake
00151b2310 Make oslo.log work correctly on RDO platforms
RDO has backported the oslo.log fix but Ubuntu from source does not have
the proper version of oslo.log with the error correction for syslog.

Change-Id: If91200397e02cf5b696d34d9aa4d6980fbba36c6
Partially-Implements: bp logging-container
2015-09-28 23:43:32 -07:00
Steven Dake
f422733a0b Make oslo.log work properly with syslog
The syslog support in oslo.log is broken.  This patch makes oslo.log
work properly by using a backported patch from master.

Change-Id: Idb7b38e3cecbfd6547dad148f22f13a4c8557c8f
Implements: bp logging-container
2015-09-28 13:15:43 -07: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
Martin André
6360ccab60 Upgrade packages when installing openstack-clients
This resolves the package versions conflicts we saw recently and fixes
source image building gate.

Change-Id: I489499e447ac1b7bb82ae9d69eb5b7fe7bd7591d
Closes-Bug: #1498303
2015-09-26 15:06:29 +09:00
Sam Yaple
c86e66c9dc Ceph Ansible support
Add the initial playbooks for making ceph and ansible play nice
together.

This does not include all of the openstack changes to make things like
nova, glance, and cinder work. This will simply build the ceph cluster
and thats it. The next patchset will do the OpenStack integration.

DocImpact
Change-Id: Ie1697dde5f92e833652933a80f0004f31b641330
Partially-Implements: blueprint ceph-container
2015-09-24 12:33:43 +00:00
Sean Mooney
a242b51bbc Regression: git is required to build from source on ubuntu
- this change fixes a regression of bug/1481560
- this change re-adds git to the openstack base image
  when building images from source on ubuntu.
- removed explicit git install from kolla-ansible

Closes-Bug: #1496561
Change-Id: Ia8a125e40bc6510af6d44c5317647be7ce27b0d6
2015-09-17 07:58:28 +01:00