diff options
author | 2016-08-20 13:03:26 +0000 | |
---|---|---|
committer | 2016-08-20 13:03:26 +0000 | |
commit | 9b2281f8de84e730910342d40b12e37886203087 (patch) | |
tree | 1f7ddfc97f25c7a532ed78446f5ef7f743645e5e /puppet/services/pacemaker/database | |
parent | e03627a05c5ebf89cd078692c06ea237a75b95e2 (diff) | |
parent | 885b37c80ecdae308289cc2e5c2a29dc66710487 (diff) |
Merge "Pass ServiceNetMap to services"
Diffstat (limited to 'puppet/services/pacemaker/database')
-rw-r--r-- | puppet/services/pacemaker/database/mongodb.yaml | 9 | ||||
-rw-r--r-- | puppet/services/pacemaker/database/mysql.yaml | 6 | ||||
-rw-r--r-- | puppet/services/pacemaker/database/redis.yaml | 9 |
3 files changed, 24 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/database/mongodb.yaml b/puppet/services/pacemaker/database/mongodb.yaml index c09f93a9..b53d9c3d 100644 --- a/puppet/services/pacemaker/database/mongodb.yaml +++ b/puppet/services/pacemaker/database/mongodb.yaml @@ -5,6 +5,12 @@ description: > parameters: #Parameters not used EndpointMap + 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 EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -14,6 +20,9 @@ parameters: resources: MongoDbBase: type: ../../database/mongodb-base.yaml + properties: + ServiceNetMap: {get_param: ServiceNetMap} + EndpointMap: {get_param: EndpointMap} outputs: role_data: diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml index cc9dc946..67433caa 100644 --- a/puppet/services/pacemaker/database/mysql.yaml +++ b/puppet/services/pacemaker/database/mysql.yaml @@ -5,6 +5,12 @@ description: > parameters: #Parameters not used EndpointMap + 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 EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml index 3cd8d168..dd677a93 100644 --- a/puppet/services/pacemaker/database/redis.yaml +++ b/puppet/services/pacemaker/database/redis.yaml @@ -4,6 +4,12 @@ description: > OpenStack Redis 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 EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -13,6 +19,9 @@ parameters: resources: RedisBase: type: ../../database/redis-base.yaml + properties: + ServiceNetMap: {get_param: ServiceNetMap} + EndpointMap: {get_param: EndpointMap} outputs: role_data: |