Add options OpflexEndpointReqTimeout, OpflexNatMtuSize, AciKeystoneNotificationPurge

+  OpflexEndpointReqTimeout:
+    default: 10
+    type: number
+  OpflexNatMtuSize:
+    default: 0
+    type: number
+  AciKeystoneNotificationPurge:
+    type: boolean
+    default: true
+    description: >
+      When true, act on keystone notifications to purge
On compute nodes remove the ovs bridge option which is not needed and add the patch bridge option that was missing

Author: Ratnakar Kolli

tripleo-ciscoaci/files/service-ciscoaci-compute.yaml

@@ -30,12 +30,17 @@ parameters:
   ACIApicInfraAnycastAddr:
     type: string
     default: '10.0.0.32'
-  ACIOpflexOVSBridge:
-    type: string
-    default: 'br-int'
   ACIOpflexUplinkInterface:
     type: string
     default: 'nic1'
+  ACIOpflexBridgeToPatch:
+    type: string
+    default: 'br-ex'
+    description: >
+     When opflex is used in VLAN encap mode, the interface connected to ACI fabric should
+     be part of integration bridge br-int. In some network configuration, the interface could
+     already be part of other bridge for example br-ex. Setting this value to br-ex will create
+     a patch interface between br-int and br-ex. If set to empty string, no patch will be created
   ACIOpflexEncapMode:
     type: string
     default: 'vxlan'  
@@ -69,7 +74,7 @@ outputs:
             ciscoaci::opflex::aci_apic_infra_anycast_address: {get_param: ACIApicInfraAnycastAddr}    
             ciscoaci::opflex::aci_opflex_uplink_interface: {get_param: ACIOpflexUplinkInterface}
             ciscoaci::opflex::aci_opflex_encap_mode: {get_param: ACIOpflexEncapMode}
-            ciscoaci::opflex::aci_opflex_ovs_bridge: {get_param: ACIOpflexOVSBridge}
+            ciscoaci::opflex::opflex_target_bridge_to_patch: {get_param: ACIOpflexBridgeToPatch}
             ciscoaci::compute::use_lldp_discovery: {get_param: ACIUseLldp}
       step_config: |
         include tripleo::profile::base::ciscoaci_compute

tripleo-ciscoaci/files/service-ciscoaci.yaml

@@ -50,9 +50,6 @@ parameters:
   ACIApicInfraAnycastAddr:
     type: string
     default: '10.0.0.32'
-  ACIOpflexOVSBridge:
-    type: string
-    default: 'br-int'
   ACIOpflexUplinkInterface:
     type: string
     default: 'nic1'
@@ -131,6 +128,17 @@ parameters:
       interfaces on each agent.
     type: comma_delimited_list
     default: ""
+  OpflexEndpointReqTimeout:
+    default: 10
+    type: number
+  OpflexNatMtuSize:
+    default: 0
+    type: number
+  AciKeystoneNotificationPurge:
+    type: boolean
+    default: true
+    description: >
+      When true, act on keystone notifications to purge
 resources:
   NeutronBase:
     type: /usr/share/openstack-tripleo-heat-templates/puppet/services/neutron-base.yaml
@@ -184,7 +192,6 @@ outputs:
             ciscoaci::opflex::aci_apic_infra_anycast_address: {get_param: ACIApicInfraAnycastAddr}    
             ciscoaci::opflex::aci_opflex_uplink_interface: {get_param: ACIOpflexUplinkInterface}
             ciscoaci::opflex::aci_opflex_encap_mode: {get_param: ACIOpflexEncapMode}
-            ciscoaci::opflex::aci_opflex_ovs_bridge: {get_param: ACIOpflexOVSBridge}
             ciscoaci::opflex::opflex_target_bridge_to_patch: {get_param: ACIOpflexBridgeToPatch}
             ciscoaci::aim_config::rabbit_password: {get_param: RabbitPassword}
             ciscoaci::aim_config::rabbit_user: {get_param: RabbitUserName}
@@ -200,5 +207,8 @@ outputs:
                 params:
                   RANGES: {get_param: NeutronNetworkVLANRanges}
             ciscoaci::aim_config::physical_device_mappings: {get_param: NeutronPhysicalDevMappings}
+            ciscoaci::aim::opflex_endpoint_request_timeout: {get_param: OpflexEndpointReqTimeout}
+            ciscoaci::aim::opflex_nat_mtu_size: {get_param: OpflexNatMtuSize}
+            ciscoaci::aim::enable_keystone_notification_purge: {get_param:  AciKeystoneNotificationPurge}
       step_config: |
         include tripleo::profile::base::ciscoaci