mirror of
https://opendev.org/openstack/ansible-collections-openstack.git
synced 2026-07-30 11:44:31 +00:00
Merge "Ensure coe_cluster_template compare labels properly"
This commit is contained in:
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
bugfixes:
|
||||||
|
- |
|
||||||
|
coe_cluster_template - now labels are converted to strings by module that
|
||||||
|
fixes module idempotence in case label values defined by users are
|
||||||
|
integers or booleans.
|
||||||
@@ -26,6 +26,9 @@
|
|||||||
keypair_id: '{{ keypair.keypair.id }}'
|
keypair_id: '{{ keypair.keypair.id }}'
|
||||||
name: k8s
|
name: k8s
|
||||||
state: present
|
state: present
|
||||||
|
labels:
|
||||||
|
docker_volume_size: 10
|
||||||
|
cloud_provider_tag: v1.23.1
|
||||||
register: coe_cluster_template
|
register: coe_cluster_template
|
||||||
|
|
||||||
- name: Assert return values of coe_cluster_template module
|
- name: Assert return values of coe_cluster_template module
|
||||||
@@ -43,6 +46,9 @@
|
|||||||
keypair_id: '{{ keypair.keypair.id }}'
|
keypair_id: '{{ keypair.keypair.id }}'
|
||||||
name: k8s
|
name: k8s
|
||||||
state: present
|
state: present
|
||||||
|
labels:
|
||||||
|
docker_volume_size: 10
|
||||||
|
cloud_provider_tag: v1.23.1
|
||||||
register: coe_cluster_template
|
register: coe_cluster_template
|
||||||
|
|
||||||
- name: Assert return values of coe_cluster_template module
|
- name: Assert return values of coe_cluster_template module
|
||||||
|
|||||||
@@ -433,6 +433,9 @@ class COEClusterTemplateModule(OpenStackModule):
|
|||||||
if isinstance(labels, str):
|
if isinstance(labels, str):
|
||||||
labels = dict([tuple(kv.split(":"))
|
labels = dict([tuple(kv.split(":"))
|
||||||
for kv in labels.split(",")])
|
for kv in labels.split(",")])
|
||||||
|
elif isinstance(labels, dict):
|
||||||
|
labels = dict({str(k): str(v)
|
||||||
|
for k, v in labels.items()})
|
||||||
if labels != cluster_template['labels']:
|
if labels != cluster_template['labels']:
|
||||||
non_updateable_keys.append('labels')
|
non_updateable_keys.append('labels')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user