Commit Graph

2620 Commits (87f0799f953e0b338177360e8bcc10556b44de7c)

Author SHA1 Message Date
Jenkins 87f0799f95 Merge "Notify Heat only if kube-apiserver is running" 2016-04-19 00:38:30 +00:00
Jenkins 850bfc566e Merge "Fix bashisms in k8s conf minion template fragment." 2016-04-19 00:38:22 +00:00
Jenkins e6fe3f3897 Merge "Fix container-create memory not passed" 2016-04-19 00:16:18 +00:00
Jenkins 0b3d938603 Merge "Imported Translations from Zanata" 2016-04-18 23:47:33 +00:00
Jenkins 4c3666864a Merge "Fix bashisms in k8s os config template fragment." 2016-04-18 15:24:30 +00:00
Eli Qiao 2b667eba05 Fix container-create memory not passed
Commit I34e5e49ae650219f986a2b0032df65672c319ec6 tried to fix mem_limit
not passed to docker when create container for docker API vesion >=1.19
in a wrong way, this patch fixes it by passing Memory unit to host_config

Closes-Bug: #1567834
Change-Id: Id8da5e40cf165317a9a5453036490cc028bd2e0d
Co-Authored-By: Spyros Trigazis <>
2016-04-18 08:13:27 +00:00
Jenkins 46749e7957 Merge "Functional tests should support DNS nameserver config" 2016-04-18 07:55:10 +00:00
OpenStack Proposal Bot 39f7a4bdc0 Imported Translations from Zanata
For more information about this automatic import see:

Change-Id: I6daa88fa0dc889558813de30c9ee346667ba5c40
2016-04-18 06:03:55 +00:00
Jenkins cade36b33f Merge "Fix specs reference rst format" 2016-04-18 02:44:13 +00:00
Jenkins 3fd7f02d55 Merge "Imported Translations from Zanata" 2016-04-18 02:44:07 +00:00
Jenkins f3f7fd00e7 Merge "Remove constraints envs from tox.ini" 2016-04-18 02:21:18 +00:00
Jenkins 59aebdfe4d Merge "Fix post jobs" 2016-04-18 02:11:06 +00:00
Kai Qiang Wu(Kennan) 816caeab63 Fix specs reference rst format
In our specs we not correctly reference as rst format, which
is not good to display well for readers.

Change-Id: Idca82ae3b2b447a40870b38b820c008db219165b
2016-04-18 01:11:03 +00:00
Jenkins 0d3ec32c4a Merge "Config docker registry in devstack" 2016-04-17 18:58:52 +00:00
Jenkins ef399879b4 Merge "Add support for docker registry" 2016-04-17 15:11:32 +00:00
Jenkins 8743e2fbf9 Merge "Fix bashisms found in swarm template fragments." 2016-04-17 15:10:47 +00:00
Andreas Jaeger 5364356b99 Remove constraints envs from tox.ini
The constraints environments are not used at all, they have been
obsoleted everywhere in OpenStack. Remove them completely.

Now the normal jobs can use constraints - as magnum already does.

Change-Id: Iecec444fba59923c7894c1fd2a90aebbfdc4724d
2016-04-17 17:09:03 +02:00
Andreas Jaeger e3fef8412f Fix post jobs
The tox venv environment is run during post jobs and thus cannot use


We run for docs jobs:
"tox -e venv python build_sphinx"

thus, the docs environment is not used.

For branch tarball, the infra scripts use:
"tox -e venv python sdist"

And infra does not setup constraints for post jobs currently as this is
not working with current tools

Fix tox.ini for this.

Change-Id: Iad81b47899c4554b75f90dc24f0aa2aff7aef730
2016-04-17 17:07:58 +02:00
Jenkins 9ae36e9ab0 Merge "Update Kube version for latest image" 2016-04-17 15:03:07 +00:00
OpenStack Proposal Bot 42e365720c Imported Translations from Zanata
For more information about this automatic import see:

Change-Id: I4b5ebef23ab374b6b155c1ddb7b82c5266ea8357
2016-04-17 06:03:17 +00:00
Davanum Srinivas a6650650f0 Use k8sclient library
In Ia400b5b6919753d6241233a6666a2c30c7618bc9, we are
adding a new library to global requirements. This
python-k8sclient library essentially has the same
code that was in Magnum so it's a straight replace.

Change-Id: Ib85bcf532e4163d5c1ac95ef701a1ec3133b69eb
2016-04-17 03:35:39 +00:00
Hongbin Lu f575ef773e Gate: Remove neutron-lbaas devstack plugin
It seems Magnum gate often broke after switching to neutron-lbaas
devstack plugin. To fix the gate, we remove the plugin for now.
We need to add it back once the issue is resolved.

Change-Id: I777c147a34e32a98592d5f5d8229763cceeb83e7
2016-04-16 15:02:58 -04:00
Dane LeBlanc 9712370357 Functional tests should support DNS nameserver config
The Magnum functional tests currently use a DNS server setting of when configuring nodes in a cluster. In some environments,
this DNS server setting doesn't work. When this is the case, and
functional tests are run locally, bay creation times out and the
functional tests fail.

This patch enhances the functional tests to allow configuration of
DNS nameserver to be used in baymodels that are created in
functional tests.

Change-Id: I958d199565ae5741dd6f4b8764e51ea16a8d505b
Closes-Bug: #1570543
2016-04-15 11:39:36 -04:00
Jenkins 3953c20413 Merge "Doc: fix flannel etcd key" 2016-04-15 03:43:42 +00:00
Jenkins 5d5cdf99d8 Merge "Docs: switch to neutron-lbaas plugin" 2016-04-14 22:11:39 +00:00
Jenkins 8711e449ee Merge "Updated from global requirements" 2016-04-14 21:16:50 +00:00
Shawn Aten e57511fffc Fix bashisms in k8s conf minion template fragment.
Corrects problems output by checkbashisms in

Change-Id: Iedd0ccfdfd3f56514476878c442362a25323be07
Partial-Bug: #1561232
2016-04-14 19:30:55 +00:00
Shawn Aten 40b11d2460 Fix bashisms in k8s os config template fragment.
Partial fix for problems output by checkbashisms for file
magnum/templates/kubernetes/fragments/ only.

Change-Id: I68b021da63b6c2d058053023a4fa26d643f0134b
Partial-Bug: #1561232
2016-04-14 19:26:23 +00:00
Hongbin Lu 71c97b95cd Docs: switch to neutron-lbaas plugin
neutron-lbaas has been removed from devstack:
Magnum needs to use their devstack plugin instead.

Change-Id: Id112c6859fd2b83d6f8864d6bdd9d7aaf3382f2e
Depends-On: Ia9cc4c40b41db1159ad6fd3c4ec1b17b502e0f5b
2016-04-14 14:33:21 -04:00
Eli Qiao 11b88008c3 Move project-configs to gate hook
Fix gate broken, we keep project configs in so we don't
need to subumit requests to project-config and wait for their

Change-Id: Ia9cc4c40b41db1159ad6fd3c4ec1b17b502e0f5b
2016-04-14 11:56:27 +00:00
OpenStack Proposal Bot 342d1881e7 Updated from global requirements
Change-Id: Ib44d3254fc08b940eb5207afca3a921089d21916
2016-04-14 02:33:49 +00:00
Shawn Aten 353d631e70 Fix bashisms found in swarm template fragments.
Partial fix for problems output by checkbashisms for file
magnum/templates/swarm/fragments/ only.

Quoted variable as recommended.

Change-Id: Iadcd3435b39ad7bd2575bbf838add1c22b04944f
Partial-Bug: #1561232
2016-04-13 18:58:20 +00:00
Jenkins 39e8e1f054 Merge "Add subjectAltName back to CSR config" 2016-04-13 09:25:36 +00:00
Hua Wang d2676a2d63 Config docker registry in devstack
Config docker registry in devstack

Change-Id: I7964c3b4f35747418dbe84d1ac003c462b2ea907
Partially-Implements: blueprint registryv2-in-master
2016-04-13 16:17:36 +08:00
Hua Wang 970c9a2d18 Add support for docker registry
After this patch is merged, docker registry will be available.
We can push docker images into local repo on a bay node.

Change-Id: I1245bde7ef3173226617e60e6436759f433eb464
Partially-Implements: blueprint registryv2-in-master
2016-04-13 16:17:20 +08:00
OpenStack Proposal Bot a10af07e3d Updated from global requirements
Change-Id: I5012dc0900b442cdf11273ee4e970258d13acbad
2016-04-13 03:40:55 +00:00
Jenkins fc3121a416 Merge "Fix bashisms found in shell scripts." 2016-04-13 03:07:10 +00:00
Jenkins dec9315d0a Merge "Fix the rst url format" 2016-04-13 02:33:57 +00:00
Kai Qiang Wu(Kennan) 6a7abf46ea Fix the rst url format
Change-Id: I7e357ca12bd3c32311a31d9eb7ca11fed211e43f
2016-04-13 01:15:09 +00:00
Jenkins 3bbf3d842c Merge "Fix uuid cases with real UUID" 2016-04-13 00:57:27 +00:00
Hongbin Lu 785eb98d5a Add subjectAltName back to CSR config
Depends-On: I5012dc0900b442cdf11273ee4e970258d13acbad
Closes-Bug: #1568427
Change-Id: Ided789dd9b70d36048f472e9721ed578fc0d9387
2016-04-13 00:54:42 +00:00
Shawn Aten 5be7634e3a Fix bashisms found in shell scripts.
Partial fix for problems output by checkbashisms for file
magnum/templates/swarm/fragments/ only.

Change-Id: I6fc8c789a2b5a1838c0ae98521e236c80a199323
Partial-Bug: #1561232
2016-04-12 21:25:47 +00:00
Kai Qiang Wu(Kennan) b20d411090 Fix uuid cases with real UUID
gate-magnum-python27/6c92a13/console.html the log clearly
said bay-xx-xx-xx-xx is an invalid UUID. Using UUIDFields
with invalid UUIDs is no longer supported, so in our test
let's use real UUID case for that.

Change-Id: I0f3dbd8748293741cb5501365aee710220eb3ea0
Co-Authored-By: Spyros Trigazis <>
2016-04-12 17:37:54 +02:00
Jenkins 59a90eaeb8 Merge "replace wsexpose by magnum.api.expose.expose" 2016-04-12 14:40:46 +00:00
Jenkins a8d125c282 Merge "Fix doc for certificate" 2016-04-12 11:22:03 +00:00
Jenkins b8b35e46ee Merge "Add script to install image build dependencies" 2016-04-12 11:11:42 +00:00
Hua Wang 7453c46086 replace wsexpose by magnum.api.expose.expose
The support for XML is deprecated, we should check for it in expose.

Change-Id: I68661b0acd5d08bd58b8418832eacb0521b8a7b5
2016-04-12 14:38:55 +08:00
Jenkins 8947ffb132 Merge "update doc for ca-show and ca-sign" 2016-04-12 00:22:10 +00:00
Yolanda Robla 68eb8b26d8 Add script to install image build dependencies
In order for automated image builds to run, create
this script that can be called from magnum jobs, to
install needed dependencies for diskimage-builder
and fedora-atomic builds.
That script will be run on the VM that will be
spinned to run the image builds, targetted for ubuntu-trusty.

Change-Id: Icf5a2c79e47e632be2ac49bc9ccc528b4f604eb2
Implements blueprint fedora-atomic-image-build
2016-04-11 21:55:03 +02:00
Hua Wang 924e94dfcc Fix doc for certificate
Fix doc for certificate

Change-Id: Ia0972f39d6d9187d4e3f00e4ac8cd03652a0a5b3
2016-04-11 17:18:17 +08:00