aboutsummaryrefslogtreecommitdiff
path: root/kolla/common/config.py
AgeCommit message (Collapse)AuthorFilesLines
2016-06-27Merge "Stop using a global logger for all the things"Jenkins1-0/+1
2016-06-24Merge "Update urls for Delorean repo files"Jenkins1-3/+4
2016-06-24Update urls for Delorean repo filesPaul Bourke1-3/+4
delorean.repo is now redirected from trunk.rdoproject.org to buildlogs.centos.org [0] [0] https://www.redhat.com/archives/rdo-list/2016-June/msg00206.html Closes-Bug: 1595568 Change-Id: I650abc34d9cf0c00f9025bd2c62f1bf03fbd96b7
2016-06-23Merge "Update kollaglue repo on docker to kolla"Jenkins1-1/+1
2016-06-21Add Kuryr Docker containerHui Kang1-1/+4
Co-authored-by: Mohammad Banikazemi <mb@us.ibm.com> Partially-implements: bp kuryr-docker-plugin Change-Id: Ife54f71984ff6c9825769e81fd39e3444c6fe310
2016-06-21Stop using a global logger for all the thingsJoshua Harlow1-0/+1
Instead of using the same logger for all the things which makes it incredibly hard to figure out what the images and there builds are doing; instead have it so that each image gets its own logger which is then used by tasks that process that image. Each images logs now will (optionally) go to a logs directory that can be more easily read and looked over and leaves the main logger for informational/task kind of output only. Closes-Bug: #1586478 Change-Id: I939e073a2bc5ed8b5a1e969888fc743d80f468c9
2016-06-14Implement Rally DockerfileJeffrey Zhang1-0/+4
Partially Implements: blueprint rally-container Change-Id: If8c4fdb51b8083078dddc68598d48c6e139a615a
2016-06-14Update kollaglue repo on docker to kollaSwapnil Kulkarni (coolsvap)1-1/+1
[1] http://lists.openstack.org/pipermail/openstack-dev/2016-June/097227.html Change-Id: I73af59dcf1e755dbe0579486f1fb0ebe5ca0119c Closes-Bug: #1592286
2016-06-07Mechanism for Dockerfile customizationMichal (inc0) Jastrzebski1-0/+2
This patchset enables potentially full customization of Dockerfiles provided by Kolla without having to change main Kolla code. Mechanism is based on jinja2 block mechanism. In our dockerfiles we'll add blocks (mostly empty) with highly standarized naming, then in override file users will be able to fill/override contents of these blocks. Example is shown in this patch. To enable cutomized override file call build.py --template-override=path-to-file Only caveat is that header {% extends .. %} has to stay Change-Id: I5957024e5652f9677c439fb2fcd524e467b951af Partially-implements: blueprint third-party-plugin-support
2016-06-07Remove the deprecated kolla-build sectionJeffrey Zhang1-1/+1
TrivialFix Change-Id: I3ee10efc093ed394c3af483a229dcd9dc732ec9a
2016-06-06Cleanup help string of install_type parameterChristian Berendt1-3/+1
The part "The valid types are: binary, source, rdo, rhos" is already a part of the generated kolla-build configuration file ("# Allowed values: binary, source, rdo, rhos"). TrivialFix Change-Id: I87b913c1b650fe54402ea643fc9c774448850f6b
2016-06-01Merge "Add sahara containers"Jenkins1-0/+4
2016-06-01Merge "Pin the base distro release version"Jenkins1-1/+13
2016-05-31Pin the base distro release versionJeffrey Zhang1-1/+13
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-27Adds Neutron LBaaS SupportDaneyon Hansen1-0/+4
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-26Add sahara containersSwapnil Kulkarni (coolsvap)1-0/+4
Added sahara container for centos,ubuntu binary,source partially-implements blueprint sahara-container Change-Id: Id6dad447cd6ec07286e7a6cab0b13a6d4d89c1a7
2016-05-09Support a custom base imageJeffrey Zhang1-1/+5
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-05Generate image dependencies on CLIJeff Peeler1-0/+4
Using the new --list-dependencies flag, one can query dependencies for a given filter. For example: ./build.py --list-dependencies heat swift {'base': [{'openstack-base': [{'heat-base': ['heat-engine', 'heat-api-cfn', 'heat-api']}, {'swift-base': ['swift-object', 'swift-proxy-server', 'swift-container', 'swift-rsyncd', 'swift-account']}]}]} Also added --list-images to list all available images. Change-Id: I1797e32e32705182a763f53329eeb5c4a361abec Implements: blueprint images-dependency-tree-cli
2016-05-03Cleanup Mesos/Marathon related workDavanum Srinivas1-5/+1
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-04-15Merge "Add iscsid/tgtd specific parameters to Kolla infrastructure"Jenkins1-1/+1
2016-04-12Add iscsid/tgtd specific parameters to Kolla infrastructureSerguei Bezverkhi1-1/+1
This partially implements iscsi and lvm2 support for cinder in Kolla. Add integration with Kolla infrastructure. Change-Id: I5b7d59163518080f38aec0c00617440de0763f1d Implements: blueprint iscsi-lvm2-docker
2016-04-12Add missing base os values to kolla-build.confSwapnil Kulkarni (coolsvap)1-0/+2
Added centos, ubuntu, oraclelinux. Not added other base distros are not well maintained currently. Change-Id: Icb1c12dde2ff005068f1b0f36693049f9ea30f52 Closes-Bug:#1569265
2016-03-22Add PBR generation of version informationSteven Dake1-3/+3
Change-Id: I6391392645d8608a92c885071b26210eed3f5466 Partially-Implements: blueprint add-reno
2016-03-21Split versions onto new lineSamYaple1-5/+10
This makes the process of updating versions _much_ easier and opens the door to a rough automated updater This should merge in master _BEFORE_ mitaka branch TrivialFix Change-Id: I90b974316c5b48fd7a31959de317cb71ae3affec
2016-03-14Merge "Mesos DNS container"Jenkins1-2/+2
2016-03-10Merge "Add cron image and playbook"Jenkins1-3/+3
2016-03-09Add cron image and playbookÉric Lemoine1-3/+3
Add cron image and playbook for logrotate. The "common" Ansible playbook includes configuration files for logrotate. At this point the operator cannot customize/override the logrotate configuration. Closes-Bug: #1553244 Change-Id: Ic9fdda9a273c9ccd90502f0acc7614d2c7157dca
2016-03-09Add local directory or file for source buildSamYaple1-1/+1
This change allows using a local directory or tarball to build from sources by specifying the 'local' type in your kolla-build.conf: [keystone-base] type=local location=/home/martin/src/keystone [neutron-server-plugin-networking-cisco] type=local location=/tmp/networking-cisco.tar.gz Closes-Bug: #1509625 Co-Authored-By: Martin André <m.andre@redhat.com> Change-Id: I3f6f68b0f44efdac653d186d2625591ad7cb3b2a
2016-03-08Mesos DNS containerArtur Zarzycki1-2/+2
Change-Id: I07ce1b0f6a48de2a8290fac75dcf7ef07960aaf5 Implements: blueprint mesos-dns-container
2016-02-28Add timeout to requests.get() in kolla/cmd/build.pyVikram Hosakote1-0/+2
When kolla-build is running, if there are network issues or if the source's location (like http://tarballs.openstack.org) fails to respond due to high number of concurrent requests, kolla-build just hangs/blocks indefinitely. This patch set resolves this issue by adding a timeout of 120 seconds for requests.get() in kolla/cmd/build.py, adds a unit test for it in kolla/tests/test_build.py and also the "timeout" argument in kolla/common/config.py. Change-Id: I7c8745a20b9bd1c3f5d6a55c72a794f16fd7e513 Closes-Bug: #1548614
2016-02-23Remove Rsyslog entirelyÉric Lemoine1-4/+3
Partially implements: blueprint heka Change-Id: I1322d2dc870e6f8fe052926995d993e8a08a25db
2016-02-19Add a Dockerfile for HekaÉric Lemoine1-3/+4
Partially implements: blueprint heka Change-Id: Iafe0dba1333f1f84bc5956890c3b7a0c2a45cef3
2016-02-16Reduce gate resource usageSamYaple1-4/+3
Change-Id: Ic6cd45ec708efe4f573e19f3bc910717ac3b4fbb Partially-Implements: blueprint functional-testing-gate
2016-02-15Merge "Use uppercase 'S' in word "OpenStack""Jenkins1-1/+1
2016-02-15Use uppercase 'S' in word "OpenStack"venkatamahesh1-1/+1
Change-Id: I27ca0ea75f3d6a4371c91b3cb2c7a999ec90fbc4
2016-02-10Remove data docker imageJeffrey Zhang1-2/+2
we have moved to named volume, the old data container should be removed TrivialFix Change-Id: Ib73205de6566509492568381179814baa7af2d22
2016-02-05Merge "Rename kolla_ansible to kolla_toolbox"Jenkins1-3/+3
2016-02-03Ubuntu custom apt reposSamYaple1-1/+3
Change-Id: I3afb8a29c4ae2369f29e0cc94d75ff8a3c42594b Implements: blueprint custom-repos
2016-02-03Fix config help messageAllen Gao1-2/+2
Adding the necessary spaces. TrivialFix Change-Id: I3858ed1cb978bcf8aefd4a85f7c802607876b36e
2016-02-02Rename kolla_ansible to kolla_toolboxSamYaple1-3/+3
This change is needed for clarity. We have a kolla-ansible script. We have a kolla-mesos repo. We plan to have a kolla-ansible repo. Already we have had far too much confusion about whether we are talking about the container or the project. Naming this kolla-toolbox eliminates all of that confusion and its probably a bit more accurate of a name too. Closes-Bug: #1541053 Change-Id: I8fd1f49d5a22b36ede5b10f46b9fe02ddda9007e
2016-01-29Removed unused containers from gate buildSamYaple1-5/+4
TrivialFix Change-Id: I7ccbecddc55b26d252b92faccec94676315c3eec
2016-01-25Bump RDO delorean repositories to current-passed-ci for MitakaDavid Moreau Simard1-1/+1
RDO now has regular and good coverage which leads to tested repository promotion to current-passed-ci. Bumping to current-passed-ci should lead to less errors and instability. Change-Id: Ifb68a26afe0062a27303553b8116a3c739aa33c6
2016-01-20Merge "Add Dockerfiles for Mesos"Jenkins1-2/+6
2016-01-19Add Dockerfiles for MesosMichal Rostecki1-2/+6
Change-Id: Iaf317817eccaa72f2a86b1058a0179afd3427859 Partially-Implements: blueprint mesos
2016-01-19Merge "Expose the docker build_arg to build.py"Jenkins1-0/+2
2016-01-19Merge "Add manila container (source only)"Jenkins1-0/+4
2016-01-18Add manila container (source only)Marc Koderer1-0/+4
Support manila as container. First step only supports building from source. Change-Id: I60bb67536c9afdb9f0532b3cdc2c400a68608003 Partially-Implements: blueprint enable-manila-containers
2016-01-18Expose the docker build_arg to build.pyJeffrey Zhang1-0/+2
With this implement, we can add variables at building stage. For example, add HTTP_PROXY and NO_PROXY when needed like below. build.py --build-args \ HTTP_PROXY:http://127.0.0.1:8080,NO_PROXY:127.0.0.1 More info about build_arg, pls check[0] [0] https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables-build-arg DocImpact Implements: bp add-buildargs Change-Id: I29ed7f536670fef59d697603dc562a69d90743c9
2016-01-16Use dict.items() for adding Python 3 compatibilityting.wang1-1/+1
Replacing dict.iteritems()/.itervalues() with six.iteritems(dict)/six.itervalues(dict) was preferred in the past, but there was a discussion suggesting to avoid six for this. ref: http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Partially implements: blueprint python3 Change-Id: Ie931bc02f558f6db3677b44f645eb3bdf78ccae8
2016-01-09Add trove source url and locationJeffrey Zhang1-0/+3
TrivalFix Change-Id: I70c80d0090c35ffd6e4bf2866510b383d8486220