summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-08-01 13:06:48 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-08-01 14:43:38 -0500
commit7c92a769fd2f01bb207f8f2b4099be450d3cc07a (patch)
treec58bd19e55e5aa78cd3ede136b0f2c51d5da99a5 /ci
parent4265e70fa9218498d058c4e81c73dab6265b54da (diff)
fix for generating deploy.yaml if data network not defined.
Change-Id: I4b7be1cbbf55f2ba5ea40735c775c9c0c2eb4d40 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/bundle_tpl/neutron-api.yaml4
-rw-r--r--ci/bundle_tpl/neutron-gateway.yaml2
-rw-r--r--ci/bundle_tpl/neutron-ovs.yaml7
3 files changed, 8 insertions, 5 deletions
diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml
index 053b6ffa..9ee914ae 100644
--- a/ci/bundle_tpl/neutron-api.yaml
+++ b/ci/bundle_tpl/neutron-api.yaml
@@ -5,7 +5,9 @@
neutron-security-groups: true
{% if os.network.controller == 'nosdn' %}
flat-network-providers: "*"
- #overlay-network-type: gre vxlan
+{% if os.network.dvr %}
+ overlay-network-type: vxlan
+{% endif %}
{% elif os.network.controller == 'odl' %}
manage-neutron-plugin-legacy-mode: False
{% elif os.network.controller == 'onos' %}
diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml
index 5b26ac59..fd627642 100644
--- a/ci/bundle_tpl/neutron-gateway.yaml
+++ b/ci/bundle_tpl/neutron-gateway.yaml
@@ -3,8 +3,6 @@
options:
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
-{% else %}
- #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
{% if opnfv.ext_port is defined %}
ext-port: {{ opnfv.ext_port }}
diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml
index a5b92532..c0d34689 100644
--- a/ci/bundle_tpl/neutron-ovs.yaml
+++ b/ci/bundle_tpl/neutron-ovs.yaml
@@ -3,8 +3,6 @@
options:
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
-{% else %}
- #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
{% if os.network.dpdk %}
enable-dpdk: true
@@ -13,4 +11,9 @@
#default-socket-memory: 1024
#default-socket-cores: 1
{% endif %}
+{% if opnfv.ext_port is defined %}
+{% if os.network.dvr %}
+ ext-port: {{ opnfv.ext_port }}
+{% endif %}
+{% endif %}
{# Empty block to avoid bad block trim #}