From 1450119e86a5d918dacdbc3eb08ed9b5c014d591 Mon Sep 17 00:00:00 2001
From: Juan Vidal <juan.vidal.allende@ericsson.com>
Date: Tue, 1 Aug 2017 14:09:36 +0200
Subject: [PATCH] Add support for OpenDaylight deployment in neutron

 - Added dependency to 'opendaylight' role
 - New 'opendaylight' target group
 - Configuration of networking-odl version that matches neutron

Change-Id: I45ca9135341d7cc9e86776196c60bbfe7d7a4ed5
---
 ansible-role-requirements.yml                  |  4 ++++
 .../defaults/repo_packages/opendaylight.yml    | 18 ++++++++++++++++++
 playbooks/inventory/env.d/neutron.yml          |  4 ++++
 tests/test_inventory.py                        |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 playbooks/defaults/repo_packages/opendaylight.yml

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 22ad41b8fc..c527d5deab 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -194,3 +194,7 @@
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
   version: master
+- name: opendaylight
+  scm: git
+  src: https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
+  version: master
diff --git a/playbooks/defaults/repo_packages/opendaylight.yml b/playbooks/defaults/repo_packages/opendaylight.yml
new file mode 100644
index 0000000000..4b30768a1c
--- /dev/null
+++ b/playbooks/defaults/repo_packages/opendaylight.yml
@@ -0,0 +1,18 @@
+---
+# Copyright 2017, Ericsson AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
+networking_odl_git_install_branch: 13ad1ea1feee6f5e6f8ccd9c2676a4c38cfbd8c5 # Tag 11.0.0.0b2
+networking_odl_project_group: neutron_all
diff --git a/playbooks/inventory/env.d/neutron.yml b/playbooks/inventory/env.d/neutron.yml
index 2b39b80f22..276713a602 100644
--- a/playbooks/inventory/env.d/neutron.yml
+++ b/playbooks/inventory/env.d/neutron.yml
@@ -47,6 +47,9 @@ component_skel:
   neutron_server:
     belongs_to:
       - neutron_all
+  opendaylight:
+    belongs_to:
+      - neutron_all
 
 
 container_skel:
@@ -68,6 +71,7 @@ container_skel:
       - network_containers
     contains:
       - neutron_server
+      - opendaylight
 
 
 physical_skel:
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index 7e37953fb7..8074a378fd 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -331,6 +331,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'nova_console_container',
         'nova_scheduler',
         'nova_scheduler_container',
+        'opendaylight',
         'operator_containers',
         'operator_hosts',
         'orchestration_all',