Merge "Designate - Use net_cidr_map for rndc_allowed_addresses"

puppet/services/designate-worker.yaml

@@ -94,12 +94,10 @@ outputs:
               params:
                 $NETWORK: {get_param: [ServiceNetMap, DesignateApiNetwork]}
           tripleo::profile::base::designate::rndc_allowed_addresses:
-            # TODO(hjensas): Replace with get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, DesignateApiNetwork]}
-            - str_replace:
-                template:
-                  "%{hiera('$NETWORK_subnet')}"
-                params:
-                  $NETWORK: {get_param: [ServiceNetMap, DesignateApiNetwork]}
+            get_param:
+              - ServiceData
+              - net_cidr_map
+              - {get_param: [ServiceNetMap, DesignateApiNetwork]}
           designate::backend::bind9::rndc_host:
             str_replace:
               template:

tools/yaml-validate.py

@@ -907,6 +907,10 @@ def validate_service_hiera_interpol(f, tpl):
             # Omit apache remoteip proxy_ips
             if 'apache::mod::remoteip::proxy_ips' in path:
                 continue
+            # Omit Designate rndc_allowed_addressses
+            if ('tripleo::profile::base::designate::rndc_allowed_addresses' in
+                    path):
+                continue
 
             # Omit if not a part of {get_param: [ServiceNetMap ...
             if not enter_lists and path[-1] != 'get_param':