Update default ODL versions, add examples

* Add example for Fluorine CD repo install
* Use latest Oxygen release as default repo if latest not specified
* Remove old CBS testing repos, using CD Nexus repos now

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

diff --git a/examples/rpm_8_devel.yml b/examples/rpm_8_devel.yml
index cb07ca3de8cc7545bd093718c0dd4d3dd20c8672..ae178145971eaa61bb5ab5e6c8b84948d3ea07ab 100644 (file)
--- a/examples/rpm_8_devel.yml
+++ b/examples/rpm_8_devel.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install the latest ODL Nitrogen RPM from ODL Nexus CD repos
+      # Install the latest ODL Oxygen RPM from ODL Nexus CD repos
       rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo"

diff --git a/examples/rpm_7_testing.yml b/examples/rpm_8_release.yml
similarity index 62%
rename from examples/rpm_7_testing.yml
rename to examples/rpm_8_release.yml
index 8c9a17ca21d48ebbc23349ae7888582275bffeff..7d50256b668f830564dc6517f57a499ba1dd51c5 100644 (file)
--- a/examples/rpm_7_testing.yml
+++ b/examples/rpm_8_release.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install the latest ODL Nitrogen RPM from the CBS repos
-      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-7-testing.repo"
+      # Install latest service release of ODL Oxygen RPM from the CBS repos
+      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-release.repo"

diff --git a/examples/rpm_8_testing.yml b/examples/rpm_8_testing.yml
deleted file mode 100644 (file)
index 5fa99f7..0000000
--- a/examples/rpm_8_testing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: all
-  become: yes
-  roles:
-    - role: opendaylight
-      # Install the latest ODL Oxygen RPM from the CBS repos
-      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-testing.repo"

diff --git a/examples/rpm_6_testing.yml b/examples/rpm_9_devel.yml
similarity index 64%
rename from examples/rpm_6_testing.yml
rename to examples/rpm_9_devel.yml
index 2d32fed5944e95c219dff6bd5f4670a320b90643..26d166c03f71e22b55b55c533c098a321ae733f8 100644 (file)
--- a/examples/rpm_6_testing.yml
+++ b/examples/rpm_9_devel.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install the latest ODL Carbon RPM from the CBS repos
-      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-6-testing.repo"
+      # Install the latest ODL Fluorine RPM from ODL Nexus CD repos
+      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo"

diff --git a/vars/main.yml b/vars/main.yml
index 9c50db6a70550900354c83ef3b63362fa94fd8dd..53b64fd714a678f64e4b351c874b393f20f9a66c 100755 (executable)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -69,7 +69,7 @@ odl_version_dict:
 
 # URL of the .repo config to use when installing ODL from a repo
 # NB: This will only take effect when `install_method` is "rpm_repo"
-rpm_repo_url: "{% if 'latest_release' not in odl_version %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-devel.repo{% else %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo{% endif %}"
+rpm_repo_url: "{% if 'latest_release' not in odl_version %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-devel.repo{% else %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-release.repo{% endif %}"
 suse_rpm_repo_url: "{% if 'latest_release' not in odl_version %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-opensuse-devel.repo{% else %}https://download.opensuse.org/repositories/Virtualization:/NFV/openSUSE_Leap_42.3/{% endif %}"
 
 # URL of the deb repository to use when installing ODL from a repo
@@ -83,7 +83,7 @@ deb_repo_url: "deb http://ppa.launchpad.net/odl-team/oxygen/ubuntu {{ ansible_ls
 # NB: Local paths must be relative the host being configured (think `/vagrant`)
 # NB: This will only take effect when `install_method` is "rpm_path"
 # Default to the release RPM hosted on the CentOS Community Build System
-rpm_path: "http://cbs.centos.org/repos/nfv7-opendaylight-72-release/x86_64/os/Packages/opendaylight-7.2.0-1.el7.noarch.rpm"
+rpm_path: "http://cbs.centos.org/repos/nfv7-opendaylight-81-release/x86_64/os/Packages/opendaylight-8.1.0-1.el7.noarch.rpm"
 # Default to the Nitrogen RPM hosted on the openSUSE OBS
 suse_rpm_path: "https://download.opensuse.org/repositories/Virtualization:/NFV/openSUSE_Leap_42.3/noarch/opendaylight-7.2.0-1.1.noarch.rpm"