New version of router.pp - should resolve routing not set in the previous version

manifests/profile/neutron/router.pp

@@ -197,7 +197,7 @@ notify { "br-ex2: $::brex2_eval":
         gateway => $external_gateway1,
         interface => 'br-ex1',
         netmask => '0.0.0.0',
-        network => $external_network1,
+        network => 'default',
         require => Package['ifupdown-extra']
       } ->
       exec { "set_br-ex1_hwaddr":
@@ -212,7 +212,7 @@ notify { "br-ex2: $::brex2_eval":
         command => "ifdown br-ex1 && ifup br-ex1",
         path    => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",     
       }
-    } else 
+    } else { 
       network_config { $external_device1:
         ensure  => 'present',
         family  => 'inet',
@@ -250,49 +250,49 @@ notify { "br-ex2: $::brex2_eval":
       $public_netmask2 = $::facts["netmask_${external_device2}"]
       $public_macaddr2 = $::facts["macaddress_${external_device2}"]
 
-      if $public_ipaddress2 {
-        network_config { $external_device2:
-          ensure  => 'present',
-          family  => 'inet',
-          method  => 'manual',
-          options => {
-            'up' => "ifconfig ${external_device2} 0.0.0.0 promisc up",
-            'down' => "ifconfig ${external_device2} promisc down",
-          },
-        } ->
-        network_config { 'br-ex2':
-          ensure  => 'present',
-          family  => 'inet',
-          method  => 'static',
-          ipaddress => $public_ipaddress2,
-          netmask => $public_netmask2,
-        } ->
-        vs_port { $external_device2:
-          ensure => present,
-          bridge => 'br-ex2',
-          require => Class['::neutron::agents::ml2::ovs'],
-        } -> 
-        network_route { 'route_ext2':
-          ensure => 'present',
-          gateway => $external_gateway2,
-          interface => 'br-ex2',
-          netmask => '0.0.0.0',
-          network => $external_network2,
-          require => Package['ifupdown-extra']
-        } ->
-        exec { "set_br-ex2_hwaddr":
-          command => "ovs-vsctl set bridge br-ex2 other-config:hwaddr=$public_macaddr2",
-          path    => "/usr/local/bin/:/bin/:/usr/bin:/sbin/:/usr/sbin/",
-        } -> 
-        exec { "restart_external2":
-          command => "ifconfig $external_device2 promisc",
-          path    => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",
-        } ->
-        exec { "restart_br-ex2":
-          command => "ifdown br-ex2 && ifup br-ex2",
-          path    => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",     
-        }
-      } else {
+#      if $public_ipaddress2 {
+#        network_config { $external_device2:
+#          ensure  => 'present',
+#          family  => 'inet',
+#          method  => 'manual',
+#          options => {
+#            'up' => "ifconfig ${external_device2} 0.0.0.0 promisc up",
+#            'down' => "ifconfig ${external_device2} promisc down",
+#          },
+#        } ->
+#        network_config { 'br-ex2':
+#          ensure  => 'present',
+#          family  => 'inet',
+#          method  => 'static',
+#          ipaddress => $public_ipaddress2,
+#          netmask => $public_netmask2,
+#        } ->
+#        vs_port { $external_device2:
+#          ensure => present,
+#          bridge => 'br-ex2',
+#          require => Class['::neutron::agents::ml2::ovs'],
+#        } -> 
+#        network_route { 'route_ext2':
+#          ensure => 'present',
+#          gateway => $external_gateway2,
+#          interface => 'br-ex2',
+#          netmask => '0.0.0.0',
+#          network => $external_network2,
+#          require => Package['ifupdown-extra']
+#        } ->
+#        exec { "set_br-ex2_hwaddr":
+#          command => "ovs-vsctl set bridge br-ex2 other-config:hwaddr=$public_macaddr2",
+#          path    => "/usr/local/bin/:/bin/:/usr/bin:/sbin/:/usr/sbin/",
+#        } -> 
+#        exec { "restart_external2":
+#          command => "ifconfig $external_device2 0.0.0.0 promisc",
+#          path    => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",
+#        } ->
+#        exec { "restart_br-ex2":
+#          command => "ifdown br-ex2 && ifup br-ex2",
+#          path    => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",     
+#        }
+#      } else {
         network_config { $external_device2:
           ensure  => 'present',
           family  => 'inet',
@@ -311,7 +311,7 @@ notify { "br-ex2: $::brex2_eval":
           command => "ovs-vsctl set bridge br-ex2 other-config:hwaddr=$public_macaddr2",
           path    => "/usr/local/bin/:/bin/:/usr/bin:/sbin/:/usr/sbin/",
         } 
-      }
+#      }
     }
   }