1378 Commits

Author SHA1 Message Date
venkatamahesh
c34b8eb1af Fix the representation of REST
According to the wikipedia page, Representational
state transfer should be written as REST but in some
files it is written as ReST, so I changed it to
correct one

Change-Id: I1909b09fbe3e4ed99d817fdaf0006ef55367e74d
Closes-Bug: #1488816
2015-09-01 08:40:39 +05:30
Jenkins
a6f744b8dd Merge "Set project_id and user_id from context directly" 2015-08-26 17:24:50 +00:00
Jenkins
311773b408 Merge "Fix unit test for replication controller" 2015-08-26 17:22:29 +00:00
OpenStack Proposal Bot
0e0c35d8a2 Updated from global requirements
Change-Id: Ia706efbda46068cbbc2007db19dc0656312712f7
2015-08-26 13:57:41 +00:00
OTSUKA, Yuanying
eff6864da9 Set project_id and user_id from context directly
Currently project_id and user_id are retrieved from auth_token_info,
but these parameters can be retrieved from v3 keystone api only.
Because auth_token_info is different between v2 and v3. If keystone
version v2 is specified in the config file, magnum will not work.

This patch uses "context.project_id" instead of
auth_token_info['token']['project']['id'].
Because auth_token_info['token'] is set by only keystone v3.

Change-Id: I6982f38934c0778d9a0c4271dbe08f0758b671ad
Closes-Bug: #1487992
2015-08-26 14:35:17 +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
Vilobh Meshram
327d2eb852 Gate failure due to introduction of new WSME 0.8.0
Many of the changes on gate are failing because of
Bad Request error. The reason for this is the request
accepts some fields whereas the entire dictionary is
getting passed without applying any filter. This
patch solves the problem. A new WSME version 0.8.0 was
introduced today, which seems to be the cause of this
problem.

http://osdir.com/ml/openstack-dev/2015-08/msg01687.html

Change-Id: I6d40889683449995df7bd7ebcdf755991cef43ef
Closes-bug: #1488687
2015-08-25 18:10:26 -07:00
Vilobh Meshram
afa4b49993 Fix unit test for replication controller
Replication Controller is missing unit test
for getting the replication controller object
by name. This patch adds the needed test. This
patch also adds the missing tenant filter that
was missing initially.

Change-Id: I28bb71f9fba4a335f67324d264bea06d0313d58d
Closes-Bug: #1488295
2015-08-25 11:16:21 -07:00
Jenkins
ef43d2a0fc Merge "documentation: fix formatting" 2015-08-25 10:06:38 +00:00
Jenkins
9c2e8aa26e Merge "Remove retrieving external-network-id" 2015-08-25 10:03:37 +00:00
Antoni S. Puimedon
d091f98d29 documentation: fix formatting
It is good practice for those reading on split terminal consoles to
limit the lines to 80 characters for text (not necessarily for
embedded code. All the other documentation of the project follows it,
so I made this one compliant too.

Change-Id: I48be9e542d9c1a94ae8b9f1c081a702b4ba298f4
2015-08-25 10:42:21 +02:00
OTSUKA, Yuanying
f2580a0c2b Remove retrieving external-network-id
Currently, external-network-id can accept network name,
So we can set external-network name to baymodel.

Change-Id: I0d2be33723817c604c6cab704d2efcbd1e4cc79f
2015-08-25 17:07:10 +09:00
OpenStack Proposal Bot
d757dff0a1 Updated from global requirements
Change-Id: Ieb9f0cf3ee850080852f4012b11ccd6726282ae4
2015-08-25 07:35:56 +00:00
Jenkins
52fbfa0465 Merge "Remove deprecated config 'verbose'" 2015-08-25 04:00:07 +00: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
Lin Yang
fb168ffb47 Remove hardcoded config file in error message
Previously, it throw error message when database connection was
not defined,

"ValueError: Database connection not set in /etc/magnum/magnum.conf"

even if it was explicitly run with "--config-file /other/location".
So remove that hardcoded config file location.

Change-Id: I3af00f1f6572c3cd9e56141e1774acf373bbce8b
Closes-Bug: #1487258
2015-08-24 15:18:30 +08:00
Jenkins
860d3e3fac Merge "Fix race condition in bay_update" 2015-08-24 02:33:06 +00:00
Jenkins
14c464ad3b Merge "Fix wrong usage of filters in periodic task" 2015-08-24 02:27:59 +00:00
Jenkins
44a32c019d Merge "Add 'master_addresses' attribute to bay" 2015-08-24 02:22:25 +00:00
mathspanda
a1ffe63454 Fix wrong usage of filters in periodic task
The filters in method 'sync_bay_status' in periodic.py should be a dict,
instead of a list.

Change-Id: Id12e8768abb17b70bbc92d951b0d95e765d94e38
Closes-Bug: #1487812
2015-08-23 20:22:33 +08:00
Jenkins
f4c3f0540d Merge "Adding more information in dev-quickstart.rst" 2015-08-21 17:09:07 +00:00
Jenkins
f2c7fbed30 Merge "Add required packages to Developer Quick-Start guide" 2015-08-21 17:09:04 +00:00
Vilobh Meshram
6e212a71ae Add 'master_addresses' attribute to bay
A bay has an attribute 'node_addresses' that lists
the IP addresses of each minion node. As the support
of HA mode was added, we need a similar attribute,
known as 'master_addresses', that lists the IP address
of each master node. The fix adds 'master_addresses'
attribute to the Bay object and Bay db model. Changes to
add 'master_addresses' column to Bay are also included
in this patch.

Change-Id: I31965a0397bc5c18ea798eb73791d9ef8c209960
Partial-Bug: #1483047
2015-08-21 10:04:15 -07:00
Jenkins
278751320a Merge "Added gcc in OS-specific prerequisites" 2015-08-21 16:41:02 +00:00
Navneet Gupta
85f038504a Add required packages to Developer Quick-Start guide
Add required packages for Ubuntu(build-essential).
Without them, running tox fails due to not finding gcc.

Change-Id: I42b29ee892869efc50a8c2d1cc43876a76494e8a
Closes-Bug: #1485730
2015-08-21 09:43:31 -05:00
Jenkins
125a303ddb Merge "Fix replication controller unit test sample record" 2015-08-21 08:34:05 +00:00
OpenStack Proposal Bot
9a752c3f7a Updated from global requirements
Change-Id: I291f96a17984b4cda1cc4c55c4398d69b1fa5206
2015-08-21 05:10:03 +00:00
Vilobh Meshram
b89d02065e Fix replication controller unit test sample record
The replication controller db record in the unit test
is misspelled as 'service'. This can be confusing as
we have 'service' as a seperate resource.

Change-Id: I94aea6e9ae28615d251f232b37d545efc4dd8b12
Closes-Bug: #1487244
2015-08-20 17:37:54 -07:00
Jenkins
eea7400054 Merge "Magnum Container Networking Spec" 2015-08-20 18:10:51 +00:00
Hua Wang
8198ef05fc Fix race condition in bay_update
Use HeatPoller to sync node_count to fix race condition.
Previously there is a long time between updating stack and saving
the bay. There may be another update operation in the interval.

Change-Id: I24deeff34184c14a67331630865c125b1bffe3d8
Partial-Implements: blueprint horizontal-scale
2015-08-21 01:19:18 +08:00
Manjeet Singh Bhatia
55a64292cc Adding more information in dev-quickstart.rst
This patch adds more information in dev-quickstart
documentation about heat commands usage.

Change-Id: Ibbc593354731fcfcb203804c95f83c2b9d61874f
Closes-Bug: #1486272
2015-08-20 12:18:13 -04:00
Jenkins
f84997238c Merge "Remove unsed file magnum/config.py" 2015-08-19 11:20:54 +00:00
Hongbin Lu
74b04c34e4 Remove unsed file magnum/config.py
That file is not currently used by anyone. Its job is to setup the
config, which is already handled in magnum/common/config.py.

Change-Id: Ide1622de2ae7b114594f16692a07a6379ee9aa86
Closes-Bug: #1486311
2015-08-18 21:59:40 -04:00
Chandan Kumar
17e706ea4f Added gcc in OS-specific prerequisites
Once magnum is cloned on fedora 21 and when tox is run, it breaks
while installing dependencies. Installing gcc fixes the issue

Closes-Bug: #1486035

Change-Id: I44734b5490585afac23c63ae84c9e8a1d30c828c
2015-08-18 17:17:03 +00:00
Jenkins
4a6ac54bdd Merge "Enable ceilometer in devstack" 2015-08-18 10:40:24 +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
OpenStack Proposal Bot
a1e2645d6e Updated from global requirements
Change-Id: Ic65bfa4584c5ca4da105f6598f4d29a4b144b068
2015-08-17 22:37:03 +00:00
Jenkins
3df5e26a68 Merge "Add X509KeyPair controller and conductor." 2015-08-17 19:25:19 +00:00
Jenkins
f537569528 Merge "Provides correct master IP address for kube-proxy" 2015-08-17 18:43:51 +00:00
Hua Wang
d507069fda Check before _update_stack
If some parameters in bay_update are invalid, we should not update
the stack.

Change-Id: Idd32a07a5b319830710b6ada8284a053d4a65f4f
Closes-Bug: #1484048
2015-08-17 22:13:58 +08:00
Jenkins
733e5c9c14 Merge "Switched to Ubuntu 14.04 LTS (Trusty) base image" 2015-08-17 11:07:40 +00:00
Jenkins
87ef9b1adb Merge "Sets FLANNEL_ETCD to 127.0.0.1:2379" 2015-08-17 11:02:27 +00:00
Madhuri
4eb9425185 Add X509KeyPair controller and conductor.
This patch adds X509KeyPair controller and conductor to handle all
x509keypair related operation and also add test for it.

Change-Id: I5773fcd5bdf8a30fd195714e3e0fdc9d1b0c962d
Partially-Implements: bp secure-kubernetes
2015-08-17 17:56:19 +09:00
Daneyon Hansen
5bd5a52306 Sets FLANNEL_ETCD to 127.0.0.1:2379
This change sets FLANNEL_ETCD to 127.0.0.1:2379 in
/etc/sysconfig/flanneld

Closes-Bug: #1485133

Change-Id: I0312b3670a6cc15e8dc60bb4509d429165469259
2015-08-16 23:28:52 +00:00
Daneyon Hansen
3db4cc83df Provides correct master IP address for kube-proxy
Previously, KUBE_MASTER was not being set in a config file
read by the kube-proxy service. This change adds the KUBE_MASTER
configuration parameter to /etc/kubernetes/config.

Closes-Bug: #1485143

Change-Id: I51a3f12126acc9ba564a8ace6a73852945ed9d5b
2015-08-16 22:44:29 +00:00
OpenStack Proposal Bot
e9da16afdb Updated from global requirements
Change-Id: I0e300aba0c2cb36e488e8767adc5424c41f06ea5
2015-08-15 20:49:56 +00:00
Kai Qiang Wu(Kennan)
644cfdf8b5 Use magnum specific flavor
As infra uses public cloud to run jenkins jobs, some cloud
provider do not have large disk space, for example, only 20GB
root disk, not fit for k8s bay instance space requirements.
According to infra core said, if two instances are booted,
each with 10GB, it could all meet in back end clouds.
So we need to create specific flavor for magnum use. It is
verified in local env 8GB can work, so we will use 8GB now.

Closes-Bug: #1484772
Change-Id: I159623f77ad7e3083a5296b0ccc7d65cfb57e001
2015-08-14 06:36:31 +00:00
Xicheng Chang
5587d2149a Fix typo in dev-build-atmoic-image.rst
"successfuly" => "successfully"
Closes-bug: #1484727

Change-Id: Id79544951ea11d2836a2e1b21c8db7eab578e36a
2015-08-13 16:01:41 -07:00
Jenkins
09e75506da Merge "Updated from global requirements" 2015-08-13 13:57:06 +00:00
Jenkins
5fd2407d46 Merge "Fix race condition when syncing bay status across conductors" 2015-08-13 13:31:39 +00:00