summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-03-02Merge "Updated from global requirements"Jenkins2-4/+4
2017-03-02Merge "Add trove and sahara dashboard ubuntu binary"Jenkins1-1/+3
2017-03-02Merge "Add the fluentd link into README.rst"Jenkins1-0/+2
2017-03-02Defer handling of /var/lib/neutron/kolla to kolla APIMartin André3-13/+0
neutron-metadata-agent image expected the /var/lib/neutron/kolla directory to be present but it was not created as part of the image building. As a result, the extend_start.sh script fails with: stat: cannot stat '/var/lib/neutron/kolla': No such file or directory This commit defers setting the right ownership for files and directories to the kolla config API via a config.json file. Kolla-ansible already mounts the directory as the neutron_metadata_socket named volume and uses kolla API to set the ownership and permissions [1]. [1] https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 Closes-Bug: #1669487 Change-Id: Ib521b0fc69ab6a72295a2fde3309a001bc3063c2
2017-03-02[Fix gate]Update test requirementricolin1-1/+1
Since pbr already landed and the old version of hacking seems not work very well with pbr>=2, we should update it to match global requirement. Partial-Bug: #1668848 Change-Id: Ibd9f0b27f389836142d825798379c70428852846
2017-03-02Updated from global requirementsOpenStack Proposal Bot2-4/+4
Change-Id: Ib5f2e9c54ed4e5c4fbecc9e13f9bb7972a687b8d
2017-03-02Add trove and sahara dashboard ubuntu binaryEduardo Gonzalez1-1/+3
Change-Id: I2b2ef84589ca6cbb0d27934000f9640a8eb202a3 Closes-Bug: #1660092
2017-03-01Add work-dir command-line optionJavier Pena4-5/+25
The working directory was previously generated as a temporary one, but there may be cases when we want to specify a directory, for example if we want to generate the Dockerfiles and then do some parsing on them. Change-Id: Ic332328913924bcb3d0dfa4d473e796050fc14b3
2017-03-01Merge "Code coverage improvement for kolla"Jenkins2-3/+112
2017-03-01Add the fluentd link into README.rstcaoyuan1-0/+2
Change-Id: I833c2cf66fc0816897892846764345d8ea938be8
2017-02-28Merge "Improve kolla image build script for finding parent images"Jenkins1-1/+8
2017-02-26Merge "Fix wording around supported releases in base"Jenkins1-2/+2
2017-02-26Merge "Fix binary ironic-inspector rootwrap configuration"Jenkins3-1/+5
2017-02-26Merge "Remove useless command"Jenkins1-2/+0
2017-02-25Merge "Update pins on shade & os-client-config"Jenkins1-2/+2
2017-02-24Merge "Allow customisation of k8s binary locations"Jenkins2-0/+4
2017-02-24Update pins on shade & os-client-configPaul Bourke1-2/+2
Shade has new functionality we need for sanity checks. This also requires a newer os-client-config. Change-Id: If6d10f2ce90c7fc72353566554352b0310942f30 Partially-Implements: blueprint sanity-check-container
2017-02-24Merge "Add heat-all contaner release note"Jenkins1-0/+5
2017-02-24Merge "Remove heka image"Jenkins21-1284/+0
2017-02-24Remove heka imageJeffrey Zhang21-1284/+0
Heka is removed and replaced by fluentd. Change-Id: I4ed0f61b02bea5dcb02b61a9eb99e3ff3f460682
2017-02-24Merge "Apply neutron database migration"Jenkins1-0/+14
2017-02-24Fix typos in doc_filesyuhui_inspur2-2/+2
Change-Id: I57844e5284a51a0804bc2f14d9ac1f3a7c9bfdf8
2017-02-24Remove useless commandliyingjun1-2/+0
/etc/openstack-dashboard/local_settings.py is deleted in the followup command, the sed is never used. Change-Id: Ife02321a4077544ae13428968c4bfe27eb7a7a48
2017-02-23Improve kolla image build script for finding parent imagesChris Suttles1-1/+8
This change updates the image script to search for the parent image via the Docker 'FROM' tag throughout the Dockerfile. The script previously checked for parent name of an image, assuming that first line of Dockerfile always starts with FROM, but that is not always the case when using custom Dockerfiles. Change-Id: I176d99f4e4896b64435e495526154c8f4c684839 Closes-Bug: #1656206
2017-02-23Merge "Fix 404 to documentation in the Readme"Jenkins1-2/+4
2017-02-23Fix wording around supported releases in basePaul Bourke1-2/+2
Change-Id: Idb5a40f080937c74008caf2650ba82d82ab520c4
2017-02-22Allow full customisation of kube image binariesPaul Bourke6-0/+12
The location of the binaries in these images can be overridden by setting ENV in the header blocks, but if an operator wants to use a different install method all together (e.g. rpm), these blocks will allow that. Also import the macros in kube-base to allow their use in overrides. Change-Id: I3e52e315f0103d8a1c95d4489fa3841900fdff75
2017-02-22Fix binary ironic-inspector rootwrap configurationMark Goddard3-1/+5
When built with the binary install type (at least on CentOS), Ironic inspector fails to start and the container remains in a restarting state. The log file shows that it is failing to execute iptables, and analysis found that this was due to an incorrect rootwrap configuration. The RDO ironic inspector RPM expects Ironic inspector to be run as the ironic-inspector user, however Kolla uses the ironic user. This means that neither of the packaged ironic nor ironic-inspector sudoers configuration files works for us. Kolla currently installs a sudoers file pointing to the rootwrap script in the virtualenv of the source install, but of course this only makes sense for source installs, and should not be installed for binary installs. This change adds a second sudoers file that will work for the binary install type, and installs the correct sudoers file for the install type. Change-Id: I8ecd0b658b8df8f38ddf717fa9443d4dc2896984 Closes-Bug: #1624457
2017-02-21Merge "Fix test_build_rpm_setup failure after changed rpm_setup_config"Jenkins1-0/+1
2017-02-21Merge "Allow for image additions archives (as well as plugins)"Jenkins2-26/+136
2017-02-21Merge "Add helm_repository_install_kubernetes_helm block for helm Dockerfile.j2"Jenkins1-0/+2
2017-02-21Merge "Add header/footer blocks to the kube images"Jenkins6-0/+29
2017-02-21Add header/footer blocks to the kube imagesPaul Bourke6-0/+29
Allow operators to customise these using the usual Kolla mechanisms. Change-Id: I59d5eae43fb12f8301b26f5b693c104fca635762
2017-02-21Merge "Install shellinabox and socat packages in ironic"Jenkins1-4/+12
2017-02-20Merge "Use install-pip macro in most source images"Jenkins60-71/+368
2017-02-20Merge "Install uwsgi in Centos binary"Jenkins1-1/+4
2017-02-20Merge "Using https instead of http"Jenkins1-3/+3
2017-02-20Add helm_repository_install_kubernetes_helm block for helm Dockerfile.j2James McCarthy1-0/+2
Allow overriding of kubernetes-helm to facilitate an alternate location. Change-Id: I630d1e1368ddbbbc795048a73ecc182952da751d
2017-02-20Allow customisation of k8s binary locationsPaul Bourke2-0/+4
Allow operators to customise the location k8s binaries are pulled from in kubernetes-entrypoint & kubetoolbox Change-Id: I8bab3fe7dfb9ac23dcfbfd2c709cfddaaab40534
2017-02-20Merge "Install network-generic-switch in neutron base images"Jenkins1-0/+4
2017-02-20Install shellinabox and socat packages in ironicJeffrey Zhang1-4/+12
These packages are needed by ironic console. Change-Id: Ieff5142935fb55cc9860d6cd4f195da095a01449 Closes-Bug: #1666131
2017-02-20Install network-generic-switch in neutron base imagesJeffrey Zhang1-0/+4
This plugin[0] is used for ironic multi tenant network. [0] https://github.com/openstack/networking-generic-switch Change-Id: I125b850dee86b9107beeb1a788132436331f9843
2017-02-19Install uwsgi in Centos binaryMagnus Lööf1-1/+4
Installs `uwsgi-plugin-python` and dependencies in `barbican-api` image. This will resolve problems bootstrapping barbican-api with binary Centos images which otherwise fail to start due to: ``` Running command: 'uwsgi --master --emperor /etc/barbican/vassals --logto /var/log/kolla/barbican/barbican-api.log' /usr/local/bin/kolla_start: line 24: exec: uwsgi: not found ``` Tested with: ``` docker run --rm -ti --entrypoint=/bin/bash kolla/centos-binary-barbican-api:3.0.3 $ uwsgi *** Starting uWSGI 2.0.14 (64bit) on [Sat Feb 18 09:32:12 2017] *** compiled with version: 4.8.5 20150623 (Red Hat 4.8.5-11) on 13 January 2017 23:06:53 os: Linux-4.9.4-moby #1 SMP Wed Jan 18 17:04:43 UTC 2017 nodename: b9063757e276 machine: x86_64 clock source: unix pcre jit disabled ... ``` Closes-Bug: 1634010 Signed-off-by: Magnus Lööf <magnus.loof@basalt.se> Change-Id: I77613bbeb19d89e6a25e52f24f3275d309ceb032
2017-02-18Merge "Fix some typos"Jenkins1-2/+2
2017-02-18Merge "Add helm_repository_source_install_python_pip block to ↵Jenkins1-0/+2
helm-repository Dockerfile"
2017-02-18Merge "Updated from global requirements"Jenkins1-1/+1
2017-02-18Merge "Update reno for stable/ocata"Jenkins2-0/+7
2017-02-18Using https instead of httpzhuzeyu1-3/+3
The security of https is higher than http. Change-Id: I315831d1281f6e3d226813d52b99485713a5e873
2017-02-18Merge "build: sort list of built/failed images before printing"Jenkins1-2/+2
2017-02-17Updated from global requirementsOpenStack Proposal Bot1-1/+1
Change-Id: Ia0f519032e2d5e6b582e1f6fa56ed67b56c007ff