4144 Commits

Author SHA1 Message Date
Jenkins
2a38e477e0 Merge "Fix the neutron reconfigure issue" 2016-06-09 12:54:24 +00:00
Jenkins
9fbf4ef485 Merge "Bump the ansible version to >2 in the kolla-toolbox" 2016-06-09 11:19:29 +00:00
Jenkins
cc2fe74aef Merge "Fix the prechecks for the ansible version" 2016-06-09 11:18:58 +00:00
Jenkins
f98fe8149b Merge "Revert "Changed namespace from kolla to kollaglue in oslo"" 2016-06-09 11:18:50 +00:00
Jenkins
a795a12ca6 Merge "Use 'image' not 'item'" 2016-06-09 11:18:14 +00:00
Swapnil Kulkarni (coolsvap)
f43820d856 Revert "Changed namespace from kolla to kollaglue in oslo"
This revert is not related to the build namespace. Need revert.

This reverts commit 9803b4594018667429126c8cf6d7913e2ed24370.

Change-Id: Ic1759e02287e0272b1f5901c94f204cf7b4844aa
2016-06-09 07:06:42 +00:00
Joshua Harlow
a45dc94e8c Use 'image' not 'item'
The things in self.images are images, not items so
reflect these to use the shared 'image' name vs
having a one-off that uses 'item'.

TrivalFix

Change-Id: I781514d3e116de32b4fe61a7f55455282680fec1
2016-06-08 17:50:39 -07:00
Vikas Jain
9803b45940 Changed namespace from kolla to kollaglue in oslo
The oslo configuration generates containers that default namespace
to kolla instead of kollaglue docker hub registry upstream.
The impact of this bug is that when using oslo config generator,
the default containers can't be launched.

Change-Id: I29a75874af0453df89eca6d6a9294441204d85f5
Closes-Bug: #1590619
2016-06-08 17:11:41 -07:00
Jeffrey Zhang
3b1b6abf5b Fix the prechecks for the ansible version
Change-Id: I7005a7ce15fa91df2c1e54569a80d7085e99e24e
Partial-Implements: blueprint ansible2
2016-06-09 07:04:13 +08:00
Jenkins
479862932c Merge "setup_{RedHat,Debian}.sh, make more idempotent" 2016-06-08 16:57:50 +00:00
Jenkins
4204f29e64 Merge "Updated Gnocchi binary containers" 2016-06-08 15:20:10 +00:00
Jeffrey Zhang
c31688be36 Make build.py importable lib
First step to break it down is to make it
importable lib rather than self-contained script.

Change-Id: Ibbc924c2849cc79006046f62f31a1909ce959066
Partially-implements: bp build-refactor
2016-06-07 16:40:16 +00:00
Dave Walker (Daviey)
334ef7d540 setup_{RedHat,Debian}.sh, make more idempotent
Previously, when either setup_{RedHat,Debian}.sh was ran
multiple times a mess was created due to multiple loop
devices being setup.

This change now looks to see if '/docker' or '/swapfile'
already exist, and not re-create them if they do.

*However*, /var/lib/docker (/docker) is still wiped - but it
means that the script can run and bring the system into a
constant vanilla state.

Change-Id: I169662fa04c2bf644672ca75c3ee579795943727
Closes-Bug: #1586563
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
2016-06-07 11:10:07 +01:00
Jeffrey Zhang
a070739ddd Fix the neutron reconfigure issue
The newly added lbaas agent crashes the neutron reconfigure. This
PS fix the issue.

TrivialFix
Change-Id: I170ab809e9880fd7b1edcee68409c4a7b373e700
2016-06-07 16:01:02 +08:00
Jeffrey Zhang
4d1fa3cb90 Bump the ansible version to >2 in the kolla-toolbox
Kolla do not depend on certain version of Ansible. So
install the ansible using pip

Change-Id: Id1bf103a1f5c2a1cde653d53110f28c903ae8768
Partial-Implements: blueprint ansible2
2016-06-07 14:58:53 +08:00
Jeffrey Zhang
9585c1be9f Remove the deprecated kolla-build section
TrivialFix

Change-Id: I3ee10efc093ed394c3af483a229dcd9dc732ec9a
2016-06-07 09:04:57 +08:00
Jenkins
0ac3719a17 Merge "Cleanup help string of install_type parameter" 2016-06-06 13:08:03 +00:00
Jenkins
f259f93f86 Merge "Make container dind unpin old docker relase" 2016-06-06 11:55:39 +00:00
Christian Berendt
442b4b6a94 Cleanup help string of install_type parameter
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-06 11:47:53 +00:00
Christian Berendt
2de2cf6cd0 Fix URL to Heka documentation in README file
This resolves the following issue:

$ curl -i http://hekad.readthedocs.io/en/
HTTP/1.1 404 OK

Change-Id: I322b74a13f355e929a51fd332f7bc68f1346156d
2016-06-04 18:36:22 +02:00
Jenkins
9f8347a87a Merge "Make heka container build with debian" 2016-06-04 13:39:04 +00:00
Jenkins
c69311b792 Merge "Make nova-libvirt container build with debian" 2016-06-04 13:37:55 +00:00
Benedikt Trefzer
10f2b59cf0 make rabbitmq container build with debian
- use rabbitmq official package since debian
    does not offer required version
  - force-depend since we do not install logrotate

Change-Id: I0818a6807210eb861aab5ef36d1f807a0ce435b2
Partially-implements: blueprint build-debian
2016-06-04 10:17:08 +02:00
Benedikt Trefzer
547a7cf967 Make nova-libvirt container build with debian
- handle different xen-utils version in debian/ubuntu
- add rm -f to ignore nonexistent file in debian
- add variable for libvirt group since different in debian

Partially-implements: blueprint build-debian

Change-Id: I44c55981819294286d163b5391aefe967b6dd1d9
2016-06-04 10:16:20 +02:00
Benedikt Trefzer
4ca6e982c7 Make heka container build with debian
Change-Id: I911a684e1269076f9466fe0b6511c0b72dd80833
Partially-implements: blueprint build-debian
2016-06-04 10:11:58 +02:00
Benedikt Trefzer
190ae5957c Make container dind unpin old docker relase
- remove pinning to old docker version in ubuntu
- move docker ubuntu repository to base image

Change-Id: If05ccc0c5b3e89725acea3b603b5ef7acbbee649
Partially-implements: blueprint build-debian
2016-06-04 10:09:59 +02:00
Jenkins
31089795da Merge "Make swift-base container build with debian" 2016-06-04 05:07:56 +00:00
Benedikt Trefzer
ccca2e5a98 Make swift-base container build with debian
- add debian as base_system

Change-Id: I1d0f1e5de819e8325243fa0b971c1eb7b83fb5b5
Partially-implements: blueprint build-debian
2016-06-04 03:44:56 +00:00
Benedikt Trefzer
5df0903cfa Make container kolla-toolbox build with debian
- handle different path for os_client_config

Change-Id: I1134a932845ee22e8318c14ec02f0478eee11b9a
Partially-implements: blueprint build-debian
2016-06-04 03:44:23 +00:00
Jenkins
f43a2ecf38 Merge "adding else statement with empty string starting ansible 2.X it require a else statement." 2016-06-04 02:39:29 +00:00
Jenkins
cb1e665a8a Merge "Use --subproject instead of deprecated --service option" 2016-06-03 20:07:33 +00:00
Jenkins
eaf605c64c Merge "Install keepalived in neutron_l3_agent container" 2016-06-03 19:54:56 +00:00
Jenkins
55967130fd Merge "Updated from global requirements" 2016-06-03 19:51:11 +00:00
Jenkins
631ffab1ef Merge "Add vars to the merge_config task in config-neutron-fake.yml" 2016-06-03 19:48:47 +00:00
mgatien
5fdd2b18cc
adding else statement with empty string
starting ansible 2.X it require a else statement.

Closes-bug: #1588941
Change-Id: I3f12be8de75ddcebf28a077c361a9206b36aafb0
2016-06-03 14:59:05 -04:00
OpenStack Proposal Bot
6994bb943a Updated from global requirements
Change-Id: I7742cbd0797d7a3773de004c61aacf5b4397c614
2016-06-03 18:13:44 +00:00
Jenkins
ad71352a93 Merge "Use debian repos for debian base docker image" 2016-06-03 17:59:36 +00:00
Jenkins
5b170793c0 Merge "Use an image object, recorder object and status constants" 2016-06-03 16:17:54 +00:00
Jenkins
058d8606b5 Merge "Enable HAProxy consider MariaDB wsrep_local_state" 2016-06-03 16:06:23 +00:00
Christian Berendt
d511ee363b Install keepalived in neutron_l3_agent container
L3 HA requires keepalived. It has to be installed when install_type
is source.

Change-Id: I3265b74490559ca9b22a19917a76925a55e32cdd
Closes-bug: 1588829
2016-06-03 16:03:06 +02:00
Hui Kang
c66eae3b10 Add vars to the merge_config task in config-neutron-fake.yml
Change-Id: I3cb6c6a1879bb463da42d5d20fd6bb5d4b067a41
Closes-Bug: #1588722
2016-06-03 05:00:41 -04:00
Jenkins
1ea24c88fb Merge "Document upgrading for operators" 2016-06-03 07:56:19 +00:00
Jenkins
dd61d223de Merge "add curlrc file to base image" 2016-06-03 06:12:25 +00:00
Jenkins
98268db8bb Merge "Use a task model and dumb workers" 2016-06-03 05:26:02 +00:00
Steven Dake
aab9e5030f Document upgrading for operators
This documents the basics of upgrades.

Partially implements: blueprint documentation-rework
Change-Id: I042179aec0e4a43b82f5ccaf6262217301ae46c6
2016-06-02 21:35:21 -07:00
Ettore Simone
b4759b280c Enable HAProxy consider MariaDB wsrep_local_state
This patch enable wsrep_notify_cmd to rename haproxy user in haproxy_blocked
when the node is not ready to serve and restore it when ready.

Change-Id: I4f49960d7ff2fa689d6ea730b2574f16f083edc1
Closes-Bug: 1578752
Closes-Bug: 1587752
2016-06-03 01:30:00 +02:00
Benedikt Trefzer
30c805596f Use debian repos for debian base docker image
Change-Id: Ic5c1d20fa9f7f1cd9fd20e658b4bd1abb235f3b6
Partially-implements: blueprint build-debian
2016-06-03 00:32:05 +02:00
Joshua Harlow
7c6990ccec Use an image object, recorder object and status constants
Instead of using raw dicts and passing data around via
dictionaries (which makes it really hard to figure out
what is in those dictionaries at any point) prefer to
use objects. That way people can actually understand what
the object is supposed to be, vs guessing and/or having to
decipher its usage.

The same goes for raw string constants, prefer using
named constants instead.

Closes-Bug: #1586475

Change-Id: Ide179dc6593c50696d47a2d3d4cd000f343855d4
2016-06-02 11:21:24 -07:00
Joshua Harlow
e78ae9bc61 Use a task model and dumb workers
Instead of having smart workers that need to know
about the full logic of how they operate and what
they will do which makes it hard to reuse parts of
those workers switch the model so that workers are
dumb and they just run tasks which themselves can
request additional tasks to run when succesful.

This makes it more consistent when tasks are to
be retried and also makes it easier to know which
task is running and when.

Less specialized workers == good.

Closes-Bug: #1586474

Change-Id: Ie7b7303b8bf2a80b3e26b6d4ffc27787f8c794d6
2016-06-02 11:21:09 -07:00
Benedikt Trefzer
80d2edbd8e add curlrc file to base image
The curlrc file for root allows better output control for
curl downloads during build process.

Closes-Bug: #1567926

Change-Id: I19b526e4eab223d2456f4bbc2f4ba50192ec0901
2016-06-02 18:20:48 +02:00