소스 검색

Fixed problem in template of role debops.radvd. Our interface bat0 is not always available as a fact in ansible, therefore the variable ansible_bat0 is then missing

Till Klocke 9 년 전
부모
커밋
952a314cfc
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 2
      galaxy-roles/debops.radvd/templates/etc/radvd.conf.d/interface.j2
  2. 1 1
      galaxy-roles/usermanage/meta/.galaxy_install_info

+ 2 - 2
galaxy-roles/debops.radvd/templates/etc/radvd.conf.d/interface.j2

@@ -7,7 +7,7 @@ interface {{ item.interface }} {
 {% endif %}
 {% endif %}
 
 
 {% if item.prefixes is defined and item.prefixes %}
 {% if item.prefixes is defined and item.prefixes %}
-{% if hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 is defined and hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 %}
+{% if hostvars[inventory_hostname]["ansible_" + item.interface] is defined and hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 is defined and hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 %}
 {% for element in item.prefixes %}
 {% for element in item.prefixes %}
 {% if element.prefix is defined and element.prefix %}
 {% if element.prefix is defined and element.prefix %}
 {% if element.comment is defined and element.comment %}
 {% if element.comment is defined and element.comment %}
@@ -54,7 +54,7 @@ interface {{ item.interface }} {
 
 
 {% endfor %}
 {% endfor %}
 {% else %}
 {% else %}
-{% if hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 is defined and hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 %}
+{% if hostvars[inventory_hostname]["ansible_" + item.interface] is defined and hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 is defined and hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 %}
 {% set radvd_tpl_nameservers = hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 | map(attribute='address') | list %}
 {% set radvd_tpl_nameservers = hostvars[inventory_hostname]["ansible_" + item.interface].ipv6 | map(attribute='address') | list %}
   # Advertise router on {{ item.interface }} interface as local DNS server
   # Advertise router on {{ item.interface }} interface as local DNS server
   RDNSS {{ radvd_tpl_nameservers | join(" ") }} {
   RDNSS {{ radvd_tpl_nameservers | join(" ") }} {

+ 1 - 1
galaxy-roles/usermanage/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Sat Jul 25 11:16:15 2015', version: master}
+{install_date: 'Sat Jul 25 12:28:15 2015', version: master}