Commit Graph

1653 Commits

Author SHA1 Message Date
Jenkins
9f8347a87a Merge "Make heka container build with debian" 2016-06-04 13:39:04 +00:00
Jenkins
c69311b792 Merge "Make nova-libvirt container build with debian" 2016-06-04 13:37:55 +00:00
Benedikt Trefzer
10f2b59cf0 make rabbitmq container build with debian
- use rabbitmq official package since debian
    does not offer required version
  - force-depend since we do not install logrotate

Change-Id: I0818a6807210eb861aab5ef36d1f807a0ce435b2
Partially-implements: blueprint build-debian
2016-06-04 10:17:08 +02:00
Benedikt Trefzer
547a7cf967 Make nova-libvirt container build with debian
- handle different xen-utils version in debian/ubuntu
- add rm -f to ignore nonexistent file in debian
- add variable for libvirt group since different in debian

Partially-implements: blueprint build-debian

Change-Id: I44c55981819294286d163b5391aefe967b6dd1d9
2016-06-04 10:16:20 +02:00
Benedikt Trefzer
4ca6e982c7 Make heka container build with debian
Change-Id: I911a684e1269076f9466fe0b6511c0b72dd80833
Partially-implements: blueprint build-debian
2016-06-04 10:11:58 +02:00
Jenkins
31089795da Merge "Make swift-base container build with debian" 2016-06-04 05:07:56 +00:00
Benedikt Trefzer
ccca2e5a98 Make swift-base container build with debian
- add debian as base_system

Change-Id: I1d0f1e5de819e8325243fa0b971c1eb7b83fb5b5
Partially-implements: blueprint build-debian
2016-06-04 03:44:56 +00:00
Benedikt Trefzer
5df0903cfa Make container kolla-toolbox build with debian
- handle different path for os_client_config

Change-Id: I1134a932845ee22e8318c14ec02f0478eee11b9a
Partially-implements: blueprint build-debian
2016-06-04 03:44:23 +00:00
Jenkins
cb1e665a8a Merge "Use --subproject instead of deprecated --service option" 2016-06-03 20:07:33 +00:00
Jenkins
eaf605c64c Merge "Install keepalived in neutron_l3_agent container" 2016-06-03 19:54:56 +00:00
Jenkins
ad71352a93 Merge "Use debian repos for debian base docker image" 2016-06-03 17:59:36 +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
Benedikt Trefzer
30c805596f Use debian repos for debian base docker image
Change-Id: Ic5c1d20fa9f7f1cd9fd20e658b4bd1abb235f3b6
Partially-implements: blueprint build-debian
2016-06-03 00:32:05 +02:00
Benedikt Trefzer
80d2edbd8e add curlrc file to base image
The curlrc file for root allows better output control for
curl downloads during build process.

Closes-Bug: #1567926

Change-Id: I19b526e4eab223d2456f4bbc2f4ba50192ec0901
2016-06-02 18:20:48 +02:00
Jenkins
40cd7550dd Merge "Add sahara containers" 2016-06-01 05:16:17 +00:00
Jenkins
2bed574032 Merge "Pin the base distro release version" 2016-06-01 05:13:10 +00:00
Jenkins
1c3f160837 Merge "Install missing package in spiceproxy container" 2016-06-01 03:16:33 +00:00
Jenkins
b6a0f98346 Merge "Set ServerTokens parameter to 'Prod' for Ubuntu Apache config" 2016-05-31 14:54:56 +00:00
Jenkins
ca6cf5bfd1 Merge "Log the traceback in the kolla libraries" 2016-05-31 13:59:33 +00:00
Chris Ricker
d47f6bc90c Install missing package in spiceproxy container
nova-spicehtml5proxy service fails on RPM-based systems unless the
spice-html5 RPM is also installed.

Change-Id: I0807159cd68bcc9df4da2d94d7b54a2871236f59
Closes-Bug: #1587212
2016-05-30 22:35:58 -04:00
Jeffrey Zhang
4044a3475e Pin the base distro release version
Pin the base distro release version in the master branch(Newton).
Only one distro version is supported. The supported versions are:

* CentOS: 7
* RedHat: 7
* OracleLinux: 7
* Debian: 8
* Ubuntu: 14.04

NOTE: Kolla will move to Ubuntu 16.04 in the Newton cycle

DocImpact
TrivialFix

Change-Id: I32c0edbee4de14c8a0cc7c961d566e84d70f19a4
2016-05-31 01:41:48 +00:00
Jeffrey Zhang
476da0f43a Log the traceback in the kolla libraries
The traceback is logged also and will be helpful when the
library failed. We can get which line is failed from the log.

TrivialFix

Change-Id: Ia417232007e2f34c83d2e7cad6ed08dee49ce836
2016-05-31 01:40:55 +00: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
Jenkins
4db24f4900 Merge "Add support for murano binary containers for rpm based distros" 2016-05-27 21:21:16 +00:00
Jenkins
162fa25829 Merge "Run HAProxy in a chroot jail" 2016-05-27 21:19:46 +00:00
Jenkins
cd4602819c Merge "Add support for magnum ubuntu binary containers" 2016-05-27 21:17:43 +00:00
Jenkins
c518baafd1 Merge "Add ubuntu binary container for zaqar" 2016-05-27 18:09:08 +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
Christian Berendt
d1b170dfd8 Set ServerTokens parameter to 'Prod' for Ubuntu Apache config
The default value of the ServerTokens parameter is OS by default when
using Ubuntu as base image. This results in "Server: Apache/2.4.7 (Ubuntu)"
as server signature. Setting the parameter to "Prod" produces a less
verbose server signature.

Change-Id: I9a1422890cc667423bde73ea2dd7be143eb8b04a
Partial-bug: #1586112
2016-05-26 20:10:17 +02: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)
353d077e14 Add sahara containers
Added sahara container for
centos,ubuntu
binary,source

partially-implements blueprint sahara-container

Change-Id: Id6dad447cd6ec07286e7a6cab0b13a6d4d89c1a7
2016-05-26 16:52:07 +05:30
Jenkins
383730443c Merge "Update ubuntu dockerfiles for formatting" 2016-05-26 11:13:10 +00:00
Jenkins
6148a303ee Merge "Update the horizon dockerfile for formatting" 2016-05-26 11:13:05 +00: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)
9774ca92f8 Add support for murano binary containers for rpm based distros
Change-Id: I0b916d238f28fe1b536abfb01228b24dbabe8b91
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582537
2016-05-25 12:26:39 +00:00
Swapnil Kulkarni (coolsvap)
3c3b0b8918 Add ubuntu binary container for zaqar
Change-Id: Ifd47209e3fd753cc81795c131ec3ef060e0af209
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582553
2016-05-25 12:25:52 +00:00
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
Jenkins
6d047e5c31 Merge "Compile the messages in the horizon" 2016-05-23 16:41:44 +00:00
Jenkins
931158b50f Merge "Fix build for oraclelinux base" 2016-05-23 11:22:00 +00:00
Jeffrey Zhang
669d735ae8 Compile the messages in the horizon
Change-Id: Ic5d4a3dbd5efcd1337bafae0e2b0bf67d90cd1e5
Closes-Bug: #1574008
2016-05-23 04:38:50 +00:00
Swapnil Kulkarni (coolsvap)
f93739fa4f Update the horizon dockerfile for formatting
Change-Id: Iacea37d84a57d1543f6332a8b600d431dc2c6270
Partial-Bug:#1569417
2016-05-18 22:01:52 +05:30
Jenkins
8bf2017bb9 Merge "Make Heka collect Ceph logs" 2016-05-17 19:20:54 +00:00
Paul Bourke
d958e24c3d Fix build for oraclelinux base
centos-release-openstack-mitaka 1.3 is now available via the
delorean-mitaka-testing repo. We need to install this directly instead
of the 1.2 version as otherwise the subsequent 'yum update' tries to
install it and fails on the centos-release dependency which is
incompatible with the oraclelinux base.

Closes-Bug: 1576238

Change-Id: I51cb372424b27b32e95f9e81c5dddbe8e49a6131
2016-05-16 09:18:32 +00:00
Jenkins
0977601ea5 Merge "Revert "Install master's version of an RDO keystone"" 2016-05-12 12:22:29 +00:00
Jenkins
e2a7accaab Merge "Use updated wsgi file for Keystone 9.0.0 release" 2016-05-11 10:37:48 +00:00
Steven Dake
2a12fbf588 Revert "Install master's version of an RDO keystone"
This was a temporary workaround because RDO didn't update to
keystone bootstrap command operations.

This reverts commit c5f27aa8a6.

Closes-Bug: #1573102

Change-Id: Ic6db97cf15d6f96c8e660aa15f089c1f10d6dfa7
2016-05-09 07:29:54 +00:00
Jeffrey Zhang
070bf25835 Support a custom base image
Add a new option(base-image) to support custom base image
In default, the base-image is equal to base. When using custom
image, please use command line like:

    ./tool/build.py --base-image my-image --base centos --base-tag 0.1

DocImpact

Closes-Bug: #1573544
Change-Id: If4b9c57a2b68f6f06d3e981f30b2173064e02193
2016-05-09 07:29:19 +00:00
Michal Rostecki
a5c1aa0b81 Run HAProxy in a chroot jail
It's impossible to drop root for the HAProxy container.
But HAProxy provides a possibility to use a chroot jail.

When attaching to the HAProxy container, we see that
the root directory is changed:

    $ sudo docker exec -ti haproxy bash
    (haproxy)[root@operator /]# ls -di /
    259 /

Co-Authored-By: Vikram Hosakote <vhosakot@cisco.com>

Closes-Bug: #1552289

Change-Id: I9d55e9b741b8560cac53dc8b837a24a3029a4dc0
2016-05-06 10:23:49 +02:00
Mauricio Lima
1a2fe93a95 Make Heka collect Ceph logs
Change-Id: Ibaa5f8ba600afafa111d2ef204ee9192b8babdfc
Closes-Bug: #1570529
2016-05-05 13:26:44 -04:00
Davanum Srinivas
fa88ce2e4c Cleanup Mesos/Marathon related work
We got rid of the kolla-mesos repo:
http://git.openstack.org/cgit/openstack/kolla-mesos/tree/README.rst

So we don't need things in the main kolla tree
related to Mesos/Marathon

Closes-Bug: #1577951
Change-Id: Iafae63914c8a6601dc1b5b04231af8a1d2cc8642
2016-05-03 21:39:57 +00:00