summaryrefslogtreecommitdiffstats
path: root/playbooks/libvirt/openshift-cluster
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2016-11-24 17:12:44 +0100
committerLénaïc Huard <lhuard@amadeus.com>2016-11-24 17:12:44 +0100
commit8461cb5dff9c76b902af6ba096a53ac611fa3d40 (patch)
tree91c413593d4454e92daa9b3bb95585ac40ed19e9 /playbooks/libvirt/openshift-cluster
parent90fb07f40aa3945e71d3941bca54867c649bc95f (diff)
downloadopenshift-8461cb5dff9c76b902af6ba096a53ac611fa3d40.tar.gz
openshift-8461cb5dff9c76b902af6ba096a53ac611fa3d40.tar.bz2
openshift-8461cb5dff9c76b902af6ba096a53ac611fa3d40.tar.xz
openshift-8461cb5dff9c76b902af6ba096a53ac611fa3d40.zip
Fix the list done after cluster creation on libvirt and OpenStack
The `list.yml` playbooks are using cloud provider specific variables to find the IPs of the VMs since 82449c6. Those “cloud provider specific” variables are the ones provided by the dynamic inventories. But there was a problem when the `list.yml` playbooks are invoked from the `launch.yml` ones because, in that case, the inventory is not coming from the dynamic inventory scripts, but from the `add_host` done inside `launch_instances.yml`. Whereas the GCE and AWS `launch_instances.yml` were correctly adding in the `add_host` the variables used by `list.yml`, libvirt and OpenStack were missing that. Fixes #2856
Diffstat (limited to 'playbooks/libvirt/openshift-cluster')
-rw-r--r--playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
index e0afc43ba..31a13aa2a 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
@@ -116,6 +116,7 @@
ansible_become: "{{ deployment_vars[deployment_type].become }}"
groups: "tag_environment-{{ cluster_env }}, tag_host-type-{{ type }}, tag_sub-host-type-{{ g_sub_host_type }}, tag_clusterid-{{ cluster_id }}"
openshift_node_labels: "{{ node_label }}"
+ libvirt_ip_address: "{{ item.1 }}"
with_together:
- '{{ instances }}'
- '{{ ips }}'