From 9751b87906c953e4fd08e89090568008f57a8218 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Fri, 7 Aug 2015 15:46:18 +0200
Subject: [PATCH] Workaround l23network module issue

* W/a https://github.com/xenolog/l23network/issues/105
* Set use_ovs to true
* Use kind of a "stable" commit of l23network module
  as there is no yet any tags exist

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 resources/node_network_puppet/actions/remove.pp |  2 +-
 resources/node_network_puppet/meta.yaml         |  2 +-
 templates/nodes_network.yml                     | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/node_network_puppet/actions/remove.pp b/resources/node_network_puppet/actions/remove.pp
index 6caa6852..0a01f06d 100644
--- a/resources/node_network_puppet/actions/remove.pp
+++ b/resources/node_network_puppet/actions/remove.pp
@@ -1,3 +1,3 @@
 class {'l23network':
-  package_ensure     => 'absent',
+  ensure_package     => 'absent',
 }
diff --git a/resources/node_network_puppet/meta.yaml b/resources/node_network_puppet/meta.yaml
index 4ddd4d4e..cfeaa13e 100644
--- a/resources/node_network_puppet/meta.yaml
+++ b/resources/node_network_puppet/meta.yaml
@@ -51,7 +51,7 @@ input:
 
     git:
       schema: {repository: str!, branch: str!}
-      value: {repository: 'https://github.com/xenolog/l23network', branch: 'master'}
+      value: {repository: 'https://github.com/xenolog/l23network', branch: '50098cfa1f0f8e8d58e6a6b77a22f1380aa5c426'}
 
     ip:
       schema: str!
diff --git a/templates/nodes_network.yml b/templates/nodes_network.yml
index e21b2c33..cf091262 100644
--- a/templates/nodes_network.yml
+++ b/templates/nodes_network.yml
@@ -6,6 +6,7 @@ resources:
   - id: node1_sdn
     from: resources/node_network_puppet
     values:
+      use_ovs: true
       network_scheme:
         version: '1.1'
         provider: lnx
@@ -54,11 +55,11 @@ resources:
               phy_interfaces:
               - eth1
           br-ex:
-            IP: dhcp
+            IP: 192.168.121.14
             vendor_specific:
               phy_interfaces:
               - eth0
-            gateway: save
+            gateway: 192.168.121.1
         roles:
           management: br-mgmt
           neutron/mesh: br-mesh
@@ -69,6 +70,7 @@ resources:
   - id: node2_sdn
     from: resources/node_network_puppet
     values:
+      use_ovs: true
       network_scheme:
         version: '1.1'
         provider: lnx
@@ -117,11 +119,11 @@ resources:
               phy_interfaces:
               - eth1
           br-ex:
-            IP: dhcp
+            IP: 192.168.121.14
             vendor_specific:
               phy_interfaces:
               - eth0
-            gateway: save
+            gateway: 192.168.121.1
         roles:
           management: br-mgmt
           neutron/mesh: br-mesh