Fix cluster creation with another tenant

This patch fix cluster creation with public template that has been
created in another tenant (not in current).
The problem is that at the particular time configs of cluster and node
groups are merging. And 'tenant_id' property of node group replaces the
same property of cluster config. Therefore, further sahara db api
cannot find this new cluster with current tenant id if node group has
been created in another tenant.

Change-Id: I8eaa4350ec873cca73a6e828efd54200912bacaa
closes-bug: 1585211
This commit is contained in:
Michael Ionkin 2016-05-23 19:29:17 +03:00
parent 7116a3ec34
commit b9b2dca4f9

View File

@ -199,6 +199,7 @@ class ConductorManager(db_base.Base):
del c_tmpl['id'] del c_tmpl['id']
del c_tmpl['is_public'] del c_tmpl['is_public']
del c_tmpl['is_protected'] del c_tmpl['is_protected']
del c_tmpl['tenant_id']
# updating with cluster_template values # updating with cluster_template values
merged_values.update(c_tmpl) merged_values.update(c_tmpl)