aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-05-19 00:13:11 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-05-30 10:22:59 +0300
commita6438a2082792e7528bfed682c64e352367f8f6f (patch)
treedb0e6236b5951618c20c8401bea2b7259ed2497d /puppet/services/pacemaker
parent5090ae849b6300dba17fb55c250bc50825f7d21e (diff)
Pass MysqlVirtualIP via EndpointMap
By passing the MysqlVirtualIP via the EndpointMap we won't need it to be provided as a parameter to the services. This follows what is already happening for the glance registry service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0. Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Diffstat (limited to 'puppet/services/pacemaker')
-rw-r--r--puppet/services/pacemaker/glance-api.yaml4
-rw-r--r--puppet/services/pacemaker/glance-registry.yaml4
-rw-r--r--puppet/services/pacemaker/heat-api-cfn.yaml4
-rw-r--r--puppet/services/pacemaker/heat-api-cloudwatch.yaml4
-rw-r--r--puppet/services/pacemaker/heat-api.yaml4
-rw-r--r--puppet/services/pacemaker/heat-engine.yaml4
-rw-r--r--puppet/services/pacemaker/keystone.yaml4
-rw-r--r--puppet/services/pacemaker/loadbalancer.yaml4
-rw-r--r--puppet/services/pacemaker/memcached.yaml4
-rw-r--r--puppet/services/pacemaker/neutron-dhcp.yaml4
-rw-r--r--puppet/services/pacemaker/neutron-l3.yaml4
-rw-r--r--puppet/services/pacemaker/neutron-metadata.yaml4
-rw-r--r--puppet/services/pacemaker/rabbitmq.yaml4
13 files changed, 0 insertions, 52 deletions
diff --git a/puppet/services/pacemaker/glance-api.yaml b/puppet/services/pacemaker/glance-api.yaml
index ad964216..5a581dca 100644
--- a/puppet/services/pacemaker/glance-api.yaml
+++ b/puppet/services/pacemaker/glance-api.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
GlanceFilePcmkDevice:
default: ''
description: >
@@ -43,7 +40,6 @@ resources:
type: ../glance-api.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml
index 393fbaaf..8b88cb93 100644
--- a/puppet/services/pacemaker/glance-registry.yaml
+++ b/puppet/services/pacemaker/glance-registry.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
@@ -19,7 +16,6 @@ resources:
type: ../glance-registry.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/heat-api-cfn.yaml b/puppet/services/pacemaker/heat-api-cfn.yaml
index ba620f89..5833c42d 100644
--- a/puppet/services/pacemaker/heat-api-cfn.yaml
+++ b/puppet/services/pacemaker/heat-api-cfn.yaml
@@ -9,16 +9,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
HeatApiCfnBase:
type: ../heat-api-cfn.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/heat-api-cloudwatch.yaml b/puppet/services/pacemaker/heat-api-cloudwatch.yaml
index db71891c..8b67702c 100644
--- a/puppet/services/pacemaker/heat-api-cloudwatch.yaml
+++ b/puppet/services/pacemaker/heat-api-cloudwatch.yaml
@@ -9,16 +9,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
HeatApiCloudwatchBase:
type: ../heat-api-cloudwatch.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/heat-api.yaml b/puppet/services/pacemaker/heat-api.yaml
index b1c37d41..6628e8dd 100644
--- a/puppet/services/pacemaker/heat-api.yaml
+++ b/puppet/services/pacemaker/heat-api.yaml
@@ -9,16 +9,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
HeatApiBase:
type: ../heat-api.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml
index 1e39b363..e1195780 100644
--- a/puppet/services/pacemaker/heat-engine.yaml
+++ b/puppet/services/pacemaker/heat-engine.yaml
@@ -9,16 +9,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
HeatEngineBase:
type: ../heat-engine.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
diff --git a/puppet/services/pacemaker/keystone.yaml b/puppet/services/pacemaker/keystone.yaml
index db52cae7..04e90368 100644
--- a/puppet/services/pacemaker/keystone.yaml
+++ b/puppet/services/pacemaker/keystone.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
@@ -19,7 +16,6 @@ resources:
type: ../keystone.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/loadbalancer.yaml
index 771b3d9b..be6825f6 100644
--- a/puppet/services/pacemaker/loadbalancer.yaml
+++ b/puppet/services/pacemaker/loadbalancer.yaml
@@ -9,16 +9,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
LoadbalancerServiceBase:
type: ../loadbalancer.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/memcached.yaml b/puppet/services/pacemaker/memcached.yaml
index 306f805e..9a11855e 100644
--- a/puppet/services/pacemaker/memcached.yaml
+++ b/puppet/services/pacemaker/memcached.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
@@ -28,4 +25,3 @@ outputs:
- memcached::service_manage: false
step_config: |
include ::tripleo::profile::pacemaker::memcached
-
diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml
index 0e972b28..6f514379 100644
--- a/puppet/services/pacemaker/neutron-dhcp.yaml
+++ b/puppet/services/pacemaker/neutron-dhcp.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
@@ -19,7 +16,6 @@ resources:
type: ../neutron-dhcp.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml
index 84bff808..73ea9d8d 100644
--- a/puppet/services/pacemaker/neutron-l3.yaml
+++ b/puppet/services/pacemaker/neutron-l3.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
@@ -19,7 +16,6 @@ resources:
type: ../neutron-l3.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/neutron-metadata.yaml b/puppet/services/pacemaker/neutron-metadata.yaml
index 79baf1ea..1c74b26f 100644
--- a/puppet/services/pacemaker/neutron-metadata.yaml
+++ b/puppet/services/pacemaker/neutron-metadata.yaml
@@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
@@ -19,7 +16,6 @@ resources:
type: ../neutron-metadata.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data:
diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml
index 613db449..20fb2e40 100644
--- a/puppet/services/pacemaker/rabbitmq.yaml
+++ b/puppet/services/pacemaker/rabbitmq.yaml
@@ -9,16 +9,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- MysqlVirtualIPUri:
- type: string
- default: ''
resources:
RabbitMQServiceBase:
type: ../rabbitmq.yaml
properties:
EndpointMap: {get_param: EndpointMap}
- MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
outputs:
role_data: