78 Commits

Author SHA1 Message Date
Madhuri Kumari
5f193f2e0e Add x509keypair_cert_manager to store certs in DB
x509keypair_cert_manager stores certs in Magnum DB.

Change-Id: Id8106d7bd5c270679bc189fc0dc17bcbde367d73
Implements: blueprint  blueprint barbican-alternative-store
2016-06-23 09:08:52 +05:30
OTSUKA, Yuanying
1d74849193 Support trustee_domain_name in config file
To setup magnum easier, name based configuration is important.
This patch makes config file support trustee_domain_name and
trustee_domain_admin_name in trust section.
If name and id of trustee domain are provided by user, both
values are passed through into keystone.

Closes-Bug: #1581372
Change-Id: Ia691aca7c29a471f6ba36a1a371ec1edf830b365
2016-06-06 08:23:43 +09:00
Eli Qiao
0b2fefa1a7 devstack: fix magnum service name in is_magnum_enabled
We rename m-api, m-cond to magnum-api, magnum-cond, so need to fix it
in is_magnum_enabled too.

Change-Id: Ifbb290a4b6900636e0964510b4f95d7bc44a84a3
2016-05-27 08:29:32 +08:00
Hongbin Lu
754233c51d Update Magnum service name and description
After this patch [1], Magnum is no longer the "Container Service", it
became the "Container Infrastructure Management Service". This commit
updates the service name and description accordingly:
* Change service name from "container" to "container-infra"
* Update service description to reflect its mission

[1] https://review.openstack.org/#/c/311476/

Depends-On: I55205ff2b304678d2b53bbd4d66403078c6baac8
Closes-Bug: #1584251
Change-Id: I5c271bf3fc4d6ccecaf2918aca28ce946bcc6b22
2016-05-23 15:59:16 -05:00
Hongbin Lu
c52e5bea06 Add tox test for k8s coreos bay
* Add a CoreOS test class TestCoreosKubernetesAPIs
* Add a CoreOS test environment in tox.ini
* Create a base class BaseK8sTest and move OS-agnostic k8s testing
  code to that class.
* Increase the disk size from 8G to 10G for m1.magnum and s1.magnum,
  since CoreOS image requires more disk space to boot.
* Set os-distro property for CoreOS image.

Partial-Bug: #1546101
Change-Id: Ie56a9442ecebe05f39c7669bc950f5a6ca11df33
2016-05-09 02:36:26 +00:00
Hua Wang
08b6018616 Update docs to use the latest image link
In fedora people, we created a link to the latest image:
https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2.
Currently, this link is pointed to
https://fedorapeople.org/groups/magnum/fedora-23-atomic-20160405.qcow2.
It should be updated when a new image is uploaded. For now,
we need to update our docs to point to the new link.

Partial-Bug: #1573361
Change-Id: I8ff21a3372a929511351f5242568729d07b6e26b
2016-05-03 11:40:31 +08:00
Jenkins
3025fcc7e9 Merge "devstack: Use magnum-api and magnum-cond for services" 2016-04-19 02:37:53 +00:00
Thomas Bechtold
3fe3e46d4e devstack: Use magnum-api and magnum-cond for services
"m-api" is already used by Manila so switch to "magnum-api"
and "magnum-cond" for devstack.

Change-Id: I0f5e57dd263164652813088fe624f62cda664727
Closes-Bug: #1569879
2016-04-18 10:33:28 +02: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
Davanum Srinivas
3fe5849df5 Use fedorapeople for getting fedora image
It looks the official Fedora mirror is unstable right now, so we
uploaded the image to fedorapeople. This is a temprorary solution.
Once the official mirror become stable, we switch back to it.

Note: alt.fedoraproject.org seems to have a newer image and
the official mirrors (download.fedoraproject.org) do not seem to have
gotten the new image yet. So when download.fedoraproject.org
redirects (302) to a mirror the image does not exist there. We can
pull image from alt directly, but we opted for using fedorapeople as
we don't want to introduce load on alt.

Co-Authored-By: Hongbin Lu <hongbin.lu@huawei.com>

Closes-Bug: #1567124
Change-Id: I441898d846d1768b9723b293196b5339271a377e
2016-04-06 19:04:42 -04:00
Corey O'Brien
32f917c8d7 Switch to Atomic 23
Change the devstack image to the default Atomic 23 image.
Update templates not to rely on interface naming because the names
changed between Atomic 21 and Atomic 23 images.
Add a functional test to validate minion node registration.
Update docs to refer to a generic Atomic image.

Co-Authored-By: Hongbin Lu <hongbin.lu@huawei.com>

Implements: blueprint atomic23
Change-Id: Id67244e3f452b3c7c3c46fdabcca3a5c141a76c0
2016-04-02 18:17:42 -04:00
Nguyen Hung Phuong
eada9666d5 Fix typos in Magnum files
TrivialFix

Change-Id: I190abb1471730bfea75f49da73c3d64cfa9ca560
2016-03-28 12:38:51 +07:00
Hua Wang
e8d537857a Use trust for tls generation
Currently, we use the users auth token, which expires after a while.

We need to use a trust instead.

Change-Id: Ie18e6a1371871720fbfd4af0bd43e166075b0c6d
Closes-Bug: #1503863
Partially-Implements: blueprint use-trust-for-tls-cert-generation
2016-03-24 10:24:52 +08:00
Paulo Ewerton
7f145e703c Refactor Keystone client with keystoneauth
This patch does, basically, three things:

* Updates the default auth section to keystone_auth;
* Introduces keystoneauth sessions and plugins;
* Adds a deprecation warning and options when loading
legacy auth.

Config, tests and client code are also updated.

Co-Authored-By: Henrique Truta <henrique@lsd.ufcg.edu.br>
Co-Authored-By: Raildo Mascena <raildo@lsd.ufcg.edu.br>

Closes-Bug: 1496810
Closes-Bug: 1515014
Change-Id: I5c1cd24ca28d66ae7ae40e7f707b81870cf0e457
2016-03-23 16:24:53 +00:00
YAMAMOTO Takashi
f448f12ff8 devstack: Comment out some environment dependent neutron settings
Also, update documentation.

Change-Id: Iceb1c2a6957b5145ce2d94bcbeaffcf6ed3baff7
2016-03-11 14:32:41 +09:00
Jenkins
9bd983c3a7 Merge "Load wsgi app(api) with paste.deploy" 2016-03-09 17:36:46 +00:00
Attila Fazekas
c3d7fe1a70 remove devstack/create_magnum_conf_magnum_network
Looks like this function was not in use ever.
It adds nova networking related options to the magnum.conf,
which normally would belong to the nova.conf.

Change-Id: I8435c674db17af2d0641afcf3cab140830130784
2016-03-08 08:49:10 +01:00
Aaron-DH
db378a0ee5 Load wsgi app(api) with paste.deploy
This change replaces the hard coded WSGI app creation with a pipeline
of WSGI apps declared in a configuration file.
Paste Deploy was used to create the pipeline since it is used by many other
OpenStack projects and it is an active project
with new contributors and supports Python 3. Dependency on Paste is
localized so switching to another library would not be hard if OpenStack moves
to another package in the future.

Change-Id: I9a45f974c2c8c67a01748583639e6a6248003b85
Closes-Bug:#1551134
2016-03-08 09:25:44 +08:00
wangqun
c932d5fab9 Add Container Volume Model into Mesos Heat Templates
Previously,the mesos bay type did not support the Magnum Container
Volume Model. This patch adds support for volume through the following:

1. Add username, tenant_name, preempt, region_name, domain_name to
mesos bay type.
2. Add get_parameter to mesos.
3. Update mesos unit tests to support container volume.
4. Update mesos heat templates for container volume model

Change-Id: Icf7cb9fc38c7facb2d49904b6e52bbce974948f7
Partially-Implements: blueprint magnum-integrate-with-cinder
2016-03-02 05:05:51 +00:00
Jenkins
b7b2535f9f Merge "Create a trustee user for each bay" 2016-02-25 04:01:24 +00:00
Jenkins
7c349eafc6 Merge "Avoid to create $SCREEN_LOGDIR" 2016-02-24 23:00:21 +00:00
Corey O'Brien
8270d3cc7a Fix gate for client and devstack
These two changes have to merge together to pass the gate.

Update import because of magnum client change
  Magnum client has moved out apiclient and cliutils from
  oslo-incubator, update the import reference here.
  Refer to:
    https://review.openstack.org/#/c/280050
  for magnumclient change.

Change SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME
  Devstack is converting from TENANT to PROJECT[1]. This patch changes
  SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME in the devstack plugin to
  match.

[1] https://review.openstack.org/#/c/281779/

Change-Id: Ib03e421e48a3aa40c11cbc892a3ca724cbd644e7
Closes-Bug: #1548634
Co-Authored-By: Yang Hongyang <hongyang.yang@easystack.cn>
2016-02-23 23:48:26 -05:00
OTSUKA, Yuanying
32cfd6c2cc Avoid to create $SCREEN_LOGDIR
It is possible not to give SCREEN_LOGDIR variable in devstack.
And also, SCREEN_LOGDIR is creating in stack.sh itself [1].
So we can remove our code which is creating SCREEN_LOGDIR.
This code breaks stack.sh process if user doesn't give this
variable.

[1]: 2688eedc51/stack.sh (L454)

Change-Id: I5c6ce81a97635b60fc1633397a24f93dc590fad6
Closes-Bug: #1548197
2016-02-22 15:31:57 +09:00
YAMAMOTO Takashi
1b2332dfbf devstack: Comment out logging configuration
And move them into "Modify to your environment" section
because they are not appropriate for every environment.

Change-Id: I6d49e1df1f114dc8abc4404f469e25bb3a2a0a8b
2016-02-19 12:19:45 +09:00
Hua Wang
725bd5c99d Create a trustee user for each bay
Docker registry, k8s load balancer and volume driver have a similar
need to use trust, so we need to create a trustee for each bay.

Change-Id: If034e74ce2ea80a7faa886d4edf789e576c30eb5
Partially-Implements: blueprint create-trustee-user-for-each-bay
2016-02-18 18:16:35 +08:00
houming-wang
92450109b1 "notification_driver" from group "DEFAULT" is deprecated
Option "notification_driver" from group "DEFAULT" is deprecated.
Use option "driver" from group "oslo_messaging_notifications"

Reference link:
[1] https://github.com/openstack/oslo.messaging/blob/master/
    oslo_messaging/notify/notifier.py#L34

Change-Id: I3e211ac315bb582961ad03e2cf06d4409eb20ed3
Closes-Bug: #1535611
2016-01-19 18:09:37 +08:00
Eli Qiao
3a72a28096 Devstack: Fix typo of MANGUM_GUEST_IMAGE_URL
s/MANGUM_GUEST_IMAGE_URL/MAGNUM_GUEST_IMAGE_URL

Closes-Bug: #1529786
Change-Id: I1dc5c6f5fff9fc1507d4b346c72a928c87297c3f
2015-12-29 16:29:22 +08:00
Eli Qiao
09af131807 Devstack: support download ubuntu image
After this patch applied, we can pass MANGUM_GUEST_IMAGE_URL to devstack
environment to download a ubuntu image and upload it to glance with proper
os_distro set.

This is a preparation to add mesos function testing.
Implements: blueprint mesos-functional-testing
Change-Id: I98274cd2bf1cfb37f1a1c960d0a455d9c24d1e0b
2015-12-25 17:10:54 +08:00
Hua Wang
6e2ffd5c01 "lock_path" from group "DEFAULT" is deprecated.
Option "lock_path" from group "DEFAULT" is deprecated. Use option
"lock_path" from group "oslo_concurrency".

Change-Id: I306c8d909bc54dc6c6eb127a4a86d74dafd62236
Closes-Bug: #1528744
2015-12-23 12:04:16 +08:00
Kai Qiang Wu
5453e22702 Remove temp fix for new oslo.versionedobjects
As new oslo.versionedobjects 1.0.0 release, we not need
this work-around now. So remove it.

Closes-Bug: #1518147
Change-Id: I7cba6de5ebbb655647a4c833d04c4930c9cd1fbc
2015-11-25 23:29:00 -06:00
Kai Qiang Wu
67b780ef6b Pin oslo.versionedobjects version
As oslo.versionedobjects include new fix
https://review.openstack.org/#/c/246721/
but it not release new version to include that fix
so jenkins still failed for that. We need pin to not
use version with that issue.

Change-Id: Ib589fb019f94a9f44925b378dccfadabdd9e5463
2015-11-18 21:02:14 -06:00
OTSUKA, Yuanying
2316016ccc Add iptables rule to listen m-api
Bay will request Magnum API to get certificates, so
$MAGNUM_SERVICE_PORT must be opened.
This patch adds this rule to `devstack/lib/magnum`
instead of `magnum/tests/contrib/post_test_hook.sh`.

Ironic also adds same rules in devstack[1].

[1]: https://github.com/openstack-dev/devstack/blob/master/lib/ironic#L675

Change-Id: I24baf87475044a7f268811080b25032152152c39
Closes-Bug: #1515478
2015-11-12 13:21:12 +09:00
Jenkins
d48b8021b0 Merge "Devstack: Use HOST_IP to set MAGNUM_SERVICE_HOST" 2015-11-09 18:50:15 +00:00
Eli Qiao
ec39586fb1 Devstack: Use HOST_IP to set MAGNUM_SERVICE_HOST
Magnum k8s functional testing will try to access m-api inside of a VM, the
default setting of SERVICE_HOST is 127.0.0.1 which is not accessable from VM.

This patch use HOST_IP instead of SERVICE_HOST.

Closes-Bug: #1514286
o-Authored-By: OTSUKA, Yuanying<yuanying@fraction.jp>
Change-Id: Ic409818e5f85e6612390e490f4eeb17963bf3805
2015-11-09 15:27:56 +08:00
Hongbin Lu
5394abe1c8 Revert "Fix the neutron-lbaas agent config"
This reverts commit 4115c9ae8df72d9138255e4cb33dace318443869. That
commit is a temporary fix for the functional gate. Now, the issue has
been fixed in the neutron-lbaas repo [1]. Therefore, we reverted the
temporary fix here.

[1] https://review.openstack.org/#/c/241481

Change-Id: Idd204e094d4a24f4b3440ee3f4294ea9407b467f
2015-11-08 11:07:12 -05:00
Hongbin Lu
4115c9ae8d Fix the neutron-lbaas agent config
This patch should fix the functional gate. The issue is that devstack
switch to stevedore aliases for interface_driver configuration [1],
but lbaas doesn't use aliases. This patch fixed the broken config.
This patch should be considered as a temporary workaround. We need
to investigate why devstack doesn't populate the correct config at
the first place.

[1] https://review.openstack.org/#/c/237519/

Closes-Bug: #1512933
Change-Id: I73b9e146ad4cc253e6a04bcadc07f124a7c96df5
2015-11-03 23:36:25 -05:00
wenchma
a5df0e56b0 Update devstack doc to cover the latest atomic image
Change-Id: Ie142a190b9771ffe7d0512a6d49e5c56c90e0f69
Closes-bug: #1507972
2015-10-26 14:59:37 +08:00
Hongbin Lu
a8ed34ac7d Enabled ceilometer using plugin model
Devstack plugin, such as ceilometer, should not be enabled in
settings, since the path of the plugin is not available at that time.
Therefore, users have to manually enable it in local.conf, if they
run devstack locally.

Closes-Bug: #1497706
Change-Id: Idca09449ab5a3a5276282ffbcbb0aa73f35c34ae
2015-10-05 15:03:28 -04:00
Jenkins
860f0ea2ec Merge "Remove ERROR_ON_CLONE references" 2015-09-25 23:29:44 +00:00
Shinn'ya Hoshino
9704b93039 Move the code for local cert to the right place
devstack/lib/magnum#L184-188 was temporary work until barbican is
available, but they are still needed only for local cert manager when
barbican is not enabled.
Therefore move these lines into a location that runs only if it use
local cert manager.

By the way, remove the comments that no one need anymore and fixed
some indentations a little.

Change-Id: I74b4b82b26f6a80fd03a8055b9bd8c02715962a5
2015-09-25 11:22:33 +09:00
James E. Blair
1553b4cf6f Remove ERROR_ON_CLONE references
It is *never* acceptable to manipulate this variable.  It defeats
devstack gate testing.

Depends-On: I810643ccf377a9351e6a0f2554d0c2c4860baa5d
Change-Id: I6b03524a3157be4f85c41312caa92068fa35b8e9
2015-09-24 15:32:24 +00:00
OTSUKA, Yuanying
d79b73144e Enable barbican cert manager in devstack
If barbican service is enabled, this patch enable barbican cert
manager to store certificate.

Change-Id: I93c60abac6e1542204434465b60c488eafcd8746
Partially-Implements: blueprint barbican-support
2015-09-24 10:33:52 +09:00
Hongbin Lu
45a7152775 Use api version 1 to set image property
It looks api version 2 removed the option --property, which breaks
the functional gate. In addition, os-distro is not the right property
name. It should be os_distro instead.

Change-Id: I1607a330006ed59222a0086ccda87208360e7e60
Closes-Bug: #1470934
Closes-Bug: #1498797
2015-09-23 16:22:37 -04:00
Tom Cammann
b679b827d9 Unwedge the gate by only enabling barbican once
Change-Id: I14b830b3c50fca1942947fe0fe7543c8fb62370e
2015-09-23 12:07:44 +01:00
Ton Ngo
4bfed61fe3 Migrate to Kubernetes Release 1
Kubernetes Release 1.0 was announced at OSCON

A new Fedora Atomic image has been built with version 1.0.4 and
this series of patches will update the templates, scripts, documents
to work with the new image.

The api has also been changed from v1beta3 to v1 and the beta
api is no longer available, so the interface between Magnum and
Kubernetes master are updated as well in this series of patches.

This particular patch will bring up a V1 cluster with the
bay-create command.  Because the switch to the V1 API requires
all the code changes to be applied at once, this patch pulls
in portion of 3 patches together.  The changes include:

1. devstack plugin downloads the new image.

2. k8s conductor and other code calls the new V1 client and
k8s methods.

3. Configuration for k8s services and docker updated with
new parameters.

4. Minion registration and example code updated to V1.

5. Functional tests updated to V1.

6. Gate test setup points to the new image.

Co-Authored-By: Hongbin Lu <hongbin.lu@huawei.com>

Change-Id: I046931ad491e8b7ee45943852901eac5c3df913e
Partially-Implements: blueprint kubernetes-v1
2015-09-21 15:02:58 +08:00
OTSUKA, Yuanying
c5abff2511 Enable Barbican in devstack
This patch changes to use barbican plugin for devstack.

Change-Id: I7d2620888bef3ae6bcc34c333ef3a935245195cf
Partial-Implements: blueprint barbican-support
2015-09-10 14:41:29 +09:00
OTSUKA, Yuanying
d6916e8bb1 Generate certs while creating bay
Bay needs two certificates for CA and magnum conductor to support TLS
between Kubernetes API server to Magnum. This patch generates these
certs while creating bay.

Change-Id: Ide13a0a5dbb43f2acc085283859edf6373106d7f
Partial-Implements: blueprint magnum-as-a-ca
2015-09-05 16:25:58 +09:00
OTSUKA, Yuanying
31974f2023 Enable barbican in devstack
Magnum will use barbican to store CA and magnum client certs for
TLS support. This patch adds barbican service to devstack
configuration.

Change-Id: Id112699be08788466e7cd9806082e150cbdc15e2
Partial-Implements: blueprint magnum-as-a-ca
2015-08-26 11:13:47 +09:00
Hongbin Lu
d6ccd68575 Remove deprecated config 'verbose'
The OpenStack community decided to deprecate the config 'verbose',
so we remove it from Magnum.

Change-Id: Ia19728e080e1903b118bff33229689b1091d3891
Closes-Bug: #1486308
2015-08-24 19:47:25 +00:00
Hongbin Lu
a2f803f031 Enable ceilometer in devstack
Magnum is going to send metrics/notifications to ceilometer. The
metrics will be leveraged to trigger ceilometer alarms, which is
needed to achieve autoscaling bay.

Change-Id: Ib80c9ab699a72701cefc4dfeb7f2542cecd8f2c9
Partially-Implements: blueprint autoscale-bay
Partially-Implements: blueprint magnum-notifications
2015-08-17 19:06:55 -04:00