Merge "Add Keystone admin/public to enabled services list"

Author: Zuul

overcloud.j2.yaml

@@ -543,8 +543,17 @@ resources:
       type: comma_delimited_list
       value:
         yaql:
-          expression: coalesce($.data, []).where($ != null)
-          data: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_names]}
+          expression: let(root => $) -> $.data.extra_services.items().where($[0] in coalesce($root.data.enabled_services, [])).select($[1]).flatten() + coalesce($root.data.enabled_services, [])
+          data:
+            enabled_services: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_names]}
+            extra_services:
+              # If anything other than keystone needs this
+              # then we should add an extra_networks interface
+              # to the service templates role_data but for
+              # now we hard-code the keystone special case
+              keystone:
+                - keystone_admin_api
+                - keystone_public_api
 
   {{role.name}}HostsDeployment:
     type: OS::Heat::StructuredDeployments