summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2015-04-15 20:36:52 -0400
committerJason DeTiberus <detiber@gmail.com>2015-04-15 20:36:52 -0400
commite85ad297c1be0186261e7be4403e8e0a702277ab (patch)
tree5afdd45cb977081ec407b34036d607d0cdda18f1
parentbc0b703b70d9f36b3ad841409454dd21b1934d92 (diff)
parentaaee17b0fc8feddf31d4e5b46a1bfe2f8dabf16b (diff)
downloadopenshift-e85ad297c1be0186261e7be4403e8e0a702277ab.tar.gz
openshift-e85ad297c1be0186261e7be4403e8e0a702277ab.tar.bz2
openshift-e85ad297c1be0186261e7be4403e8e0a702277ab.tar.xz
openshift-e85ad297c1be0186261e7be4403e8e0a702277ab.zip
Merge pull request #21 from lhuard1A/fix_ansible_libvirt_metadata
Fix libvirt metadata used to store ansible tags
-rwxr-xr-xinventory/libvirt/hosts/libvirt_generic.py2
-rw-r--r--playbooks/libvirt/openshift-cluster/templates/domain.xml10
2 files changed, 7 insertions, 5 deletions
diff --git a/inventory/libvirt/hosts/libvirt_generic.py b/inventory/libvirt/hosts/libvirt_generic.py
index 2e1437903..4652f112e 100755
--- a/inventory/libvirt/hosts/libvirt_generic.py
+++ b/inventory/libvirt/hosts/libvirt_generic.py
@@ -131,7 +131,7 @@ class LibvirtInventory(object):
root = ET.fromstring(domain.XMLDesc())
ns = {'ansible': 'https://github.com/ansible/ansible'}
- for tag_elem in root.findall('./metadata/ansible:tag', ns):
+ for tag_elem in root.findall('./metadata/ansible:tags/ansible:tag', ns):
tag = tag_elem.text
self.push(inventory, "tag_%s" % tag, domain_name)
self.push(hostvars, 'libvirt_tags', tag)
diff --git a/playbooks/libvirt/openshift-cluster/templates/domain.xml b/playbooks/libvirt/openshift-cluster/templates/domain.xml
index 8cb017367..7656249da 100644
--- a/playbooks/libvirt/openshift-cluster/templates/domain.xml
+++ b/playbooks/libvirt/openshift-cluster/templates/domain.xml
@@ -2,10 +2,12 @@
<name>{{ item }}</name>
<memory unit='GiB'>1</memory>
<metadata xmlns:ansible="https://github.com/ansible/ansible">
- <ansible:tag>deployment-type-{{ deployment_type }}</ansible:tag>
- <ansible:tag>env-{{ cluster }}</ansible:tag>
- <ansible:tag>env-host-type-{{ cluster }}-openshift-{{ type }}</ansible:tag>
- <ansible:tag>host-type-{{ type }}</ansible:tag>
+ <ansible:tags>
+ <ansible:tag>deployment-type-{{ deployment_type }}</ansible:tag>
+ <ansible:tag>env-{{ cluster }}</ansible:tag>
+ <ansible:tag>env-host-type-{{ cluster }}-openshift-{{ type }}</ansible:tag>
+ <ansible:tag>host-type-{{ type }}</ansible:tag>
+ </ansible:tags>
</metadata>
<currentMemory unit='GiB'>1</currentMemory>
<vcpu placement='static'>2</vcpu>