summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/bundle_tpl/odl.yaml4
-rw-r--r--ci/bundle_tpl/onos.yaml4
-rw-r--r--ci/bundle_tpl/subordinate.yaml4
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