3121 Commits

Author SHA1 Message Date
Hieu LE
70c803bfc1 Use werkzeug to run Magnum API with SSL
wsgiref.simple_server is mono threaded process that can not
support SSL context. This patch aim to replace wsgiref.simple_server
with werkzeug for running development API server supporting SSL.

Change-Id: Ib4360d77030e4cce8abf5ea543d87b7982e0e285
Closes-Bug: #1614596
2016-08-24 03:57:30 +00:00
Jenkins
e974f5aae7 Merge "Updates k8s example rc to use correct label" 2016-08-23 18:40:57 +00:00
Jenkins
43ea1ab6f2 Merge "Add Mesos labels and summary for labels" 2016-08-22 18:50:37 +00:00
Thomas Bechtold
52224c5c09 Simplify test_create_list_sign_delete_clusters() tempest test
The test needs a valid CSR which was created in the devstack post_test_hook
in a static way (always the same CSR).
This commit simplifies the process and just adds the CSR to the test itself
so that the CSR string can be used to check the CSR. That way there is no need
to provide a file with the CSR content and point the tempest configuration
via the "csr_location" parameter to that file.
So the "csr_location" parameter is now deprecated for removal.
Also remove the unused "invalid.csr" which was also created in the
post_test_hook.

Change-Id: I907130576cfb59267643b4639681331acfcfa07f
2016-08-22 10:56:43 +02:00
Jenkins
778f144fd4 Merge "Revert "Use symlinks for common template files"" 2016-08-22 01:55:00 +00:00
Jenkins
658076e0fc Merge "Updated from global requirements" 2016-08-22 01:45:49 +00:00
Jenkins
555ffb5554 Merge "Align k8s CoreOS with atomic: add proxy config" 2016-08-21 05:50:24 +00:00
OpenStack Proposal Bot
52328aaa7d Updated from global requirements
Change-Id: Ie6daa7b3f1d5fa15d419eb87904ce3813852a9eb
2016-08-21 05:12:59 +00:00
Jenkins
9a71c33451 Merge "Use upper constraints for all jobs in tox.ini" 2016-08-21 04:21:12 +00:00
Jenkins
01fa411521 Merge "Rename Bay to Cluster in api" 2016-08-21 03:19:20 +00:00
Jerome Caffet
802f137aee Revert "Use symlinks for common template files"
This reverts commit 748cf13182b59d77a1be7e50e1524c39c7dd3349.
This commit breaks to setup.py install phase.

Closes-Bug: #1615026
Change-Id: Ie29a723319775e1becff5a6099cb58e3541e399c
2016-08-19 18:07:03 +00:00
Jenkins
2c7a51bf9b Merge "Drop MANIFEST.in - it's not needed by pbr" 2016-08-18 07:40:17 +00:00
Jenkins
a4aa5bf109 Merge "Correct the get_file patch in CoreOS template" 2016-08-18 00:18:16 +00:00
Jenkins
8610b44936 Merge "Increased test coverage" 2016-08-17 23:59:41 +00:00
Jenkins
bc7319db8b Merge "Add support for master elected component" 2016-08-17 23:59:33 +00:00
wangqun
c520085b1f Add Mesos labels and summary for labels
Explain labels in User Guide

Magnum labels has many possible key/value that have specific meaning.
It is helpful to summarize them in a table for quick reference.
Also add details on labels specific to Mesos that have not been
documented before.

Partially implements: blueprint user-guide
Co-Authored-By: Ton Ngo <ton@us.ibm.com>
Change-Id: If727563d3cb93663b696abb707cb2acb76a693e2
2016-08-17 22:44:27 +00:00
Jaycen Grant
eaddb942fd Rename Bay to Cluster in api
This is the first of several patches to add new Cluster commands
that will replace the Bay terminalogy in Magnum. This patch adds
the new Cluster and ClusterTemplate commands in addition to the
Bay and Baymodel commands.  Additional patches will be created
for client, docs, and additional functional tests.

Change-Id: Ie686281a6f98a1a9931158d2a79eee6ac21ed9a1
Implements: blueprint rename-bay-to-cluster
2016-08-17 22:24:45 +00:00
Daneyon Hansen
f9e8c70398 Updates k8s example rc to use correct label
Previously, replication-controller.yaml used the name: nginx
label instead of app: nginx. This caused the example service.yaml
to not bind to replication-controller.yaml pods.

Closes-Bug: 1614206

Change-Id: I7260ef6b2987abc2677d40bc4aa9a9d87e1378ee
2016-08-17 11:11:45 -07:00
Jenkins
570173d999 Merge "Add floating_ip_enabled field to baymodel" 2016-08-17 15:00:06 +00:00
yatin karel
f98463852b Use upper constraints for all jobs in tox.ini
Openstack infra now supports upper constraints for
all jobs. Updated tox.ini to use upper constraints
for all jobs.

Change-Id: Idc8c6cb9b0fa3b547bd78638394fdf1687827e33
Closes-Bug: #1614117
2016-08-17 19:56:58 +05:30
Jenkins
0b6c46be6d Merge "Fix tempest.conf generation" 2016-08-17 03:36:03 +00:00
Jenkins
1d5b84aac9 Merge "Increase in UT coverage" 2016-08-17 02:49:34 +00:00
OTSUKA, Yuanying
26370a2509 Add floating_ip_enabled field to baymodel
This patch adds floating_ip_enabled field to baymodel to specify
whether floating ip is used or not.

Change-Id: I99677221250480b43a4b95ebf460c43bc77090ad
Partially-Implements: blueprint bay-with-no-floating-ips
2016-08-16 16:21:35 -05:00
Rajiv Kumar
9d6045ce0b Increase in UT coverage
Coverage is increased for magnum/conductor/utils.py from
84% to 100%

Change-Id: Id01708d0e15bcce0dc0945772f8be6d37195c336
Partial-Bug: #1511667
2016-08-16 19:36:25 +05:30
Jenkins
067272e043 Merge "Use memory mode for sqlite in db test" 2016-08-16 12:24:16 +00:00
Thomas Bechtold
017ac4aefb Fix tempest.conf generation
[service_available] isn't being generated. This patch fixes it.

Change-Id: Ib188c684b8dc41e7918075bb398776870a3f1c31
Closes-Bug: #1613542
2016-08-16 07:21:20 +02:00
Jenkins
57ff1d53d9 Merge "Increase test coverage" 2016-08-16 05:11:56 +00:00
Jenkins
5372cd92b4 Merge "Rollback bay on update failure" 2016-08-16 04:59:35 +00:00
Hieu LE
6cb748d780 Align k8s CoreOS with atomic: add proxy config
Adding http_proxy, https_proxy and no_proxy config for
k8s CoreOS template file.

Change-Id: I070d6584f26b40f1f0fb77af7dc096a490b0cc72
Partial-Bug: #1490334
2016-08-16 11:01:15 +07:00
Jenkins
02a2378ca0 Merge "Update to User Guide" 2016-08-16 02:29:31 +00:00
Jenkins
9b45c1b828 Merge "Set bay status: DELETE_IN_PROGRESS before updated by poll" 2016-08-16 01:43:19 +00:00
Ton Ngo
0e175f3b23 Update to User Guide
Miscellaneous update

Catch up on reviewers' comments from previous bay patch and update
for new changes/features in Magnum.

Partially implements: blueprint user-guide
Change-Id: I2729bbca8c72950e7ae7eb2917b1b3c008b6d2f8
2016-08-15 22:01:55 +00:00
Jenkins
4176c5cc2a Merge "Add i18n translation for Log messages" 2016-08-15 21:38:05 +00:00
Jenkins
54fa61d0b4 Merge "Fix an issue on kube-proxy in CoreOS bay" 2016-08-15 17:48:00 +00:00
Jenkins
de7aa770dc Merge "Remove Invalid README.md for k8s" 2016-08-15 17:47:32 +00:00
Jenkins
4dbe7716e7 Merge "Makes config file generation reproducible" 2016-08-15 11:14:19 +00:00
Jenkins
6aea6402ae Merge "Fix the CoreOS fragment write-kubeconfig.yaml" 2016-08-15 11:14:13 +00:00
Jenkins
42808ed131 Merge "Fix indentation and if expressions in make-cert" 2016-08-15 10:43:15 +00:00
Jenkins
f0c0118c49 Merge "Add functional test for k8s ironic" 2016-08-15 10:39:36 +00:00
Jenkins
a1b710b04f Merge "Fix ironic template" 2016-08-15 10:34:38 +00:00
Wenzhi Yu
63b5c21c8d Rollback bay on update failure
There is a rollback mechanism in heat after the stack
update failed. There should be a rollback mechanism in
magnum after bay update failed.

This patch add new microversion 1.3 to add rollback
support for Magnum bay, user can enable rollback on bay
update failure by specifying microversion 1.3 in header(
{'OpenStack-API-Version': 'container-infra 1.3'}) and
passing 'rollback=True'(http://XXX/v1/bays/XXX/?rollback=True)
when issuing bay update reqeust.

Change-Id: Idd02769f98078702404a11dc9f7a3339ce4e22eb
Partially-Implements: blueprint bay-rollback-on-update-failure
2016-08-15 17:09:23 +08:00
yatin karel
52f30927af Set bay status: DELETE_IN_PROGRESS before updated by poll
Set bay status to DELETE_IN_PROGRESS as soon as delete stack
request returns. Currently this status is updated by Heat
poller.

Change-Id: I44a3cea1a5d6e9735b0b74637d7c62db2e9cffa3
Closes-Bug: #1612408
2016-08-15 11:46:48 +05:30
yatin karel
fb0057c105 Add i18n translation for Log messages
Added i18n translation to all log messages. Also added
hacking check for this to ensure in future all log
messages are translated.

Change-Id: I77fbb18ffe47b12232125cc1fa7aae97ea9b1214
Closes-Bug: #1603759
2016-08-15 11:44:08 +05:30
Rajiv Kumar
e2d320d103 Increase test coverage
Test cases for expose.py has been added to increase coverage from
86% to 100%.

Two test cases has been added with "rest_content_types" as
argument and without "rest_content_type".

Change-Id: If757f31be1b314cdac9133133a8cac6614969e81
Partial-Bug: #1511667
2016-08-15 11:33:17 +05:30
Jenkins
4b66daafd7 Merge "Increased UT of magnum/api/app.py" 2016-08-15 04:50:21 +00:00
Jenkins
8df3d23af0 Merge "Add openSUSE driver support to Magnum" 2016-08-14 10:03:42 +00:00
Hongbin Lu
c827039327 Fix an issue on kube-proxy in CoreOS bay
On the kube-proxy container, mount the volume that contains the kube
certs. Otherwise, kube-proxy cannot read the TLS certificates.

Change-Id: I0f42208a1d8c24b66923b8be6bc72ba5c97d6b02
Closes-Bug: #1611138
2016-08-14 01:56:37 +00:00
Hongbin Lu
d81b2dfb80 Fix the CoreOS fragment write-kubeconfig.yaml
This file was incorrectly copied to CoreOS during bay driver
refactoring.

Change-Id: I1032caa775e55bf09f404015850d207ca753676e
Closes-Bug: #1611136
2016-08-14 01:56:28 +00:00
Hongbin Lu
883ce8ee47 Correct the get_file patch in CoreOS template
In CoreOS templates, the pathes provided to get_file has a extra 's'.
This caused an error on creating CoreOS bay.

Change-Id: I8d49df913fc169ce573365c5ca485cb56806e49e
Closes-Bug: #1611065
2016-08-14 01:56:20 +00:00
Jenkins
0247313a36 Merge "Add test for update baymodel public" 2016-08-12 22:32:55 +00:00