CORD-1488 Update neutron-api charm to specify source of Neutron ONOS plugin
Change-Id: I63af2b6824274ea1832d8e55e495326e08b837f0
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index 6780a96..6d348bf 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -110,7 +110,7 @@
mongodb: "cs:trusty/mongodb-33"
percona-cluster: "cs:trusty/percona-cluster-31"
nagios: "cs:trusty/nagios-10"
- neutron-api: "cs:~cordteam/trusty/neutron-api-5"
+ neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
nova-compute: "cs:~cordteam/trusty/nova-compute-2"
nrpe: "cs:trusty/nrpe-4"
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index b53af4a..1fb0443 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -131,7 +131,7 @@
mongodb: "cs:trusty/mongodb-33"
percona-cluster: "cs:trusty/percona-cluster-31"
nagios: "cs:trusty/nagios-10"
- neutron-api: "cs:~cordteam/trusty/neutron-api-5"
+ neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
nova-compute: "cs:~cordteam/trusty/nova-compute-2"
nrpe: "cs:trusty/nrpe-4"
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index 293bc1f..6e6dbbb 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -158,7 +158,7 @@
mongodb: "cs:trusty/mongodb-33"
percona-cluster: "cs:trusty/percona-cluster-31"
nagios: "cs:trusty/nagios-10"
- neutron-api: "cs:~cordteam/trusty/neutron-api-5"
+ neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
nova-compute: "cs:~cordteam/trusty/nova-compute-2"
nrpe: "cs:trusty/nrpe-4"
diff --git a/profile_manifests/opencloud.yml b/profile_manifests/opencloud.yml
index 0050838..6b31d59 100644
--- a/profile_manifests/opencloud.yml
+++ b/profile_manifests/opencloud.yml
@@ -52,7 +52,7 @@
glance: "cs:trusty/glance-28"
keystone: "cs:trusty/keystone-33"
mongodb: "cs:trusty/mongodb-33"
- neutron-api: "cs:~cordteam/trusty/neutron-api-5"
+ neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
nova-compute: "cs:~cordteam/trusty/nova-compute-2"
ntp: "cs:trusty/ntp-14"
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index 36a62b7..baaf93d 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -86,7 +86,7 @@
keystone: "cs:trusty/keystone-33"
mongodb: "cs:trusty/mongodb-33"
nagios: "cs:trusty/nagios-10"
- neutron-api: "cs:~cordteam/trusty/neutron-api-5"
+ neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
nova-compute: "cs:~cordteam/trusty/nova-compute-2"
nrpe: "cs:trusty/nrpe-4"
diff --git a/roles/juju-setup/templates/juju_config.yml.j2 b/roles/juju-setup/templates/juju_config.yml.j2
index 9e41347..cc2f1f8 100644
--- a/roles/juju-setup/templates/juju_config.yml.j2
+++ b/roles/juju-setup/templates/juju_config.yml.j2
@@ -31,6 +31,9 @@
onos-vtn-port: 8182
neutron-security-groups: "True"
overlay-network-type: vxlan
+ {% if enable_dpdk -%}
+ onos-vtn-branch: cord-2.0-dpdk-kilo
+ {% endif %}
neutron-openvswitch: {}