summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
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
2016-04-21Update chronos dockerfile for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: I690e1ae8c199be3f6ff86f56ebd9498843414a70 Partial-Bug:#1569417
2016-04-21Update zookeeper dockerfile for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: Ic75140f89ad193479416036743e7c9330298a18d Partial-Bug:#1569417
2016-04-21Fix failure to deploy with qemu.confSteven Dake1-1/+0
Closes-Bug: #1572819 Change-Id: I1f2edb482af1e85708159a0dba44a79427dc5af3
2016-04-21Merge "Add Mistral Binary Containers"Jenkins4-0/+41
2016-04-19Merge "Update Nova dockerfiles for formatting"Jenkins7-7/+14
2016-04-17Add missing extend_start files for ceilometer containerHui Kang5-2/+22
Change-Id: I927c0593fc6b669d760b3744a5e77c532a164ca5 closes-Bug: #1571274 Partially-Implements: blueprint ansible-ceilometer
2016-04-15Update base dockerfile for formattingSwapnil Kulkarni (coolsvap)1-17/+21
Change-Id: I3ff33a5f4e0359eefd997e8c0a2305d815c52486 Partial-Bug:#1569417
2016-04-14Merge "Drop root for swift"Jenkins9-0/+70
2016-04-14Merge "Use proper CentOS repositories for ceph and qemu"Jenkins3-39/+34
2016-04-14Merge "Fix missing libvirt python module in ceilometer-compute"Jenkins1-1/+18
2016-04-14Use proper CentOS repositories for ceph and qemuSteven Dake3-39/+34
CentOS has a virtualization sig and storage sig which produces udpated ceph and qemu images. These images are then reused within the rest of Red Hat packaging. Install these repositories for CentOS and make use of them. This should work for OracleLinux as well. Still testing centos. Co-Authored-By: Vikram Hosakote <vhosakot@cisco.com> Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Iea21fc4f33bbfdb973cf354d492c372bd3360acb Closes-Bug: #1566588
2016-04-13Merge "Fixes kolla_toolbox failure due to missing pytz module"Jenkins1-0/+1
2016-04-13Add Mistral Binary ContainersSwapnil Kulkarni (coolsvap)4-0/+41
Added mistral binary containers for rpm based distros. Change-Id: Ic2de5ee191a4ed3e2ef3083fb4bb480096e9463f Partially-implements: bp add-mistral-binary
2016-04-13Fixes kolla_toolbox failure due to missing pytz moduleSerguei Bezverkhi1-0/+1
kolla_toolbox contantly fails to build due to a missing module pytz, add it before the dependent module installation. Change-Id: Ia497f4eef830259e8e27307d6b3100dc7660b99f Closes-Bug: #1569633
2016-04-13Update haproxy dockerfile for formattingSwapnil Kulkarni (coolsvap)1-2/+4
Change-Id: I49231ddf2d8e6136e8a627cdf5674301018f984a Partial-Bug:#1569417
2016-04-13Update Nova dockerfiles for formattingSwapnil Kulkarni (coolsvap)7-7/+14
Change-Id: Ie3731732f2026cd0d3a1bda2925be2b6479ae5c7 Partial-Bug:#1569417
2016-04-13Merge "Update Mongodb dockerfile for formatting"Jenkins1-1/+2
2016-04-13Merge "Update Neutron dockerfiles for formatting"Jenkins2-3/+3
2016-04-13Merge "Update tgtd & iscsid dockerfiles for formatting"Jenkins2-2/+2
2016-04-13Merge "Update Cinder dockerfiles for formatting"Jenkins3-3/+5
2016-04-13Merge "Update Zaqar dockerfile for formatting"Jenkins1-1/+2
2016-04-13Merge "Update Trove dockerfiles for formatting"Jenkins4-4/+8
2016-04-13Merge "Update Memcached dockerfile for formatting"Jenkins1-2/+4
2016-04-13Merge "Update Swift dockerfiles for formatting"Jenkins6-7/+14
2016-04-13Merge "Update OpenVSwitch dockerfile for formatting"Jenkins1-1/+2
2016-04-13Merge "Update Aodh dockerfiles for formatting"Jenkins5-5/+10
2016-04-13Merge "Update Ceilometer dockerfiles for formatting"Jenkins5-5/+9