Ricardo Rocha 299638507d [k8s] Take kube_tag from cluster if specified ... Labels can be overriden on cluster creation, and should take precendence against the cluster template when passed. When not passed, they are filled with the ones from the template. Fix the setting of kube_tag on the template definition, we were taking the cluster template and ignoring cluster. Change-Id: I8fff6f15a780c74b1f09e7238472620e8f93b532 Closes-Bug: #1739422		2017-12-20 14:07:14 +00:00
..
api	Allow flavor_id on cluster create	2017-12-15 16:32:40 +00:00
cmd	Avoid running periodic processes inside each worker process	2017-09-19 10:06:32 +00:00
common	Register default magnum service and stat policies in code	2017-10-23 02:57:29 +00:00
conductor	Add a hacking rule for string interpolation at logging	2017-07-15 14:49:45 +08:00
conf	Add verify_ca configuration parameter	2017-11-21 10:25:32 -08:00
db	Allow flavor_id on cluster create	2017-12-15 16:32:40 +00:00
drivers	[k8s] Take kube_tag from cluster if specified	2017-12-20 14:07:14 +00:00
hacking	Fix typo in magnum/hacking/checks.py for consistency	2017-06-16 15:43:27 +08:00
objects	Allow flavor_id on cluster create	2017-12-15 16:32:40 +00:00
service	Add a hacking rule for string interpolation at logging	2017-07-15 14:49:45 +08:00
servicegroup	Cleanup MagnumService Object usage	2016-01-29 15:39:28 +08:00
tests	[k8s] Take kube_tag from cluster if specified	2017-12-20 14:07:14 +00:00
__init__.py	Initial commit from github (squashed)	2014-11-18 09:23:37 -05:00
i18n.py	Remove log translations	2017-03-30 17:05:10 +08:00
version.py	Remove coding:utf-8	2015-08-03 23:28:22 +08:00