summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2017-04-06Remove Ubuntu Trove postinst script hackBertrand Lallau2-13/+1
trove-common version 1:7.0.0-0ubuntu1~cloud0 coming from the following repo https://github.com/openstack/kolla/blob/master/docker/base/sources.list.ubuntu#L11 has been fixed. Temporary hack must be removed. Change-Id: I19ce6f0a5d5f0fe0d390fcb05f775f860abd146c
2017-04-06Merge "debian: enable all images enabled for Ubuntu"Jenkins143-187/+192
2017-04-06ironic-pxe: handle non-x86 architecturesMarcin Juszkiewicz1-1/+7
'syslinux' is built only for x86 architectures Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I6fa78fd4e301649acd085b84d71047a207277927
2017-04-06gnocchi-base: add some devel packages for non-x86Marcin Juszkiewicz1-0/+10
On x86_64 pip is fetching precompiled 'scipy' package. On other architectures we need to build it. For that we need some more development packages. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I173f8daf1aa0aeb1683db08c50b79a0c39f9dc64
2017-04-05Add vSphere Supportjimmygc2-5/+28
Add oslo.vmware and vmware_nsx packages into kolla. Change-Id: I2a1ed314b970a4832f7f8256c1929921f36069f2 Implements: blueprint kolla-support-vsphere Co-Authored-By: shaofeng cheng <chengsf@winhong.com>
2017-04-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz143-187/+192
Debian support is not maintained in Kolla so it got a bit behind Ubuntu one. This changeset enables Debian for all images. Jessie (even with backports) may be too old for some images though. Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order like it is done for RPM distributions. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
2017-04-04Merge "Install InfluxDB Plugin in Grafana"Jenkins1-0/+1
2017-04-04Merge "Use separate sudoers for ironic conductor modprobe"Jenkins4-4/+7
2017-04-04Install InfluxDB Plugin in GrafanaSayantani Goswami1-0/+1
InfluxDB plugin is missing in Grafana and is required to be installed to use InfluxDB as a data source in Grafana. Change-Id: I3d2e6eb4394eb9071ffb390235a06ef4e0682b55
2017-04-03Merge "Add None value to service.description attribute"Jenkins1-1/+2
2017-04-03Merge "Rabbitmq: refactor Dockerfile.j2 file"Jenkins1-5/+2
2017-04-03Merge "Optimize the code"Jenkins1-20/+19
2017-04-03Merge "Alphabetize packages"Jenkins38-237/+237
2017-03-31Use separate sudoers for ironic conductor modprobeMark Goddard4-4/+7
The original fix (8b101b28a1040fd6b4753c09364106274d7e6e09) for bug 1676466 added unnecessary entries to the sudoers file in the ironic-base image. These included a rootwrap entry pointing to the virtualenv used by source type images (not present in binary type images) and a modprobe iscsi_tcp which is only required by the ironic-conductor image. This change adds a single sudoers file for the iscsi_tcp modprobe to the ironic-conductor image and reverts to the common pattern of adding a sudoers file to ironic-base only for source type images. Change-Id: I89f1c4bd741de9ba184f14fcbcb708636616e420 Closes-bug: #1678143 Related-bug: #1676466 Related-bug: #1667864
2017-03-30Optimize the codezhuzeyu1-20/+19
Keeping function code together can make the structure clear Change-Id: Ia16b43b902543bc57869579acba2f6b3d5f2ca54
2017-03-29Merge "make yum fail on missing packages"Jenkins1-1/+1
2017-03-29Merge "Make keystone_user module fully shade"Jenkins1-21/+14
2017-03-29kubernetes: disable for architectures other than x86-64Marcin Juszkiewicz1-0/+7
Those images are hardcoded to use amd64 binaries. Partially-Implements: blueprint multiarch-and-arm64-containers Depends-On: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a Change-Id: I477b62e32a940cb93c3747f593504d861ac137bc
2017-03-29make yum fail on missing packagesMarcin Juszkiewicz1-1/+1
By default yum skips missing packages. As a result built images may not contain what we expect them to have (often found on non-x86 architectures). There is an option to make it fail in same way as APT does in Debian world. And this patch makes use of it so broken images just fail: INFO:kolla.image.build.openstack-base:No package Percona-Server-shared-56 available. INFO:kolla.image.build.openstack-base:Error: Not tolerating missing names on install, stopping. INFO:kolla.image.build.openstack-base: INFO:kolla.image.build.openstack-base:Removing intermediate container d5e506330b08 ERROR:kolla.image.build.openstack-base:Error'd with the following message Closes-Bug: #1675401 Change-Id: Ib6b9e6b8cc216ce283cd043fa3600db7c0cc2a98
2017-03-28Alphabetize packagesEduardo Gonzalez38-237/+237
Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-03-28Rabbitmq: refactor Dockerfile.j2 fileBertrand Lallau1-5/+2
install_packages macro is used 3 times instead of 1, we could simplify code. Change-Id: I00311e2aa3db0e53adb32a1adae85c3af2ac40fe
2017-03-28Merge "RHEL: Add mod_ssl for services running over httpd"Jenkins12-31/+74
2017-03-28Merge "Prevent apache from listening on port 80 for heat-base"Jenkins1-3/+9
2017-03-28Merge "Fix source install for vmtp"Jenkins1-2/+6
2017-03-28Merge "Remove gnocchi-carbonara package"Jenkins1-1/+0
2017-03-27Add ironic sudoers file to binary packages as wellDan Prince1-2/+2
When built as binary packages Ironic conductor would fail to start due to a new 'sudo modprobe iscsi_tcp' command added in 05c0d6998bdda155c925d563b75ac353303f93ff Change-Id: I74ebbc2ec612e1068ac82225dc79e9ee0b6c23f4 Closes-bug: #1676466
2017-03-27RHEL: Add mod_ssl for services running over httpdJuan Antonio Osorio Robles12-31/+74
This apache module is necessary for when one wants to use TLS for the services running over httpd. This only addressed RHEL based systems at the moment, since there is no such package available for Ubuntu. This requires apache2.2-common which will carry a lot more dependencies; So I think this should be handled and decided in a separate patch. when installing mod_ssl in RHEL-based distributions, an ssl.conf file is installed in the /etc/httpd/conf.d directory. This file tells httpd to listen on port 443; however, we don't want to do this by default, since this should be explicitly enabled by the container's configuration. This line is thus removed from the configuration. A release note was added, which specifies this. And the last sentence can be removed if this is addressed for debian/ubuntu as well. Related-Bug: #1675490 Co-Authored-By: Martin André <m.andre@redhat.com> Change-Id: Id6215d31547247309d43c031e163fa9e4c4ec5dc
2017-03-27Prevent apache from listening on port 80 for heat-baseMartin André1-3/+9
A recent change added httpd to heat-base image without preventing it to listen to port 80 like it is done for other images. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: I52573c804bfdf729ef994012abb9d7e4c277585d Closes-Bug: #1675308
2017-03-27Remove gnocchi-carbonara packageEduardo Gonzalez1-1/+0
RDO have set carbonara package as obsoleted and is no longer used. https://review.rdoproject.org/r/#/c/4397/ Change-Id: I5f97ee681f09e194e558eda6291e64d83766f8c1 Closes-Bug: #1676389
2017-03-27check mariadb galera status in every loop.huweihua1-0/+1
in extend_start.sh, if Mariadb galera is not ready at first time, it will sleep 60s and then exit 1. we should check it`s status every time in the loop. Change-Id: I89174969687eecbf467ca3cad9aad1bfbfb8c4fe Closes-Bug: #1676316
2017-03-27Merge "Prevent apache from listening on port 80"Jenkins3-7/+21
2017-03-25Merge "Merged multiple ENV into a single layer"Jenkins2-6/+6
2017-03-24Merged multiple ENV into a single layerMohammed Naser2-6/+6
There are multiple ENV calls which create multiple unnecessary layers, this patch merges them into a single layer. Change-Id: Icf40033b03a61abbcdcbf72fe8f8137d1a12d2b5
2017-03-24Fix source install for vmtpPaul Bourke1-2/+6
Install vmtp from source rather than pip for the source install type. Closes-Bug: #1675733 Co-Authored-By: Mark Duggan <mark.duggan@oracle.com> Change-Id: I2d024f6d5561306101b0ccec80a34378697d9282
2017-03-24Merge "ironic-conductor: add missing comma for centos/source build"Jenkins1-1/+1
2017-03-23Merge "Switch trunk/cbs/buildlogs to use https"Jenkins1-1/+1
2017-03-23Merge "Implement Keystone zero-downtime upgrade"Jenkins1-0/+19
2017-03-23Prevent apache from listening on port 80Martin André3-7/+21
A few new images got apache as part of blueprint apache-packages-for-apis without restricting it to listen on port 80. This commit fixes it for all images with the exception of heat-base so that it can be cleanly backported to stable/ocata. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: Idd3bbeffea9233eaed420798e22ea9a3a517c166 Closes-Bug: #1675308
2017-03-23ironic-conductor: add missing comma for centos/source buildMarcin Juszkiewicz1-1/+1
Due to missing comma images built for centos/source lacked dosfstools and util-linux packages. Closes-Bug: #1675414 Change-Id: I2fa284890f038c5dcf18669ed19c123f6850d4a2
2017-03-23Merge "Update to Kubernetes 1.5.4"Jenkins1-1/+1
2017-03-23Merge "Add libosinfo package for source installation"Jenkins1-0/+2
2017-03-23Implement Keystone zero-downtime upgradeDuong Ha-Quang1-0/+19
- Introduce database upgrade into keystone extend_start.sh script. [1] [1] http://docs.openstack.org/developer/keystone/upgrading.html#upgrading-without-downtime Change-Id: Ic615026df2ce8fa79a3efe969d0dda9797c9e79f Closes-Bug: #1634016
2017-03-22Gate fixes: disable bifrost-base, fix ubuntu base imageMohammed Naser1-0/+1
At the moment, Bifrost has caused a few failures which have blocked the gate, the latest of which is documented in the bug listed below (alongside with another one that caused another gate failure). In order to let patches flow though, we're disabling it from the gate build checks as agreed on the Kolla meeting on the 22nd of March 2017. Also, the Ubuntu base image seems to have a missing /etc/protocols which is created by the netbase package. This has been added to the base images. There are issues with subunit getting a very large log all at once which causes failures that is causing issues. We also enable logging to a local folder which will make troubleshooting image builds easier to read and avoid sending a large blob of data to subunit. Change-Id: Iee1f8b06ec1066015ea5c6a6a245723402e35a6a Related-Bug: #1674483 Related-Bug: #1673776 Closes-Bug: #1675101
2017-03-21Switch trunk/cbs/buildlogs to use httpsEmilien Macchi1-1/+1
There is a permanent redirection from http to https in buildlogs, cbs and trunk repos that might create issues when the redirection fails for some reasons. Let's use https directly. Change-Id: I15b2df335b4b9331466da2f7cb6e838823a6fd34
2017-03-21Make keystone_user module fully shadeEduardo Gonzalez1-21/+14
Kolla_keystone_user ansible module was not fully using shade due limitations of Ansible version prior 2.0. This has changed and lower version than 2 are not supported. This change migrate the module to fully make use of shade library. Maintains idempotency and the same features it had. Change-Id: Ic0d21736fa666836b85f50b659c756edc0982fdd
2017-03-18Update to Kubernetes 1.5.4Steven Dake1-1/+1
Change-Id: I77c535a7be54697b160e5d8355159d75b6bc740c
2017-03-18Switch to Kolla virtual environment for BifrostMohammed Naser1-0/+1
By default, the Bifrost Ansible playbooks will naturally run everything against /usr/bin/python which means that some modules, such as Shade when it has to be installed will use the system Python installation. By adding `ansible_python_interpreter` and pointing it towards our Python interpreter, it fixes the failures related to system Python and conflicts related to it (which in this case, resulted in Shade failing to build properly). Closes-Bug: #1673776 Change-Id: I2a5a2a3e2627a313b3306aeb1a910efe0e209496
2017-03-16Add None value to service.description attributeEduardo Gonzalez1-1/+2
When using kolla_keystone_service module, if description attribute is not created(example Keystone). Service update will fail due missing attribute. This change adds a None value to description in order to allow service update when description was not added. Change-Id: I568db4559428525ac6c5083cfc20cffc20be6342
2017-03-16Merge "Load iscsi_tcp module when starting ironic-conductor"Jenkins3-1/+7
2017-03-16Merge "Refactor and enable shell access"Jenkins2-2/+5