Update ODL to Lithium, install RPM via CentOS CBS

Updates OpenDaylight's version from Helium SR3 to Lithium.

Changes ODL's NB REST port 8080->8282 (following Lithium change).

Updates Karaf 3.0.1->3.0.3.

Updates support Java versions to >=1.7.

Installs OpenDaylight via the CentOS Community Build System (CBS),
vs Fedora Copr. Upstream ODL has move to the CBS for Lithium.

Change-Id: If3e22a49a1f87a1cc906454b9b4c9ec5e6c0ae84
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/README.md b/README.md
index 99fa842f7d9caa57dc03171c201541cf690e8525..229dea193620995404cc63e2885a894afbe3d4c3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Results in:
 
 ```
 opendaylight-user@root>feature:list | grep odl-ovsdb-openstack
-odl-ovsdb-openstack | 1.0.3-Helium-SR3 | x | ovsdb-1.0.3-Helium-SR3 <snip>
+odl-ovsdb-openstack | 1.1.0-Lithium | x | ovsdb-1.1.0-Lithium <snip>
 ```
 
 ## License

diff --git a/files/opendaylight-3-candidate.repo b/files/opendaylight-3-candidate.repo
new file mode 100644 (file)
index 0000000..946bf8f
--- /dev/null
+++ b/files/opendaylight-3-candidate.repo
@@ -0,0 +1,5 @@
+[opendaylight-3-candidate]
+name=CentOS CBS OpenDaylight Lithium candidate repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/$basearch/os/
+enabled=1
+gpgcheck=0

diff --git a/files/opendaylight.repo b/files/opendaylight.repo
deleted file mode 100644 (file)
index 972121d..0000000
--- a/files/opendaylight.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[dfarrell07-OpenDaylight]
-name=Copr repo for OpenDaylight owned by dfarrell07
-baseurl=https://copr-be.cloud.fedoraproject.org/results/dfarrell07/OpenDaylight/epel-7-$basearch/
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://copr-be.cloud.fedoraproject.org/results/dfarrell07/OpenDaylight/pubkey.gpg
-enabled=1

diff --git a/tasks/add_odl_yum_repo.yml b/tasks/add_odl_yum_repo.yml
index c4c9b2dc88f7a1a48c0c7bcb9f06dcb39bb279cb..6370004720a675ac91283f1ef4f10a6023c949a7 100644 (file)
--- a/tasks/add_odl_yum_repo.yml
+++ b/tasks/add_odl_yum_repo.yml
@@ -1,6 +1,6 @@
 - name: Add ODL yum repo
   copy:
-    src=opendaylight.repo
+    src=opendaylight-3-candidate.repo
     dest=/etc/yum.repos.d/
     owner=root
     group=root

diff --git a/templates/org.apache.karaf.features.cfg b/templates/org.apache.karaf.features.cfg
index c9e7c7417b2489896c410af65f742d062c4c76bd..800280a4d97365a34ed631abef9240b9f4a8f436 100644 (file)
--- a/templates/org.apache.karaf.features.cfg
+++ b/templates/org.apache.karaf.features.cfg
@@ -36,7 +36,7 @@
 #
 # Comma separated list of features repositories to register by default
 # Default repos:
-# mvn:org.apache.karaf.features/standard/3.0.1/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features,mvn:org.apache.karaf.features/spring/3.0.1/xml/features,mvn:org.opendaylight.integration/features-integration/0.2.3-Helium-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.0-Lithium/xml/features
 #
 {# Feature repo list defaults are in vars/main.yml of the ODL Ansible role. #}
 {# Those are normally overridden by the role consumer, per their use-case. #}

diff --git a/vars/main.yml b/vars/main.yml
index 1d43d8ff82fca75abf17370cb6faf17a85dcd5ec..731dc88f93a29561b6498d7e5dad41b3fb1b5083 100644 (file)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -33,17 +33,17 @@ extra_features: []
 
 # Specifies the port for the ODL northbound REST interface to listen on.
 # This was added because OpenStack's Swift project uses a conflicting port.
-nb_rest_port: 8080
+nb_rest_port: 8282
 
 # Karaf feature repositories configured by default in ODL's release arifact.
 # You likely don't need to override these. Override the extra_feature_repos
 # list to add custom repos to search for Karaf features.
 default_feature_repos:
-  - 'mvn:org.apache.karaf.features/standard/3.0.1/xml/features'
-  - 'mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features'
-  - 'mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features'
-  - 'mvn:org.apache.karaf.features/spring/3.0.1/xml/features'
-  - 'mvn:org.opendaylight.integration/features-integration/0.2.3-Helium-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.0-Lithium/xml/features'
 
 # Karaf feature repositories to install *in addition* to the defaults repos
 # configured in the ODL release artifact. You may need to override this to
@@ -60,7 +60,5 @@ install_method: "rpm_repo"
 # Docs for `name` param: "You can also pass a url or a local path to a rpm file."
 # http://docs.ansible.com/ansible/yum_module.html
 # NB: Local paths must be relative the host being configured (think `/vagrant`)
-# Defaulting to the latest available RPM, hosted remotely via Fedora Copr
-# NB: This will (hopefully) change soon to point at the CentOS NFV SIG's
-#   Koji repo on the CentOS Community Build System (CBS).
-rpm_path: "https://copr-be.cloud.fedoraproject.org/results/dfarrell07/OpenDaylight/epel-7-x86_64/opendaylight-0.2.3-2/opendaylight-0.2.3-2.el7.centos.noarch.rpm"
+# Defaulting to the Lithium RPM hosted on the CentOS Community Build System
+rpm_path: "http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/x86_64/os/Packages/opendaylight-3.0.0-2.el7.noarch.rpm"