From cf75a3fbd33bc57e5fa6e92cb3e3c4f5d2e0d368 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 18 Jul 2016 22:59:39 -0500
Subject: [PATCH] modified the template to support sfc feature for onos
integration.
Change-Id: I335170387d49518d1ca2c8bb72e7c3707a170320
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
ci/bundle_tpl/odl.yaml | 4 ++--
ci/bundle_tpl/onos.yaml | 4 +++-
ci/bundle_tpl/subordinate.yaml | 4 ++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ci/bundle_tpl/odl.yaml b/ci/bundle_tpl/odl.yaml
index 66f2e58a..30f555c9 100644
--- a/ci/bundle_tpl/odl.yaml
+++ b/ci/bundle_tpl/odl.yaml
@@ -3,9 +3,9 @@
options:
install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz"
{% if os.network.sfc %}
- profile: "openvswitch-odl-beryllium-vpn"
-{% elif os.network.bgpvpn %}
profile: "openvswitch-odl-beryllium-sfc"
+{% elif os.network.bgpvpn %}
+ profile: "openvswitch-odl-beryllium-vpn"
{% elif os.network.odll3 %}
profile: "openvswitch-odl-beryllium-l3"
{% else %}
diff --git a/ci/bundle_tpl/onos.yaml b/ci/bundle_tpl/onos.yaml
index 4459330f..fd08c717 100644
--- a/ci/bundle_tpl/onos.yaml
+++ b/ci/bundle_tpl/onos.yaml
@@ -1,7 +1,9 @@
onos-controller:
charm: local:{{ ubuntu.release }}/onos-controller
options:
- #ext-port: "eth1"
+{% if opnfv.ext_port is defined %}
+ ext-port: {{ opnfv.ext_port }}
+{% endif %}
#gateway-mac: "default"
to:
- "lxc:nodes=0"
diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml
index cc61920b..6f654455 100644
--- a/ci/bundle_tpl/subordinate.yaml
+++ b/ci/bundle_tpl/subordinate.yaml
@@ -22,6 +22,10 @@
security-groups: True
openvswitch-onos:
charm: local:{{ ubuntu.release }}/openvswitch-onos
+{% if os.network.sfc %}
+ options:
+ profile: onos-sfc
+{% endif %}
{% elif os.network.controller == 'ocl' %}
neutron-api-contrail:
charm: local:{{ ubuntu.release }}/neutron-api-contrail
--
2.16.6