X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-l3.yaml;h=871766321bbd65f43b4035150ee3f6fa4b010776;hb=e774cb35d5a0658de7595839b0c54c4181181798;hp=84bff8089f8760a9c1ed7d909e28927934cd52ce;hpb=3ddb1136e570906cb9c1f32f9cc6fcd6ccd3ac45;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml
index 84bff808..87176632 100644
--- a/puppet/services/pacemaker/neutron-l3.yaml
+++ b/puppet/services/pacemaker/neutron-l3.yaml
@@ -4,30 +4,40 @@ description: >
   OpenStack Neutron L3 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:
 
   NeutronL3Base:
     type: ../neutron-l3.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 L3 role.
     value:
+      service_name: neutron_l3
       config_settings:
         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