summaryrefslogtreecommitdiffstats
path: root/roles/dns-server-detect
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-07-20 14:53:01 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-07-20 14:53:01 +0200
commit1975fb57b4ddee77eec6f849f2c7677e2ee3d6df (patch)
treef2ca419ffe5fc1353ddfa495be98f452acc9f738 /roles/dns-server-detect
parent018d410c4d441a8f66e8ac71d82f4ce46b508364 (diff)
downloadopenshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.tar.gz
openshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.tar.bz2
openshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.tar.xz
openshift-1975fb57b4ddee77eec6f849f2c7677e2ee3d6df.zip
Generate static inventory with shade inventory (#538)
* Autogenerate inventory/hosts when 'inventory: static' (Default), with the shade-inventory tool. * Drop unused anymore: openstack.py and associated GPL notes, an example static inventory, omit manual updates for the inventory DNS names in the deployment guide. * Switch openstack.py formatted inventory hostvars to the shade-inventory format (omit openstack.* from hostvars). * Populate node labels from inventory vars instead of the heat templates combined with inventory vars. * Add app (k8s minions) nodes group for primary node labels. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'roles/dns-server-detect')
-rw-r--r--roles/dns-server-detect/tasks/main.yml20
1 files changed, 10 insertions, 10 deletions
diff --git a/roles/dns-server-detect/tasks/main.yml b/roles/dns-server-detect/tasks/main.yml
index 183c0a0ca..cd775814f 100644
--- a/roles/dns-server-detect/tasks/main.yml
+++ b/roles/dns-server-detect/tasks/main.yml
@@ -2,35 +2,35 @@
- fail:
msg: 'Missing required private DNS server(s)'
when:
- - external_nsupdate_keys['private'] is undefined
- - hostvars[groups['dns'][0]] is undefined
+ - external_nsupdate_keys['private'] is undefined
+ - hostvars[groups['dns'][0]] is undefined
- fail:
msg: 'Missing required public DNS server(s)'
when:
- - external_nsupdate_keys['public'] is undefined
- - hostvars[groups['dns'][0]] is undefined
+ - external_nsupdate_keys['public'] is undefined
+ - hostvars[groups['dns'][0]] is undefined
- name: "Set the private DNS server to use the external value (if provided)"
set_fact:
private_dns_server: "{{ external_nsupdate_keys['private']['server'] }}"
when:
- - external_nsupdate_keys['private'] is defined
+ - external_nsupdate_keys['private'] is defined
- name: "Set the private DNS server to use the provisioned value"
set_fact:
- private_dns_server: "{{ hostvars[groups['dns'][0]].openstack.private_v4 }}"
+ private_dns_server: "{{ hostvars[groups['dns'][0]].private_v4 }}"
when:
- - private_dns_server is undefined
+ - private_dns_server is undefined
- name: "Set the public DNS server to use the external value (if provided)"
set_fact:
public_dns_server: "{{ external_nsupdate_keys['public']['server'] }}"
when:
- - external_nsupdate_keys['public'] is defined
+ - external_nsupdate_keys['public'] is defined
- name: "Set the public DNS server to use the provisioned value"
set_fact:
- public_dns_server: "{{ hostvars[groups['dns'][0]].openstack.public_v4 }}"
+ public_dns_server: "{{ hostvars[groups['dns'][0]].public_v4 }}"
when:
- - public_dns_server is undefined
+ - public_dns_server is undefined