Ironic: enabled_services moved from ironic to ironic::conductor manifest

[apex-tripleo-heat-templates.git] / puppet / services / memcached.yaml

diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml
index 1833fbf..9e3f637 100644 (file)
--- a/puppet/services/memcached.yaml
+++ b/puppet/services/memcached.yaml
@@ -4,20 +4,39 @@ description: >
   Memcached service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
+  MonitoringSubscriptionMemcached:
+    default: 'overcloud-memcached'
     type: string
-    default: ''
 
 outputs:
   role_data:
     description: Role data for the Memcached role.
     value:
+      service_name: memcached
+      monitoring_subscription: {get_param: MonitoringSubscriptionMemcached}
       config_settings:
+        # NOTE: bind IP is found in Heat replacing the network name with the local node IP
+        # for the given network; replacement examples (eg. for internal_api):
+        # internal_api -> IP
+        # internal_api_uri -> [IP]
+        # internal_api_subnet - > IP/CIDR
+        memcached::listen_ip: {get_param: [ServiceNetMap, MemcachedNetwork]}
+        tripleo.memcached.firewall_rules:
+          '121 memcached':
+            dport: 11211
       step_config: |
         include ::tripleo::profile::base::memcached
-