324 Commits

Author SHA1 Message Date
Jenkins
953139c9f9 Merge "Add rc_data support for magnum replication controller" 2015-01-14 04:51:38 +00:00
Jenkins
1cf1678177 Merge "Sync from oslo requirements" 2015-01-14 01:15:01 +00:00
Kennan
2fd10c5fca Sync from oslo requirements
it is needed to synch from requirements for future integration
with openstack requirements easily in kilo or later

refer: https://github.com/openstack/requirements

Change-Id: I752cf7ad8dcc4c576b67f63ee2da5e56da6f6fee
2015-01-14 08:29:17 +08:00
Jay Lau (Guangya Liu)
9c68323035 Add rc_data support for magnum replication controller
Change-Id: I041ee8a4e111d6c900ff6d654eeb23d61fff28ff
2015-01-13 18:53:44 -05:00
OTSUKA, Yuanying
444a202859 Implement service deletion
Service deletion is working from magnum api.

Change-Id: Ifbd10246682dda32bb28bbc1d640ff365d53495d
2015-01-14 07:08:03 +09:00
OTSUKA, Yuanying
b982600545 Set service name from service manifest
Only service manifest knows about service name, so this patch retrieve service
name from service manifest.

Change-Id: I1eb0f7dd7227875e1d10e5bd1d22f7e989e15f86
2015-01-14 07:08:03 +09:00
Jenkins
978b28e4ea Merge "Implement pod deletion" 2015-01-13 21:00:40 +00:00
Jenkins
464a4422b7 Merge "Set pod name from pod manifest" 2015-01-13 21:00:31 +00:00
Jenkins
b1d5b4cf81 Merge "Add parser for k8s manifest" 2015-01-13 21:00:24 +00:00
Jay Lau (Guangya Liu)
1c5361304d Enable kube.py get k8s api server port from baymodel
Implements part of bp override-native-rest-port

Change-Id: I8a061d97757d5284c277675c46c416a88b64d895
2015-01-13 10:18:08 -05:00
OTSUKA, Yuanying
b30b4f1f25 Implement pod deletion
Pod deletion is working from magnum api.

Change-Id: I6b6ccc9d95bddc42a98450cebac15bfd7aceab37
2015-01-13 23:37:49 +09:00
OTSUKA, Yuanying
5fe240f50e Set pod name from pod manifest
Only pod manifest knows about pod name, so this patch retrieve pod name from
pod manifest.

Change-Id: I7ad53e1ddcef76a644c8da7b7369423705c72a2c
2015-01-13 23:37:49 +09:00
OTSUKA, Yuanying
1db6c60d3a Add parser for k8s manifest
When creating a service/pod, Magnum needs its name and more additional
information to store database.
This parser allows it.

Change-Id: I6e2a028f0caa7dbbd3a6de20aa3c982fb870c24a
2015-01-13 23:37:33 +09:00
Jenkins
bbb4c7f0b5 Merge "Parse stack output value for bay" 2015-01-13 05:21:30 +00:00
Jenkins
cde618983a Merge "Remove apiserver_port attribute from bay_definition" 2015-01-13 05:16:31 +00:00
Jenkins
56594abcb7 Merge "Add tests for baymodel rest api" 2015-01-13 02:25:59 +00:00
Jenkins
6beba07035 Merge "Fix the list of unset fields in baymodel" 2015-01-13 02:25:20 +00:00
Jenkins
20c7b07acf Merge "Add max_limit to sample config" 2015-01-13 02:23:55 +00:00
OTSUKA, Yuanying
cdd963fd2d Parse stack output value for bay
To retrieve a k8s address correctly, this parses stack output values.
Sequence of outputs seems have no particular order.

Change-Id: I2ab74528a0914d4bd63ce65a5c62211ccc6d723a
2015-01-13 10:37:10 +09:00
OTSUKA, Yuanying
596233a2b4 Remove apiserver_port attribute from bay_definition
In this time, our heat-template doesn't support apiserver_port parameter.
So this parameter causes failing to create a stack.
This patch removes this parameter to use.

Change-Id: I8edd23a9464fed45c87f14aaa0d3609ad7f07fc2
2015-01-13 10:37:05 +09:00
Hongbin Lu
794322c2fe Add tests for baymodel rest api
Change-Id: Ie56d32638af04df5c0a6e1684c7673b22c919e0d
2015-01-12 17:15:49 +00:00
Hongbin Lu
566219a1f1 Fix the list of unset fields in baymodel
Change-Id: I6a29ab8b7f635c1883f79b672f8b76a2ce94cc6e
2015-01-12 15:50:38 +00:00
Hongbin Lu
01be8b5ba9 Add max_limit to sample config
Change-Id: I24ab855d2eb0b14a1da3b56808eaf3f10d506ff2
2015-01-12 15:48:46 +00:00
Jay Lau (Guangya Liu)
a7f505810f Update the sequence for master_address and minion_addresses
In the output of kubecluster.yaml, master_address is the 0th value
and minion_addresses is the 2nd value

Change-Id: I5c0c481c37ad3f2b23dfe0f1c6c70ce74c3290f1
2015-01-12 01:11:57 -05:00
Jenkins
661b790815 Merge "Add use case: Permit use of native ReST APIs" 2015-01-11 20:28:51 +00:00
Jenkins
a0ac173518 Merge "Correct the typo in dev-quickstart.rst" 2015-01-11 20:26:54 +00:00
Jenkins
3013d2fbca Merge "Add apiserver_port to BayModel" 2015-01-11 20:26:31 +00:00
eric
63e15bef8b Correct the typo in dev-quickstart.rst
In dev-quickstart.rst, change the word "Ironic" to "Magnum".

Change-Id: Id4d8c114483f7ca1bdf1eef044eafe8247f27184
Closes-Bug: #1408569
2015-01-11 22:42:48 +08:00
Jenkins
17ad62fc35 Merge "Add tests for objects" 2015-01-11 06:34:35 +00:00
Hongbin Lu
52abfd7e1c Add tests for objects
Implements: blueprint increase-test-coverage
Change-Id: I41619570a5b37ef70af1997e710019ff96a5ef42
2015-01-11 03:09:21 +00:00
Jay Lau (Guangya Liu)
557a1457ed Add apiserver_port to BayModel
Implements part of bp override-native-rest-port

Change-Id: I335d12a111ec433b6c312b119a6b4466c5480f15
2015-01-10 21:31:41 -05:00
Jay Lau (Guangya Liu)
1f9ac87503 Add some test for magnum objects
Change-Id: I548a9557991f906cebf6cf672178ce0874372d12
2015-01-10 10:15:45 -05:00
Jenkins
548780ff99 Merge "Merge larsks/heat-kubernetes to Magnum" 2015-01-09 18:29:50 +00:00
Hongbin Lu
45343d34cc Remove inappropriate exceptions and their usages
Change-Id: Iab8c035cca32190a8be9b68a180ebe752582a51b
2015-01-09 03:16:35 +00:00
Steven Dake
f4968bb277 Add use case: Permit use of native ReST APIs
The ability to use native ReST APIs may be important for some users
of Magnum who only want to take advantage of the bay management
features.

Change-Id: I33ec50418b7ebd25786a51edff912e58d6731044
2015-01-08 13:54:57 -07:00
Jenkins
d8df3b3a4c Merge "Implement service creation" 2015-01-08 15:10:47 +00:00
Jenkins
5300e990be Merge "Implement pod creation" 2015-01-08 15:10:39 +00:00
OTSUKA, Yuanying
bdabe2e592 Implement service creation
Service creation is working from magnum api now.

Change-Id: I97fbe4e47c444969ff77adb600b4fd7203eeb194
2015-01-08 16:40:18 +09:00
OTSUKA, Yuanying
5d79a518bc Implement pod creation
Pod creation is working from magnum api now.

Change-Id: I4d8359302306d3bfafaf2c57ba9706d8a3f21629
2015-01-08 15:07:24 +09:00
Hongbin Lu
9ab299d69a Fix dbapi method _add_baymodels_filters
Change-Id: Id522322a461bcbed50970c22dceecbc87cab1c39
2015-01-08 03:29:39 +00:00
Hongbin Lu
decfb9c747 Raise on deleting a referenced baymodel
Change-Id: Ic3c4c38b290e9000d8f3838839b8690bf16335bb
2015-01-08 03:22:34 +00:00
Jenkins
19cd902e06 Merge "Update README.rst" 2015-01-07 15:33:35 +00:00
Steven Dake
d0fbd09874 Update README.rst
Fix a spelling error (ugh) and also change any reference of magnum-backend
to magnum-conductor.

Change-Id: Ib27d1e580543091a1e465cdcf70883df4f5f225b
2015-01-07 07:43:16 -07:00
Jay Lau (Guangya Liu)
2eb763fd23 Merge larsks/heat-kubernetes to Magnum
In 20150106 IRC meeting, we decide to add two templates to magnum
for creating bays. One for virt and the other is for ironic.

larsks/heat-kubernetes is for virt and we can merge it first.

Change-Id: I9db19c006db9c9b725a562f532448d447761542f
2015-01-07 09:27:10 -05:00
Jenkins
eee4720788 Merge "Add unit tests for dbapi of Node and Container" 2015-01-07 13:09:31 +00:00
Jenkins
dd9779b8a0 Merge "Docker: Pull Image Before Container Create" 2015-01-06 23:09:28 +00:00
Andrew Melton
46ebff53e6 Docker: Pull Image Before Container Create
The image needs to be pulled so that it's available for
subsequent inspect and create calls.

Change-Id: I7f2731911a3fc71fbbf3b408b39e57b7521db81f
Closes-bug: #1408101
2015-01-06 13:28:39 -08:00
Jenkins
34abc87d6a Merge "Add some comments for delete logic in bay_create" 2015-01-06 19:46:56 +00:00
Adrian Otto
b7905c76c4 Adjusted README to add ReplicationController
Change-Id: I913ff2be4754540e6d1e1f6f267c7cb356f707e8
2015-01-06 16:54:58 +00:00
Jenkins
c22e2fa328 Merge "Implements k8s resource creation/updating with data" 2015-01-06 15:56:40 +00:00