Merge "horizon/keystone api should use internal_api NW"

diff --combined overcloud-without-mergepy.yaml
index e82af0b,f42e0f0..4b969df
--- 1/overcloud-without-mergepy.yaml
--- 2/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@@ -504,14 -504,14 +504,14 @@@ parameters
        GlanceApiNetwork: storage
        GlanceRegistryNetwork: internal_api
        KeystoneAdminApiNetwork: internal_api
-       KeystonePublicApiNetwork: external
+       KeystonePublicApiNetwork: internal_api
        NeutronApiNetwork: internal_api
        HeatApiNetwork: internal_api
        NovaApiNetwork: internal_api
        NovaMetadataNetwork: internal_api
        SwiftMgmtNetwork: storage_mgmt
        SwiftProxyNetwork: storage
-       HorizonNetwork: external
+       HorizonNetwork: internal_api
        MemcachedNetwork: internal_api
        RabbitMqNetwork: internal_api
        RedisNetwork: internal_api
@@@ -627,7 -627,6 +627,7 @@@ resources
            NeutronPublicInterfaceIP: {get_param: NeutronPublicInterfaceIP}
            NeutronFlatNetworks: {get_param: NeutronFlatNetworks}
            NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
 +          NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
            NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges}
            NeutronPublicInterface: {get_param: NeutronPublicInterface}
            NeutronPublicInterfaceDefaultRoute: {get_param: NeutronPublicInterfaceDefaultRoute}