From 09ca28954c94fd9d9336b5fe2a688d2c2d27955b Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Fri, 6 Jan 2017 10:58:12 +0800 Subject: Upgrade OpenDaylight to Boron ( l2 scenario ) JIRA: COMPASS-512 1. Use package distribution-karaf-0.5.0-Boron.tar.gz 2. Use package networking-odl-3.2.0.tar.gz 3. Set both neutron and odl as ovs manager Change-Id: I126ba21346afaaccf1f71a17a500146968bdb4eb Signed-off-by: Harry Huang --- .../roles/odl_cluster/templates/custom.properties | 0 .../ansible/roles/odl_cluster/templates/jetty.xml | 20 +++++++++++++++++++- .../roles/odl_cluster/templates/keepalived.conf | 0 .../ansible/roles/odl_cluster/templates/ml2_conf.sh | 2 +- .../roles/odl_cluster/templates/moon-environment | 0 .../templates/org.apache.karaf.features.cfg.Debian | 18 +++++++----------- .../ansible/roles/odl_cluster/templates/settings.xml | 0 7 files changed, 27 insertions(+), 13 deletions(-) mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/keepalived.conf mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment mode change 100644 => 100755 deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml (limited to 'deploy/adapters/ansible/roles/odl_cluster/templates') diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties b/deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml index 50ac7c35..064e8a89 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml @@ -34,7 +34,7 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> - + @@ -48,6 +48,24 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> + + + + + + + + + + 300000 + 2 + false + 8443 + 20000 + 5000 + + + diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/keepalived.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/keepalived.conf old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh index 5e3627bf..0d42e48b 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh @@ -10,5 +10,5 @@ cat <> /etc/neutron/plugins/ml2/ml2_conf.ini [ml2_odl] password = admin username = admin -url = http://{{ internal_vip.ip }}:8181/controller/nb/v2/neutron +url = http://{{ internal_vip.ip }}:8080/controller/nb/v2/neutron EOT diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment b/deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment old mode 100644 new mode 100755 diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian index 4bbd33c3..f3f6ad54 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian @@ -36,23 +36,19 @@ # # Comma separated list of features repositories to register by default # -featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.2-Beryllium-SR2/xml/features -#featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-Beryllium/xml/features -#featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-Beryllium-RC1/xml/features -#mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.3-Lithium-SR3/xml/features -#mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.2-Lithium-SR2/xml/features +featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.7/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.7/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features,mvn:org.apache.karaf.features/spring/3.0.7/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.5.0-Boron/xml/features # # Comma separated list of features to install at startup # -featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack - -#,odl-restconf-all,odl-aaa-authn,odl-dlux-all - -# odl-base-all,odl-restconf,odl-ovsdb-openstack,odl-dlux-all,odl-mdsal-apidocs -#,odl-mdsal-clustering,odl-openflowplugin-flow-services +featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack,odl-base-all,odl-nsf-all,odl-adsal-northbound,odl-mdsal-apidocs,odl-ovsdb-northbound,odl-dlux-core # # Defines if the boot features are started in asynchronous mode (in a dedicated thread) # featuresBootAsynchronous=false + +# +# Store cfg file for config element in feature +# +#configCfgStore=true diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml old mode 100644 new mode 100755 -- cgit 1.2.3-korg