X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-dhcp.yaml;h=f5f785e3306b7f0784eef6b90316432e80fb2a26;hb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;hp=4be711ca7354a80add131eb9b2d6e74f488ad8b1;hpb=30c8663b9f3360e5c83413cf2b7487e99b805950;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml
index 4be711ca..f5f785e3 100644
--- a/puppet/services/pacemaker/neutron-dhcp.yaml
+++ b/puppet/services/pacemaker/neutron-dhcp.yaml
@@ -4,30 +4,40 @@ description: >
   OpenStack Neutron DHCP service with Pacemaker 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:
-    type: string
-    default: ''
 
 resources:
 
   NeutronDhcpBase:
     type: ../neutron-dhcp.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
 
 outputs:
   role_data:
     description: Role data for the Neutron DHCP role.
     value:
+      service_name: neutron_dhcp
       config_settings:
         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