diff --git a/src/server_mgr_puppet.py b/src/server_mgr_puppet.py
index 6a563fc1..5bff81c6 100644
--- a/src/server_mgr_puppet.py
+++ b/src/server_mgr_puppet.py
@@ -636,7 +636,7 @@ def build_openstack_hiera_file(
         # Get all values needed to fill the template.
         self_ip = server.get("ip_address", "")
 
-        openstack_ips = [x["ip_address"] for x in cluster_servers if "openstack" in eval(server.get('roles', '[]'))]
+        openstack_ips = [x["ip_address"] for x in cluster_servers if "openstack" in eval(x.get('roles', '[]'))]
         if self_ip in openstack_ips:
             openstack_ip = self_ip
         else: