Browse Source

rename variables

master
Nicolas Massé 8 years ago
parent
commit
24d8a2180c
  1. 12
      prod.hosts
  2. 2
      roles/name-resolution/tasks/main.yml
  3. 2
      roles/name-resolution/templates/dnsmasq.conf
  4. 2
      roles/name-resolution/templates/resolv.conf
  5. 2
      roles/openshift-prereq/tasks/main.yml

12
prod.hosts

@ -1,15 +1,15 @@
# #
# Variables used by my playbook # Variables used by the ITIX playbook
# #
[lab:vars] [itix:vars]
lab_dns_suffix=itix.fr itix_dns_suffix=itix.fr
lab_openshift_version=3.7 itix_openshift_version=3.7
[lab:children] [itix:children]
masters masters
# #
# Shared variables used by both openshift-ansible and my playbook # Shared variables used by both openshift-ansible and the ITIX playbook
# #
[all:vars] [all:vars]
# Default route suffix # Default route suffix

2
roles/name-resolution/tasks/main.yml

@ -5,7 +5,7 @@
msg: "This playbook requires {{item}} to be set." msg: "This playbook requires {{item}} to be set."
when: "item is not defined or item == ''" when: "item is not defined or item == ''"
with_items: with_items:
- lab_dns_suffix - itix_dns_suffix
- openshift_master_default_subdomain - openshift_master_default_subdomain
- name: Make sure each machine has an up-to-date /etc/hosts - name: Make sure each machine has an up-to-date /etc/hosts

2
roles/name-resolution/templates/dnsmasq.conf

@ -13,7 +13,7 @@ no-hosts
addn-hosts=/etc/hosts.dnsmasq addn-hosts=/etc/hosts.dnsmasq
# Default suffix for all machines # Default suffix for all machines
domain={{ lab_dns_suffix }} domain={{ itix_dns_suffix }}
# #
# Wildcard DNS entries (see lab_route_suffix variable) # Wildcard DNS entries (see lab_route_suffix variable)

2
roles/name-resolution/templates/resolv.conf

@ -1,5 +1,5 @@
# {{ ansible_managed }} # {{ ansible_managed }}
search {{ lab_dns_suffix }} search {{ itix_dns_suffix }}
{% for item in groups['name-server'] %} {% for item in groups['name-server'] %}
nameserver {{ hostvars[item]['ansible_default_ipv4']['address'] }} nameserver {{ hostvars[item]['ansible_default_ipv4']['address'] }}
{% endfor %} {% endfor %}

2
roles/openshift-prereq/tasks/main.yml

@ -10,7 +10,7 @@
- rhel-7-server-rpms - rhel-7-server-rpms
- rhel-7-server-optional-rpms - rhel-7-server-optional-rpms
- rhel-7-server-extras-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 - rhel-7-fast-datapath-rpms # see https://access.redhat.com/solutions/3008401
tags: rpm tags: rpm

Loading…
Cancel
Save