diff --git a/roles/tripleo-hieradata/templates/all_nodes.j2 b/roles/tripleo-hieradata/templates/all_nodes.j2
index 1c48fab5d..fc5f31e5b 100644
--- a/roles/tripleo-hieradata/templates/all_nodes.j2
+++ b/roles/tripleo-hieradata/templates/all_nodes.j2
@@ -30,7 +30,7 @@
   {% endfor %}
 
   {# <service>_network: <network> #}
-  {% for service, network in service_net_map.iteritems() %}
+  {% for service, network in service_net_map.items() %}
   {{ '"' ~ service ~ '": "' ~ network ~ '",' }}
   {% endfor %}
 
diff --git a/roles/tripleo-hieradata/templates/vip_data.j2 b/roles/tripleo-hieradata/templates/vip_data.j2
index db5303423..c1993152b 100644
--- a/roles/tripleo-hieradata/templates/vip_data.j2
+++ b/roles/tripleo-hieradata/templates/vip_data.j2
@@ -43,7 +43,7 @@
 "enable_internal_tls": {{ enable_internal_tls | lower }}
 
 {%- for service in enabled_services %}
-{%- if net_vip_map.has_key(service_net_map.get(service ~ '_network', 'noop')) %}
+{%- if service_net_map.get(service ~ '_network', 'noop') in net_vip_map %}
 {# we set explicit vips for these services, no need to calculate them dynamically #}
 {%- if service not in ['redis', 'ganesha', 'keystone_admin_api_vip', 'keystone_public_api_vip'] %}
 ,"{{service}}_vip": "{{ net_vip_map[service_net_map[service ~ '_network']] }}"