Merge "Fix nuage firewall rules"

deployment/neutron/neutron-controller-plugin-nuage.yaml

@@ -60,6 +60,13 @@ outputs:
   role_data:
     description: Role data for the Neutron Controller  Nuage plugin
     value:
+      firewall_rules:
+        - if:
+          - apply_vxlan_iptables_rule
+          - '118 neutron vxlan networks':
+              proto: 'udp'
+              dport: 4789
+          - {}
       service_name: neutron_controller_plugin_nuage
       config_settings:
         map_merge:
@@ -68,14 +75,5 @@ outputs:
             nuage::vrs::bridge_mtu: {get_param: NuageBridgeMTU}
             nuage::vrs::disable_dhcp4: {get_param: NuageDisableDhcp4}
             tripleo::profile::base::neutron::agents::nuage::enable_metadata_agent: {get_param: NuageControllerEnableMetadataAgent}
-          - if:
-            - apply_vxlan_iptables_rule
-            - tripleo.neutron_controller_plugin_nuage.firewall_rules:
-                '118 neutron vxlan networks':
-                  proto: 'udp'
-                  dport: 4789
-            - {}
-
       step_config: |
         include ::tripleo::profile::base::neutron::agents::nuage
-