Extract rpm_repo_file from rpm_repo_url

Change-Id: Id769dcf22274a75d942c54ce4c82a97689aafa06
Signed-off-by: Sri Sanketh U <sanketh.uppalapati@research.iiit.ac.in>

diff --git a/examples/odl_4_release_playbook.yml b/examples/odl_4_release_playbook.yml
index cb2a0d7d08d77bfcae9ff507c3fb653b275591d2..7d02418db3be92a5f5396e18a187b00f110df76a 100644 (file)
--- a/examples/odl_4_release_playbook.yml
+++ b/examples/odl_4_release_playbook.yml
@@ -4,5 +4,4 @@
   roles:
     - role: opendaylight
       # Install latest service release of ODL Beryllium RPM from the CBS repos
-      rpm_repo_file: "opendaylight-4-release.repo"
       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"

diff --git a/examples/odl_4_testing_playbook.yml b/examples/odl_4_testing_playbook.yml
index 0135420bd16bc04cccee76570f02ab1cdee49e0c..1f48bff7f9335f7702b2471ef34ad1efd977d1d3 100644 (file)
--- a/examples/odl_4_testing_playbook.yml
+++ b/examples/odl_4_testing_playbook.yml
@@ -4,5 +4,4 @@
   roles:
     - role: opendaylight
       # Install the latest ODL Beryllium RPM from the CBS repos
-      rpm_repo_file: "opendaylight-4-testing.repo"
       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"

diff --git a/examples/odl_5_release_playbook.yml b/examples/odl_5_release_playbook.yml
index 6dcaa748f19e232b6e8c2170a71adc7d4f55cd7f..212077ca37cbe0a64e5e7f869561041f4fac2af0 100644 (file)
--- a/examples/odl_5_release_playbook.yml
+++ b/examples/odl_5_release_playbook.yml
@@ -4,5 +4,4 @@
   roles:
     - role: opendaylight
       # Install latest service release of ODL Boron RPM from the CBS repos
-      rpm_repo_file: "opendaylight-5-release.repo"
       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"

diff --git a/examples/odl_5_testing_playbook.yml b/examples/odl_5_testing_playbook.yml
index bc5ee20c4090dc49490c687c9eede545521d7f38..9e50ec80f011e968e101b883af16965cdada8c5e 100644 (file)
--- a/examples/odl_5_testing_playbook.yml
+++ b/examples/odl_5_testing_playbook.yml
@@ -4,5 +4,4 @@
   roles:
     - role: opendaylight
       # Install the latest ODL Boron RPM from the CBS repos
-      rpm_repo_file: "opendaylight-5-testing.repo"
       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"

diff --git a/examples/odl_6_release_playbook.yml b/examples/odl_6_release_playbook.yml
index 7f46db1332647243a7b9a340c45ce2bae18007e3..647803529fdac78ebd125ce3cc73cd09de7e0848 100644 (file)
--- a/examples/odl_6_release_playbook.yml
+++ b/examples/odl_6_release_playbook.yml
@@ -4,5 +4,4 @@
   roles:
     - role: opendaylight
       # Install latest service release of ODL Carbon RPM from the CBS repos
-      rpm_repo_file: "opendaylight-6-release.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"

diff --git a/examples/odl_6_testing_playbook.yml b/examples/odl_6_testing_playbook.yml
index 52879cc8fc15d2dac4a362482277eb205f681f47..14a9601b0381282f8128ccd7d238bfded9654c71 100644 (file)
--- a/examples/odl_6_testing_playbook.yml
+++ b/examples/odl_6_testing_playbook.yml
@@ -4,5 +4,4 @@
   roles:
     - role: opendaylight
       # Install the latest ODL Carbon RPM from the CBS repos
-      rpm_repo_file: "opendaylight-6-testing.repo"
       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"

diff --git a/tasks/add_odl_yum_repo.yml b/tasks/add_odl_yum_repo.yml
index c5a272655bfa0b14f846249b7233bf38aedc5897..6d15db176b77f190949a0adaa99045eb622cd381 100644 (file)
--- a/tasks/add_odl_yum_repo.yml
+++ b/tasks/add_odl_yum_repo.yml
@@ -1,10 +1,10 @@
 - name: Download ODL yum repo
   get_url:
     url={{ rpm_repo_url }}
-    dest=/etc/yum.repos.d/{{ rpm_repo_file }}
+    dest=/etc/yum.repos.d/opendaylight.repo
 - name: Set ODL yum repo file properties
   file:
-    path=/etc/yum.repos.d/{{ rpm_repo_file }}
+    path=/etc/yum.repos.d/opendaylight.repo
     owner=root
     group=root
     mode=0644

diff --git a/vars/main.yml b/vars/main.yml
index 1129ad41a26604d72441e2a545f0a74becea33e6..23a0664fd9a7008797be64d67d231ae50daa96bf 100755 (executable)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -45,7 +45,6 @@ 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_file: "opendaylight-6-release.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"
 
 # URL of the deb repository to use when installing ODL from a repo