Update RPM repo cfg file URL

Recent refactoring in Int/Pack changed the path, update accordingly.

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

diff --git a/examples/odl_4_release_playbook.yml b/examples/odl_4_release_playbook.yml
index 7d02418db3be92a5f5396e18a187b00f110df76a..191ca03ce1c59f081babd914042bff8b044821c3 100644 (file)
--- a/examples/odl_4_release_playbook.yml
+++ b/examples/odl_4_release_playbook.yml
@@ -4,4 +4,4 @@
   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=rpm/example_repo_configs/opendaylight-4-release.repo"
+      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"

diff --git a/examples/odl_4_testing_playbook.yml b/examples/odl_4_testing_playbook.yml
index 1f48bff7f9335f7702b2471ef34ad1efd977d1d3..af6fe58cb119b026d5a918a09e968e0283f7cd73 100644 (file)
--- a/examples/odl_4_testing_playbook.yml
+++ b/examples/odl_4_testing_playbook.yml
@@ -4,4 +4,4 @@
   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=rpm/example_repo_configs/opendaylight-4-testing.repo"
+      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"

diff --git a/examples/odl_5_release_playbook.yml b/examples/odl_5_release_playbook.yml
index 212077ca37cbe0a64e5e7f869561041f4fac2af0..33b63de34e682dc59c4faf431e2ff4f99a70aa51 100644 (file)
--- a/examples/odl_5_release_playbook.yml
+++ b/examples/odl_5_release_playbook.yml
@@ -4,4 +4,4 @@
   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=rpm/example_repo_configs/opendaylight-5-release.repo"
+      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"

diff --git a/examples/odl_5_testing_playbook.yml b/examples/odl_5_testing_playbook.yml
index 9e50ec80f011e968e101b883af16965cdada8c5e..a06674d29b736d5ce809effafdce9f7d1b01a143 100644 (file)
--- a/examples/odl_5_testing_playbook.yml
+++ b/examples/odl_5_testing_playbook.yml
@@ -4,4 +4,4 @@
   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=rpm/example_repo_configs/opendaylight-5-testing.repo"
+      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"

diff --git a/examples/odl_6_release_playbook.yml b/examples/odl_6_release_playbook.yml
index 647803529fdac78ebd125ce3cc73cd09de7e0848..ae760c85390afe0e50a9e18479c0fafa33f65a37 100644 (file)
--- a/examples/odl_6_release_playbook.yml
+++ b/examples/odl_6_release_playbook.yml
@@ -4,4 +4,4 @@
   roles:
     - role: opendaylight
       # Install latest service release of ODL Carbon RPM from the CBS repos
-      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-6-release.repo"
+      rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-6-release.repo"

diff --git a/examples/odl_6_testing_playbook.yml b/examples/odl_6_testing_playbook.yml
index 14a9601b0381282f8128ccd7d238bfded9654c71..2d32fed5944e95c219dff6bd5f4670a320b90643 100644 (file)
--- a/examples/odl_6_testing_playbook.yml
+++ b/examples/odl_6_testing_playbook.yml
@@ -4,4 +4,4 @@
   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=rpm/example_repo_configs/opendaylight-6-testing.repo"
+      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"

diff --git a/vars/main.yml b/vars/main.yml
index 23a0664fd9a7008797be64d67d231ae50daa96bf..bfddb2354827d33d089d6bfb3974895af8d27109 100755 (executable)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -45,7 +45,7 @@ install_method: "rpm_repo"
 
 # 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: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-6-release.repo;hb=refs/heads/master"
+rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-6-release.repo;hb=refs/heads/master"
 
 # URL of the deb repository to use when installing ODL from a repo
 # NB: This will only take effect when `install_method` is "deb_repo"