44 Commits

Author SHA1 Message Date
Jenkins
40cd7550dd Merge "Add sahara containers" 2016-06-01 05:16:17 +00:00
Jenkins
2bed574032 Merge "Pin the base distro release version" 2016-06-01 05:13:10 +00:00
Jeffrey Zhang
4044a3475e Pin the base distro release version
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-31 01:41:48 +00:00
Daneyon Hansen
ba30579b3b Adds Neutron LBaaS Support
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-27 11:41:25 -04:00
Swapnil Kulkarni (coolsvap)
353d077e14 Add sahara containers
Added sahara container for
centos,ubuntu
binary,source

partially-implements blueprint sahara-container

Change-Id: Id6dad447cd6ec07286e7a6cab0b13a6d4d89c1a7
2016-05-26 16:52:07 +05:30
Jeffrey Zhang
070bf25835 Support a custom base image
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-09 07:29:19 +00:00
Jeff Peeler
696f0b9a06 Generate image dependencies on CLI
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-05 00:03:31 -04:00
Davanum Srinivas
fa88ce2e4c Cleanup Mesos/Marathon related work
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-03 21:39:57 +00:00
Jenkins
0078d9b4a1 Merge "Add iscsid/tgtd specific parameters to Kolla infrastructure" 2016-04-15 12:05:39 +00:00
Serguei Bezverkhi
c605d6ca26 Add iscsid/tgtd specific parameters to Kolla infrastructure
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-12 14:58:15 -04:00
Swapnil Kulkarni (coolsvap)
11c6457164 Add missing base os values to kolla-build.conf
Added centos, ubuntu, oraclelinux.
Not added other base distros are not
well maintained currently.

Change-Id: Icb1c12dde2ff005068f1b0f36693049f9ea30f52
Closes-Bug:#1569265
2016-04-12 17:01:42 +05:30
Steven Dake
31634c4df4 Add PBR generation of version information
Change-Id: I6391392645d8608a92c885071b26210eed3f5466
Partially-Implements: blueprint add-reno
2016-03-22 20:45:46 -07:00
SamYaple
3e7be6593c Split versions onto new line
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-21 12:29:10 +00:00
Jenkins
c09db422cf Merge "Mesos DNS container" 2016-03-14 12:33:18 +00:00
Jenkins
a28b246259 Merge "Add cron image and playbook" 2016-03-10 20:22:15 +00:00
Éric Lemoine
32a4cadac9 Add cron image and playbook
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-09 13:53:55 +01:00
SamYaple
279594ab64 Add local directory or file for source build
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-09 18:36:13 +09:00
Artur Zarzycki
dd298fcb9e Mesos DNS container
Change-Id: I07ce1b0f6a48de2a8290fac75dcf7ef07960aaf5
Implements: blueprint mesos-dns-container
2016-03-08 21:29:19 +01:00
Vikram Hosakote
320c1f9272 Add timeout to requests.get() in kolla/cmd/build.py
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-28 00:54:47 +00:00
Éric Lemoine
0417844b8d Remove Rsyslog entirely
Partially implements: blueprint heka

Change-Id: I1322d2dc870e6f8fe052926995d993e8a08a25db
2016-02-23 01:45:23 -08:00
Éric Lemoine
ee95dc5c27 Add a Dockerfile for Heka
Partially implements: blueprint heka
Change-Id: Iafe0dba1333f1f84bc5956890c3b7a0c2a45cef3
2016-02-19 19:23:49 +00:00
SamYaple
2c45bef065 Reduce gate resource usage
Change-Id: Ic6cd45ec708efe4f573e19f3bc910717ac3b4fbb
Partially-Implements: blueprint functional-testing-gate
2016-02-16 15:12:38 +00:00
Jenkins
84f43146dc Merge "Use uppercase 'S' in word "OpenStack"" 2016-02-15 16:23:37 +00:00
venkatamahesh
70de590a11 Use uppercase 'S' in word "OpenStack"
Change-Id: I27ca0ea75f3d6a4371c91b3cb2c7a999ec90fbc4
2016-02-15 12:37:30 +00:00
Jeffrey Zhang
ce5e8a8257 Remove data docker image
we have moved to named volume, the old data container should be removed

TrivialFix

Change-Id: Ib73205de6566509492568381179814baa7af2d22
2016-02-10 22:46:22 +08:00
Jenkins
b891afd64c Merge "Rename kolla_ansible to kolla_toolbox" 2016-02-05 15:04:37 +00:00
SamYaple
9dae768e69 Ubuntu custom apt repos
Change-Id: I3afb8a29c4ae2369f29e0cc94d75ff8a3c42594b
Implements: blueprint custom-repos
2016-02-03 15:56:54 +00:00
Allen Gao
682b60b861 Fix config help message
Adding the necessary spaces.
TrivialFix

Change-Id: I3858ed1cb978bcf8aefd4a85f7c802607876b36e
2016-02-03 18:11:21 +08:00
SamYaple
80b7266ed1 Rename kolla_ansible to kolla_toolbox
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-02-02 18:12:15 +00:00
SamYaple
9e98149b3c Removed unused containers from gate build
TrivialFix

Change-Id: I7ccbecddc55b26d252b92faccec94676315c3eec
2016-01-29 20:39:55 +00:00
David Moreau Simard
c15df14737 Bump RDO delorean repositories to current-passed-ci for Mitaka
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-25 22:09:21 +00:00
Jenkins
08f907a2cc Merge "Add Dockerfiles for Mesos" 2016-01-20 16:23:43 +00:00
Michal Rostecki
679014a052 Add Dockerfiles for Mesos
Change-Id: Iaf317817eccaa72f2a86b1058a0179afd3427859
Partially-Implements: blueprint mesos
2016-01-19 17:34:58 +01:00
Jenkins
11cdd5b8ea Merge "Expose the docker build_arg to build.py" 2016-01-19 09:51:47 +00:00
Jenkins
5c4c8636ff Merge "Add manila container (source only)" 2016-01-19 07:13:52 +00:00
Marc Koderer
f7085c1f6f Add manila container (source only)
Support manila as container. First step only supports
building from source.

Change-Id: I60bb67536c9afdb9f0532b3cdc2c400a68608003
Partially-Implements: blueprint enable-manila-containers
2016-01-18 20:33:32 +00:00
Jeffrey Zhang
7093d37f18 Expose the docker build_arg to build.py
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-18 11:42:00 +00:00
ting.wang
defd70cef9 Use dict.items() for adding Python 3 compatibility
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-16 13:44:16 +08:00
Jeffrey Zhang
4bdf8bfa84 Add trove source url and location
TrivalFix

Change-Id: I70c80d0090c35ffd6e4bf2866510b383d8486220
2016-01-09 18:25:03 +08:00
Jenkins
cd315c659d Merge "Fix the base-tag name in build.py script" 2016-01-08 17:52:20 +00:00
Jeffrey Zhang
8ba800f4ed Fix the base-tag name in build.py script
TrivialFix

Change-Id: Icfcb0736ab167c0c7acb0eeea98ffd136a8a760b
2016-01-08 09:39:36 +08:00
Jeffrey Zhang
9b19db099d Fix the package source don't register issue
Closes-Bug: #1531848
Change-Id: I3c6ceb9f1f367b8b19ab1b1d06c67817ab93cabb
2016-01-07 21:06:22 +08:00
Jeffrey Zhang
f2bded7f94 Gen the image dependency in the Graphviz dot format
By using

    ./tools/build.py --save-dependency a.dot

to gen the Graphviz dot dependency file. Later, you can use the `dot`
to draw the picture.

    dot -Tjpg -o a.jpg a.dot

Implements: blueprint images-dependency-tree
Depends-On: I8e07a1b69fab5f1c587470bfd2104aaba93f0050
Change-Id: If00f4f3fb9d0b10a07ab2abb7ffb1cd9d64902f2
2016-01-06 16:33:05 +08:00
Jeffrey Zhang
620d610eaa Generate the kolla-build.conf file using oslo_config
Closes-Bug: #1530122
Change-Id: I96039eade2aacf1bcd9d14d958cdddd915fc9a5c
2016-01-06 08:11:06 +08:00