Remove examples for old ODL versions, add new

Also add examples that install from new CD repos.

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

diff --git a/examples/odl_4_testing_playbook.yml b/examples/odl_6_devel_playbook.yml
similarity index 64%
rename from examples/odl_4_testing_playbook.yml
rename to examples/odl_6_devel_playbook.yml
index af6fe58cb119b026d5a918a09e968e0283f7cd73..006621eb83086a023a9810f5f8c76f8318d1a344 100644 (file)
--- a/examples/odl_4_testing_playbook.yml
+++ b/examples/odl_6_devel_playbook.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install the latest ODL Beryllium 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-4-testing.repo"
+      # Install the latest ODL Carbon 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-6-devel.repo"

diff --git a/examples/odl_5_release_playbook.yml b/examples/odl_7_devel_playbook.yml
similarity index 62%
rename from examples/odl_5_release_playbook.yml
rename to examples/odl_7_devel_playbook.yml
index 33b63de34e682dc59c4faf431e2ff4f99a70aa51..27fea8d6a20e8b3ee8392f5171689c7ab5d17c4c 100644 (file)
--- a/examples/odl_5_release_playbook.yml
+++ b/examples/odl_7_devel_playbook.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install latest service release of ODL Boron 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-5-release.repo"
+      # Install the latest ODL Nitrogen 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-7-devel.repo"

diff --git a/examples/odl_4_release_playbook.yml b/examples/odl_7_release_playbook.yml
similarity index 61%
rename from examples/odl_4_release_playbook.yml
rename to examples/odl_7_release_playbook.yml
index 191ca03ce1c59f081babd914042bff8b044821c3..573f5038c6478b177a235e2d7c1947308ed4287e 100644 (file)
--- a/examples/odl_4_release_playbook.yml
+++ b/examples/odl_7_release_playbook.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install latest service release of ODL Beryllium 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-4-release.repo"
+      # Install latest service release of 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-release.repo"

diff --git a/examples/odl_7_testing_playbook.yml b/examples/odl_7_testing_playbook.yml
new file mode 100644 (file)
index 0000000..8c9a17c
--- /dev/null
+++ b/examples/odl_7_testing_playbook.yml
@@ -0,0 +1,7 @@
+---
+- hosts: all
+  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"

diff --git a/examples/odl_8_devel_playbook.yml b/examples/odl_8_devel_playbook.yml
new file mode 100644 (file)
index 0000000..cb07ca3
--- /dev/null
+++ b/examples/odl_8_devel_playbook.yml
@@ -0,0 +1,7 @@
+---
+- hosts: all
+  become: yes
+  roles:
+    - role: opendaylight
+      # Install the latest ODL Nitrogen 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/odl_5_testing_playbook.yml b/examples/odl_8_testing_playbook.yml
similarity index 65%
rename from examples/odl_5_testing_playbook.yml
rename to examples/odl_8_testing_playbook.yml
index a06674d29b736d5ce809effafdce9f7d1b01a143..5fa99f7f024f7cd36fc0a85008db72fcde2525bd 100644 (file)
--- a/examples/odl_5_testing_playbook.yml
+++ b/examples/odl_8_testing_playbook.yml
@@ -3,5 +3,5 @@
   become: yes
   roles:
     - role: opendaylight
-      # Install the latest ODL Boron 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-5-testing.repo"
+      # 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"