13 files changed, 5 insertions, 55 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..ce67e925 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:
@@ -27,8 +23,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [LoadbalancerServiceBase, role_data, config_settings]
-          - tripleo::loadbalancer::haproxy_service_manage: false
-            tripleo::loadbalancer::mysql_clustercheck: true
-            tripleo::loadbalancer::manage_vip: false
+          - tripleo::haproxy::haproxy_service_manage: false
+            tripleo::haproxy::mysql_clustercheck: true
+            tripleo::haproxy::keepalived: false
       step_config: |
         include ::tripleo::profile::pacemaker::loadbalancer
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..cb9c32d9 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:
@@ -29,5 +25,7 @@ outputs:
         map_merge:
           - get_attr: [NeutronL3Base, role_data, config_settings]
           - tripleo::profile::pacemaker::neutron::enable_l3: True
+            neutron::agents::l3::enabled: false
+            neutron::agents::l3::manage_service: false
       step_config: |
         include ::tripleo::profile::pacemaker::neutron::l3
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: