Merge "Use already Deployed/Installed servers"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / neutron-dhcp.yaml

diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml
index 4be711c..6f51437 100644 (file)
--- 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:
@@ -29,5 +25,7 @@ outputs:
         map_merge:
           - get_attr: [NeutronDhcpBase, role_data, config_settings]
           - tripleo::profile::pacemaker::neutron::enable_dhcp: True
+            neutron::agents::dhcp::enabled: false
+            neutron::agents::dhcp::manage_service: false
       step_config: |
         include ::tripleo::profile::pacemaker::neutron::dhcp