1632 Commits

Author SHA1 Message Date
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
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
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
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 c5f27aa8a69cffd4393ad56dbee1acd7ed5ba4bf.

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
Qiu Yu
0a53d16b17 Use updated wsgi file for Keystone 9.0.0 release
httpd/keystone.py is already deprecated in Keystone upstream[1] post
9.0.0 release. This change swiches to use keystone-wsgi-admin and
keystone-wsgi-public to match the upstream change.

[1] 70a42e7a82

Change-Id: Iac3bb7309fc88c3e62bb2e92a3272545cbf9a778
Closes-Bug: #1579275
2016-05-03 12:51:21 -07:00
Jenkins
e522064f3f Merge "Add python-memcache package openstack base" 2016-05-03 10:18:50 +00:00
Jenkins
6fa8261a5c Merge "Remove unecessary blank lines" 2016-05-03 02:53:00 +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
Steven Dake
025d57f820 Remove dependencies on kazoo and friends
Since kolla-mesos has been retired, there is no need in the code
base to keep the zookeeper implementation.  As a result, just remove
it.  If we were to keep it we need virtualenvs for that part of the
code base which installs the python dependencies related to it
for from-binary installs.

This just simplifies the implementation tremendously and culls dead
code.

Change-Id: Ieda226e652d67f5b5667112f4f2556f3171366d3
Closes-Bug: #1577194
2016-05-02 06:12:50 -07:00
Mauricio Lima
2c34214388 Remove unecessary blank lines
TrivialFix

Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
2016-05-02 07:44:29 -04:00
Jenkins
0ffda5e142 Merge "Update base dockerfile for formatting" 2016-04-26 22:45:01 +00:00
Jenkins
d421365657 Merge "Update designate dockerfile for formatting" 2016-04-26 21:20:38 +00:00
Jenkins
adc81a8137 Merge "Update ceilometer dockerfile for formatting" 2016-04-26 21:20:31 +00:00
Jenkins
5ad8635b6d Merge "Update haproxy dockerfile for formatting" 2016-04-26 16:58:10 +00:00
Michal (inc0) Jastrzebski
22a07075d2 Robustify of rabbitmq upgrade
String parsing for gospel node detection was overly complex and not
robust. Hopefully this will make it better.

Closes-bug: #1573684
Change-Id: I12e869eff274d286d239c4f55cc4b4ddca389bbd
2016-04-22 16:49:00 +00:00
Jenkins
39aec94983 Merge "Update chronos dockerfile for formatting" 2016-04-22 11:22:47 +00:00
Jenkins
bd1d1622be Merge "Update openvswitch dockerfile for formatting" 2016-04-22 11:20:43 +00:00
Jenkins
279e6b2ed4 Merge "Configures swift-rsyncd to use non-default port" 2016-04-22 04:48:24 +00:00
Jenkins
52db885f0d Merge "Add missing extend_start files for ceilometer container" 2016-04-22 01:59:03 +00:00
Swapnil Kulkarni (coolsvap)
2fdd7e4ddd Update designate dockerfile for formatting
Change-Id: I6d87fd19db433023d3d466e21e6dff27d7bf3927
Partial-Bug:#1569417
2016-04-21 17:44:55 +00:00
Serguei Bezverkhi
d553514cb7 Configures swift-rsyncd to use non-default port
This PS configures swift-rsyncd process to use non-default port
from the range above 1024.

Change-Id: I7c37c548a5185a2ffac789383fe012619e401131
Closes-Bug: #1573137
2016-04-21 12:54:30 -04:00
Swapnil Kulkarni (coolsvap)
74601e38bf Update openvswitch dockerfile for formatting
Change-Id: Ia9c8a4d4a24f3a80652b950924917091ba7d16fe
Partial-Bug:#1569417
2016-04-21 17:18:50 +05:30
Swapnil Kulkarni (coolsvap)
db12b0c327 Update ceilometer dockerfile for formatting
Change-Id: I1bb3436d9f702b9680eeb0efc4a648c94dd59cb4
Partial-Bug:#1569417
2016-04-21 17:15:47 +05:30
Swapnil Kulkarni (coolsvap)
ccba149fc2 Update chronos dockerfile for formatting
Change-Id: I690e1ae8c199be3f6ff86f56ebd9498843414a70
Partial-Bug:#1569417
2016-04-21 17:14:19 +05:30
Swapnil Kulkarni (coolsvap)
63c5e77e04 Update zookeeper dockerfile for formatting
Change-Id: Ic75140f89ad193479416036743e7c9330298a18d
Partial-Bug:#1569417
2016-04-21 17:12:45 +05:30