summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2016-05-30Install missing package in spiceproxy containerChris Ricker1-0/+1
nova-spicehtml5proxy service fails on RPM-based systems unless the spice-html5 RPM is also installed. Change-Id: I0807159cd68bcc9df4da2d94d7b54a2871236f59 Closes-Bug: #1587212
2016-05-31Pin the base distro release versionJeffrey Zhang1-0/+6
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-31Log the traceback in the kolla librariesJeffrey Zhang4-8/+19
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-30Use --subproject instead of deprecated --service optionHenry Gessau1-1/+1
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-27Merge "Add support for murano binary containers for rpm based distros"Jenkins3-8/+21
2016-05-27Merge "Run HAProxy in a chroot jail"Jenkins1-0/+4
2016-05-27Merge "Add support for magnum ubuntu binary containers"Jenkins3-1/+20
2016-05-27Merge "Add ubuntu binary container for zaqar"Jenkins1-0/+7
2016-05-27Adds Neutron LBaaS SupportDaneyon Hansen4-0/+78
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-26Set ServerTokens parameter to 'Prod' for Ubuntu Apache configChristian Berendt1-0/+1
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-26Install correct version of arpingSerguei Bezverkhi1-1/+1
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-26Add sahara containersSwapnil Kulkarni (coolsvap)5-0/+96
Added sahara container for centos,ubuntu binary,source partially-implements blueprint sahara-container Change-Id: Id6dad447cd6ec07286e7a6cab0b13a6d4d89c1a7
2016-05-26Merge "Update ubuntu dockerfiles for formatting"Jenkins89-102/+102
2016-05-26Merge "Update the horizon dockerfile for formatting"Jenkins1-1/+1
2016-05-26Update ubuntu dockerfiles for formattingSwapnil Kulkarni (coolsvap)89-102/+102
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug: #1569417
2016-05-25Add support for murano binary containers for rpm based distrosSwapnil Kulkarni (coolsvap)3-8/+21
Change-Id: I0b916d238f28fe1b536abfb01228b24dbabe8b91 Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug:#1582537
2016-05-25Add ubuntu binary container for zaqarSwapnil Kulkarni (coolsvap)1-0/+7
Change-Id: Ifd47209e3fd753cc81795c131ec3ef060e0af209 Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug:#1582553
2016-05-25Add support for magnum ubuntu binary containersSwapnil Kulkarni (coolsvap)3-1/+20
Change-Id: I5ad90f96aa58a99765feb2a3bc96157a4a61310f Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug:#1582518
2016-05-23Merge "Compile the messages in the horizon"Jenkins1-2/+12
2016-05-23Merge "Fix build for oraclelinux base"Jenkins1-1/+2
2016-05-23Compile the messages in the horizonJeffrey Zhang1-2/+12
Change-Id: Ic5d4a3dbd5efcd1337bafae0e2b0bf67d90cd1e5 Closes-Bug: #1574008
2016-05-18Update the horizon dockerfile for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: Iacea37d84a57d1543f6332a8b600d431dc2c6270 Partial-Bug:#1569417
2016-05-17Merge "Make Heka collect Ceph logs"Jenkins4-0/+25
2016-05-16Fix build for oraclelinux basePaul Bourke1-1/+2
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-12Merge "Revert "Install master's version of an RDO keystone""Jenkins1-3/+1
2016-05-11Merge "Use updated wsgi file for Keystone 9.0.0 release"Jenkins1-2/+2
2016-05-09Revert "Install master's version of an RDO keystone"Steven Dake1-3/+1
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-09Support a custom base imageJeffrey Zhang1-1/+1
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-06Run HAProxy in a chroot jailMichal Rostecki1-0/+4
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-05Make Heka collect Ceph logsMauricio Lima4-0/+25
Change-Id: Ibaa5f8ba600afafa111d2ef204ee9192b8babdfc Closes-Bug: #1570529
2016-05-03Cleanup Mesos/Marathon related workDavanum Srinivas15-227/+0
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-03Use updated wsgi file for Keystone 9.0.0 releaseQiu Yu1-2/+2
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] https://github.com/openstack/keystone/commit/70a42e7a82ddae9be75dba8f063170a1d13ce301 Change-Id: Iac3bb7309fc88c3e62bb2e92a3272545cbf9a778 Closes-Bug: #1579275
2016-05-03Merge "Add python-memcache package openstack base"Jenkins1-0/+1
2016-05-03Merge "Remove unecessary blank lines"Jenkins5-6/+0
2016-05-02Add python-memcache package openstack baseStephane Boisvert1-0/+1
Adding python-memcache package to openstack-base ubuntu docker images. Closes-Bug: #1577422 Change-Id: I5112c0ba3234a0b3cfc7677f9fbb7c152ab64917
2016-05-02Remove dependencies on kazoo and friendsSteven Dake3-81/+2
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-02Remove unecessary blank linesMauricio Lima5-6/+0
TrivialFix Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
2016-04-26Merge "Update base dockerfile for formatting"Jenkins1-17/+21
2016-04-26Merge "Update designate dockerfile for formatting"Jenkins7-9/+12
2016-04-26Merge "Update ceilometer dockerfile for formatting"Jenkins1-1/+1
2016-04-26Merge "Update haproxy dockerfile for formatting"Jenkins1-2/+4
2016-04-22Robustify of rabbitmq upgradeMichal (inc0) Jastrzebski1-16/+7
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-22Merge "Update chronos dockerfile for formatting"Jenkins1-1/+1
2016-04-22Merge "Update openvswitch dockerfile for formatting"Jenkins1-1/+1
2016-04-22Merge "Configures swift-rsyncd to use non-default port"Jenkins3-3/+4
2016-04-22Merge "Add missing extend_start files for ceilometer container"Jenkins5-2/+22
2016-04-21Update designate dockerfile for formattingSwapnil Kulkarni (coolsvap)7-9/+12
Change-Id: I6d87fd19db433023d3d466e21e6dff27d7bf3927 Partial-Bug:#1569417
2016-04-21Configures swift-rsyncd to use non-default portSerguei Bezverkhi3-3/+4
This PS configures swift-rsyncd process to use non-default port from the range above 1024. Change-Id: I7c37c548a5185a2ffac789383fe012619e401131 Closes-Bug: #1573137
2016-04-21Update openvswitch dockerfile for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: Ia9c8a4d4a24f3a80652b950924917091ba7d16fe Partial-Bug:#1569417
2016-04-21Update ceilometer dockerfile for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: I1bb3436d9f702b9680eeb0efc4a648c94dd59cb4 Partial-Bug:#1569417