From 553cb0cffa40a5f57313f962b6ec6a9bd89306ba Mon Sep 17 00:00:00 2001
From: Sergey Vasilenko <svasilenko@mirantis.com>
Date: Wed, 11 Mar 2015 15:47:40 +0300
Subject: [PATCH] Revert virtual_router support from l23network::l3::ifconfig

because passing any routes broke possibility of specify and
get network parameters by network roles.

!!! This request should be merged together with the nailgun part:
https://review.openstack.org/#/c/163847/


Change-Id: Idc8d067f6c00aa97c27bf90984d90176796b7644
Partial-bug: #1430774
Closes-bug: #1431935
---
 .../l23network/manifests/l3/ifconfig.pp       | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/deployment/puppet/l23network/manifests/l3/ifconfig.pp b/deployment/puppet/l23network/manifests/l3/ifconfig.pp
index ad8f62512d..cfded7648b 100644
--- a/deployment/puppet/l23network/manifests/l3/ifconfig.pp
+++ b/deployment/puppet/l23network/manifests/l3/ifconfig.pp
@@ -82,8 +82,6 @@ define l23network::l3::ifconfig (
   include ::stdlib
   include ::l23network::params
 
-  $vrouter_gateway = hiera('management_vrouter_vip', undef)
-
   # setup configure method for inteface
   if is_array($ipaddr) {
     # getting array of IP addresses for one interface
@@ -152,24 +150,8 @@ define l23network::l3::ifconfig (
     }
   }
 
-  # # Specify interface file name prefix
-  # if $ifname_order_prefix {
-  #   $interface_file= "${::l23network::params::interfaces_dir}/ifcfg-${ifname_order_prefix}-${interface}"
-  # } else {
-  #   $interface_file= "${::l23network::params::interfaces_dir}/ifcfg-${interface}"
-  # }
-  # File<| title == "${::l23network::params::interfaces_dir}" |> -> File<| title == "${interface_file}" |>
-
   if $method == 'static' {
-    if $vrouter_gateway {
-      $def_gateway = $vrouter_gateway
-    } elsif $gateway and $gateway != 'save' {
-      $def_gateway = $gateway
-    } elsif $gateway == 'save' and $::l3_default_route and $::l3_default_route_interface == $interface {
-      $def_gateway = $::l3_default_route
-    } else {
-      $def_gateway = undef
-    }
+    $def_gateway = $gateway
     # # todo: move routing to separated resource with his own provider
     # if ($def_gateway and !defined(L23network::L3::Defaultroute[$def_gateway])) {
     #   Anchor['l23network::init'] ->
@@ -229,7 +211,6 @@ define l23network::l3::ifconfig (
       ipaddr                => $ipaddr_list,
       gateway               => $def_gateway,
       gateway_metric        => $gateway_metric,
-##    $default_gateway      = false,
 ##    $other_nets           = undef,
 #     dns_nameservers       => $dns_nameservers,
 #     dns_search            => $dns_search_string,