From e29ee11b655a3d4fb00ea4a417a2f6b7f81a99ee Mon Sep 17 00:00:00 2001
From: Proskurin Kirill <kproskurin@mirantis.com>
Date: Mon, 16 Jan 2017 15:18:58 +0000
Subject: [PATCH] Create initial network depending on plugin agent type

Create 'local' network if neutron.plugin_agent is 'calico'.

Change-Id: Idec8c794320aadcc295718bccd21608946b1a3db
Closes-Bug: #1645779
Co-Authored-By: Alexander Saprykin <cutwatercore@gmail.com>
---
 service/calico-felix.yaml     | 11 +++++++++++
 service/neutron-l3-agent.yaml |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/service/calico-felix.yaml b/service/calico-felix.yaml
index 8d06a4f..10e8534 100644
--- a/service/calico-felix.yaml
+++ b/service/calico-felix.yaml
@@ -16,6 +16,17 @@ service:
           - neutron.conf
           - ml2-conf.ini
           - felix.cfg
+      # {% set int = neutron.bootstrap.internal %}
+      # {% if int.enable %}
+      # {% if     neutron.plugin_agent == 'calico' %}
+      post:
+        - name: neutron-bootstrap-int-net-create
+          type: single
+          dependencies:
+            - neutron-server
+          command: openstack network create --provider-network-type local {{ int.net_name }}
+      # {%        endif %}
+      # {% endif %}
 files:
   neutron.conf:
     path: /etc/neutron/neutron.conf
diff --git a/service/neutron-l3-agent.yaml b/service/neutron-l3-agent.yaml
index 72a6245..fd0934f 100644
--- a/service/neutron-l3-agent.yaml
+++ b/service/neutron-l3-agent.yaml
@@ -32,11 +32,13 @@ service:
 
         # {% set int = neutron.bootstrap.internal %}
         # {% if int.enable %}
+        # {% if     neutron.plugin_agent == 'vxlan' %}
         - name: neutron-bootstrap-int-net-create
           type: single
           dependencies:
             - neutron-server
           command: openstack network create --provider-network-type vxlan --provider-segment 77 {{ int.net_name }}
+        # {%        endif %}
         - name: neutron-bootstrap-int-net-subnetpool-create
           type: single
           dependencies: