2949 Commits

Author SHA1 Message Date
Jenkins
94c2717637 Merge "Updated from global requirements" 2016-01-19 15:50:11 +00:00
Jenkins
14c56d542f Merge "Consistency changes in configs" 2016-01-19 15:45:57 +00:00
Jenkins
36ebd7dc82 Merge "Revert "Capture the log in default"" 2016-01-19 15:36:52 +00:00
Jenkins
4216a507be Merge "Use driver instead of deprecated notification_driver in config" 2016-01-19 15:33:26 +00:00
Jenkins
4cfeeed021 Merge "Fix typos in docstrings:" 2016-01-19 14:41:07 +00:00
Marc Koderer
9531b0613b Adapt openrc file to use keystone v3
Ansible adminrc file already uses v3 as default. So let's
to that in vagrant too.

See file:
ansible/roles/common/templates/admin-openrc.sh.j2

TrivialFix

Change-Id: I23b7ff81808ddc718ae1186887e9764ebc5ab6ef
2016-01-19 14:16:36 +00:00
Maciej Szankin
57fdb0ceed Consistency changes in configs
TrivialFix

Change-Id: Iafd92e4e962dec5a225582ff058ab3603e5a50bb
2016-01-19 14:58:11 +01:00
OpenStack Proposal Bot
94b170a6c1 Updated from global requirements
Change-Id: I5dfada9f5ad92432fb1e8408ceb82a57dab5f2eb
2016-01-19 13:48:15 +00:00
Jenkins
11cdd5b8ea Merge "Expose the docker build_arg to build.py" 2016-01-19 09:51:47 +00:00
Jenkins
5bce0212b2 Merge "add unittest code base" 2016-01-19 09:50:56 +00:00
Wanlong Gao
66f5802daa Use driver instead of deprecated notification_driver in config
TrivialFix
https://review.openstack.org/#/c/249508/

Change-Id: Ie2732ee116b6b4b3e0210eb1f62fc72878d8c277
2016-01-19 17:09:19 +08:00
Jenkins
5c4c8636ff Merge "Add manila container (source only)" 2016-01-19 07:13:52 +00:00
Jenkins
f764ad8d17 Merge "kolla-ansible: add post-deploy subcommand" 2016-01-19 00:44:56 +00:00
Jenkins
9a9dbf481b Merge "Replace the deprecated rsyslog config style" 2016-01-18 21:23:59 +00:00
Jenkins
37bcd509bc Merge "remove option verbose from config files" 2016-01-18 21:16:14 +00:00
Jenkins
296b37cd90 Merge "Rename bootstrap.sh to centos-bootstrap.sh" 2016-01-18 21:12:15 +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
Jenkins
2c35fd1198 Merge "Ensure /var/lib/cinder exists for cinder container" 2016-01-18 15:54:28 +00:00
Sam Yaple
bf005dc7b3 Revert "Capture the log in default"
This reverts commit b67c20f2db9da48fe5d3de1f5c5fb1887be1f20b.

This change hides the LOG output from the build process in the
console.html. While the build still will succeed/fail it will not update
the log while it is running. It will only dump the output of what its
doing if it fails. This is not ideal for our gates at this time since we
have seen the even the running and successful gates sometimes do not do
what we designed the gate to do (not building the containers we want,
not running the tests we want (recently happened with bashate), etc)

Change-Id: Ida58eef41ee8874e7577fcc24174fed4808f46f1
2016-01-18 15:35:40 +00:00
Allen Gao
3729755da0 remove option verbose from config files
Option "verbose" from group "DEFAULT" is deprecated for removal.
Its value may be silently ignored in the future.

If this option is not set explicitly, there is no such warning.
Furthermore, the default value of verbose is true, so there is
no need to set this value in config files.

TrivialFix

Change-Id: I3ec2a8900c984a64bc0645672ef89a63975f7f4e
2016-01-18 21:29:36 +08:00
Marc Koderer
9431ab62af Rename bootstrap.sh to centos-bootstrap.sh
Since Ubuntu and Centos are both valid options it's better
to list their names in both bootstrap files

Trivial-fix

Change-Id: Ie8179403ba550ff61a45aa936fb87e02b9f74861
2016-01-18 14:05:03 +01:00
Paul Bourke
b82111d589 Pick up proxy buildargs from environment
We currently support any buildarg via --build-args. This patch picks up
the default supported proxy buildargs if set in the user's environment,
to allow for more transparent proxy support.

The --build-args will take precendence.

DocImpact
Implements blueprint: better-proxy-support

Change-Id: I084e5d1cc8f9993d65167878f9983ad58a68e86e
2016-01-18 11:53:25 +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
Jeffrey Zhang
d4490ea2bc add unittest code base
* add a base TestCase class
* load the tests from the project root rather than only tests dir
* add a test case for WorkerThread builder function

Change-Id: Icf878f9249b475a311123c8235c42b1212d02ca6
Partially-implements: bp add-ut-codebase
2016-01-18 11:42:00 +00:00
Jenkins
c4f142fd96 Merge "Fix centos AiO setup" 2016-01-18 10:23:46 +00:00
Jenkins
dfead6d683 Merge "Fix pid leftover after converting ceph to kolla_docker" 2016-01-18 10:19:38 +00:00
Jeffrey Zhang
bbe088cad2 Remove the not used setup_docker.sh file
TrivalFix

Change-Id: I18a69d31c1b3442c79b7ffaab7259363600727e2
2016-01-18 16:49:14 +08:00
Qiu Yu
f714703cad Ensure /var/lib/cinder exists for cinder container
Change-Id: I52e175a1eb5176828db8ed709f4d19dd0685b9c5
Closes-Bug: #1535189
2016-01-18 14:07:28 +08:00
SamYaple
af0d73ea38 Rename ceph-mon bootstrap container to avoid conflict
Ceph-mon bootstrap container shares the same name of `ceph_mon` with
real ceph-mon service. When bootstrapping, it will sleep forever for the
purpose of distribute rings. Later on, when starting real `ceph_mon`
service, kolla_docker module will take bootstrap container as real one
because bootstrap container has a super set of env variables and
kolla_docker doesn't do strict comparing of env variable items.

This change follows the pattern of other bootstrap containers and rename
to use `bootstrap_ceph_mon` to avoid conflict.

Co-Authored-By: Sam Yaple <sam@yaple.net>

Change-Id: I0082820900928c42f9cc778ffd705980fea9ad1c
Closes-Bug: #1535140
2016-01-17 23:20:54 +00:00
Qiu Yu
8c125f01fd Fix pid leftover after converting ceph to kolla_docker
Related-Id: Icb1e81dc8acabe51740edc5658957022ddd13cd7
TrivialFix

Change-Id: Icf7cca554a972370bb109530cce3a0d451c95ae1
2016-01-18 02:32:47 +08:00
Jenkins
c531338fef Merge "make the testr.conf required environment pass throught in tox" 2016-01-17 16:49:46 +00:00
Jenkins
040eb49130 Merge "Capture the log in default" 2016-01-17 16:48:32 +00:00
Jenkins
23080963d9 Merge "Updated from global requirements" 2016-01-17 16:47:37 +00:00
Jenkins
b4edee1c2f Merge "Use auth_type instead of deprecated auth_plugin" 2016-01-17 16:02:56 +00:00
Jenkins
c8228da023 Merge "Use dict.items() for adding Python 3 compatibility" 2016-01-17 16:00:50 +00:00
Jenkins
8fd9e85ab6 Merge "Update the document to use kolla-ansible post-deploy" 2016-01-17 16:00:43 +00:00
Jenkins
100c49d7b4 Merge "ironic-conductor: install ipmitool for source deploy in centos" 2016-01-17 16:00:36 +00:00
Jenkins
b0b3f6a229 Merge "ironic-discoverd: fix ironic config file path" 2016-01-17 15:59:24 +00:00
OpenStack Proposal Bot
0fb7b9ad9d Updated from global requirements
Change-Id: I7d8485958fb96c7e111eab4df21472bee27ea8d0
2016-01-17 01:11:22 +00:00
Jenkins
d6071461d6 Merge "Fix container config files directory path" 2016-01-17 00:40:42 +00:00
Wanlong Gao
93df2483c6 Replace the deprecated rsyslog config style
The old style has been deprecated for time:
http://www.rsyslog.com/doc/v8-stable/compatibility/v7compatibility.html#omruleset-and-discard-action-are-deprecated
TrivialFix

Change-Id: I70fa065f5fbd686ddb8f4134bb93c08c7af00365
2016-01-16 20:40:55 +08:00
Wanlong Gao
3898205f0a ironic-discoverd: fix ironic config file path
TrivialFix

Change-Id: Idb15f134137a377690d69d9848791a95df572948
2016-01-16 17:18:09 +08:00
Wanlong Gao
e25c12fee6 ironic-conductor: install ipmitool for source deploy in centos
Change-Id: Ib6b095341c8d63b365d3575478b4dafa69720b63
Closes-Bug: #1534900
2016-01-16 16:19:39 +08:00
Wanlong Gao
1574dad493 Update the document to use kolla-ansible post-deploy
TrivialFix

Change-Id: Ia2568495df07c3ed3983594c99aac220d2146f99
2016-01-16 14:20:41 +08: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
Wanlong Gao
181b4947dd Use auth_type instead of deprecated auth_plugin
TrivialFix

Change-Id: I33924d6de43126ff8523883eebce703c976f9a1a
2016-01-16 07:44:14 +08:00
Wanlong Gao
f2f269125d Fix container config files directory path
TrivialFix

Change-Id: I94dd94b1e64a6a844497e551a66e7279de636f90
2016-01-16 07:25:55 +08:00
Qiu Yu
20c0f4c3f1 Fix ceph-mon existing cluster detection logic
After moving from data container to named volumes, ceph monmap detection
is broken. This change fix the logic by leverage kolla_docker's
idempotency creating a named volume.

Change-Id: Iabc2e2fe5f526e1a6fc2e1b1158d1702aaf4bdf9
Related-Bug: #1533368
2016-01-16 06:17:44 +08:00
SamYaple
d3a0f222cf Add validate scrits to linters
In an effort to reduce the number of gates, we can combine
non-conflicting jobs as we have already done with pep8 and bashate

TrivialFix

Change-Id: I81c2e523c563f8c761b57c8f20ca807d59da5d68
2016-01-15 18:53:25 +00:00
Hui Kang
a755aa88e4 Fix wrong integration bridge configuration name in ml2 conf
Change-Id: Idd8d0c41fb527634fcbb74da415c99a3e3995e3c
closes-Bug: #1534666
2016-01-15 12:08:18 -05:00