diff --git a/prod.hosts b/prod.hosts index 33e7643..3cff188 100644 --- a/prod.hosts +++ b/prod.hosts @@ -1,15 +1,15 @@ # -# Variables used by my playbook +# Variables used by the ITIX playbook # -[lab:vars] -lab_dns_suffix=itix.fr -lab_openshift_version=3.7 +[itix:vars] +itix_dns_suffix=itix.fr +itix_openshift_version=3.7 -[lab:children] +[itix:children] masters # -# Shared variables used by both openshift-ansible and my playbook +# Shared variables used by both openshift-ansible and the ITIX playbook # [all:vars] # Default route suffix diff --git a/roles/name-resolution/tasks/main.yml b/roles/name-resolution/tasks/main.yml index 7a64ecd..ae9d8b3 100644 --- a/roles/name-resolution/tasks/main.yml +++ b/roles/name-resolution/tasks/main.yml @@ -5,7 +5,7 @@ msg: "This playbook requires {{item}} to be set." when: "item is not defined or item == ''" with_items: - - lab_dns_suffix + - itix_dns_suffix - openshift_master_default_subdomain - name: Make sure each machine has an up-to-date /etc/hosts diff --git a/roles/name-resolution/templates/dnsmasq.conf b/roles/name-resolution/templates/dnsmasq.conf index 0b066f1..44744c1 100644 --- a/roles/name-resolution/templates/dnsmasq.conf +++ b/roles/name-resolution/templates/dnsmasq.conf @@ -13,7 +13,7 @@ no-hosts addn-hosts=/etc/hosts.dnsmasq # Default suffix for all machines -domain={{ lab_dns_suffix }} +domain={{ itix_dns_suffix }} # # Wildcard DNS entries (see lab_route_suffix variable) diff --git a/roles/name-resolution/templates/resolv.conf b/roles/name-resolution/templates/resolv.conf index 2b16196..c0393f8 100644 --- a/roles/name-resolution/templates/resolv.conf +++ b/roles/name-resolution/templates/resolv.conf @@ -1,5 +1,5 @@ # {{ ansible_managed }} -search {{ lab_dns_suffix }} +search {{ itix_dns_suffix }} {% for item in groups['name-server'] %} nameserver {{ hostvars[item]['ansible_default_ipv4']['address'] }} {% endfor %} diff --git a/roles/openshift-prereq/tasks/main.yml b/roles/openshift-prereq/tasks/main.yml index 20e58ac..559230f 100644 --- a/roles/openshift-prereq/tasks/main.yml +++ b/roles/openshift-prereq/tasks/main.yml @@ -10,7 +10,7 @@ - rhel-7-server-rpms - rhel-7-server-optional-rpms - rhel-7-server-extras-rpms - - rhel-7-server-ose-{{ lab_openshift_version }}-rpms + - rhel-7-server-ose-{{ itix_openshift_version }}-rpms - rhel-7-fast-datapath-rpms # see https://access.redhat.com/solutions/3008401 tags: rpm