Make memcached port parameters globally available

The memcached_port parameter and the memcached_authtoken_port parameter
are used in each api service. Because memcached and each api services
are not always collocated, we should use global hieradata to ensure
the parameters defined in memcached service resource are propagated to
all nodes in the deployment.

Change-Id: I54d45bbb26a4a04cb3cf87b9bd8a2290998279fc
(cherry picked from commit a7d2386438)

deployment/memcached/memcached-container-puppet.yaml

@@ -219,15 +219,6 @@ outputs:
             memcached::disable_cachedump: true
             memcached::logstdout: true
             tripleo::profile::base::memcached::enable_internal_memcached_tls: {get_param: MemcachedTLS}
-          - if:
-            # NOTE: This config is necessary while there are still services
-            # consuming Memcached that do not support TLS. Once all services
-            # do support TLS, this config should be dropped.
-            - enable_non_tls_port
-            - memcached_port: {get_param: MemcachedPort}
-              memcached_authtoken_port: 11211
-            - memcached_port: {get_param: MemcachedPort}
-              memcached_authtoken_port: {get_param: MemcachedPort}
           - if:
             - {get_param: MemcachedTLS}
             - tripleo::memcached::service_certificate: '/etc/pki/tls/certs/memcached.crt'
@@ -246,6 +237,16 @@ outputs:
                     - enable_non_tls_port
                     - 11211
                     - {get_param: MemcachedPort}
+      global_config_settings:
+        # NOTE: This config is necessary while there are still services
+        # consuming Memcached that do not support TLS. Once all services
+        # do support TLS, this config should be dropped.
+        if:
+        - enable_non_tls_port
+        - memcached_port: {get_param: MemcachedPort}
+          memcached_authtoken_port: 11211
+        - memcached_port: {get_param: MemcachedPort}
+          memcached_authtoken_port: {get_param: MemcachedPort}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: 'memcached'

environments/ssl/enable-memcached-tls.yaml

@@ -5,6 +5,3 @@
 parameter_defaults:
   MemcachedTLS: true
   MemcachedPort: 11212
-  ExtraConfig:
-    memcached_port: 11212
-    memcached_authtoken_port: 11211