diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-11-16 17:07:42 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-11-16 17:07:42 -0500 |
| commit | ad5b5e762b2899fd97520da8c814bcb2a60b5ced (patch) | |
| tree | 5a08fca88e33f198b88260c9f12aaae11ef4cb3f /playbooks/libvirt | |
| parent | 5ed42612965d72b87638ebe2fa96bec89199c4fa (diff) | |
| parent | 56bfd1e0cd39c0cc5b3bd52113e634f3588eb14f (diff) | |
| download | openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.tar.gz openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.tar.bz2 openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.tar.xz openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.zip | |
Merge pull request #912 from twiest/master
sync master -> prod branch
Diffstat (limited to 'playbooks/libvirt')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/list.yml | 8 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml | 2 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/templates/domain.xml | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/playbooks/libvirt/openshift-cluster/list.yml b/playbooks/libvirt/openshift-cluster/list.yml index eaedc4d0d..5954bb01e 100644 --- a/playbooks/libvirt/openshift-cluster/list.yml +++ b/playbooks/libvirt/openshift-cluster/list.yml @@ -18,6 +18,12 @@ - name: List Hosts hosts: oo_list_hosts + +- name: List Hosts + hosts: localhost + gather_facts: no + vars_files: + - vars.yml tasks: - debug: - msg: 'public:{{ansible_default_ipv4.address}} private:{{ansible_default_ipv4.address}}' + msg: "{{ hostvars | oo_select_keys(groups[scratch_group] | default([])) | oo_pretty_print_cluster }}" diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml index 4b91c6da8..4825207c9 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml @@ -81,7 +81,7 @@ ansible_ssh_host: '{{ item.1 }}' ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" - groups: 'tag_env-{{ cluster }}, tag_host-type-{{ type }}, tag_env-host-type-{{ cluster }}-openshift-{{ type }}' + groups: 'tag_env-{{ cluster }}, tag_host-type-{{ type }}, tag_env-host-type-{{ cluster }}-openshift-{{ type }}, tag_sub-host-type-{{ g_sub_host_type }}' with_together: - instances - ips diff --git a/playbooks/libvirt/openshift-cluster/templates/domain.xml b/playbooks/libvirt/openshift-cluster/templates/domain.xml index df200e374..870bcf2a6 100644 --- a/playbooks/libvirt/openshift-cluster/templates/domain.xml +++ b/playbooks/libvirt/openshift-cluster/templates/domain.xml @@ -6,6 +6,7 @@ <ansible:tag>env-{{ cluster }}</ansible:tag> <ansible:tag>env-host-type-{{ cluster }}-openshift-{{ type }}</ansible:tag> <ansible:tag>host-type-{{ type }}</ansible:tag> + <ansible:tag>sub-host-type-{{ g_sub_host_type }}</ansible:tag> </ansible:tags> </metadata> <currentMemory unit='GiB'>1</currentMemory> |