Remove deprecated rpm_repo_file ansible-odl param

Change 60815 to ansible-opendaylight made this var unnecessary.

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

diff --git a/packer/templates/docker.json b/packer/templates/docker.json
index 2d1dec75dce053a688e6dbc93dda6dd9786144bd..3ff590cf5afc19e385f2048833c4541ef42240ea 100644 (file)
--- a/packer/templates/docker.json
+++ b/packer/templates/docker.json
@@ -4,7 +4,6 @@
         "os_name": null,
         "os_version": null,
         "docker_repo": null,
-        "rpm_repo_file": null,
         "rpm_repo_url": null
     },
     "builders": [
@@ -30,8 +29,7 @@
             "playbook_file": "provision/install_odl.yml",
             "extra_arguments": [
                 "--extra-vars",
-                "\"rpm_repo_file={{ user `rpm_repo_file` }}",
-                "rpm_repo_url={{ user `rpm_repo_url` }}\""
+                "\"rpm_repo_url={{ user `rpm_repo_url` }}\""
             ]
         }
     ],

diff --git a/packer/templates/libvirt.json b/packer/templates/libvirt.json
index 1fe29dbb77e43d5023d34681a82349f244fa8e49..ffadc14ba478e2f66f92f32dde1f32bd090cab91 100644 (file)
--- a/packer/templates/libvirt.json
+++ b/packer/templates/libvirt.json
@@ -5,7 +5,6 @@
         "os_version": null,
         "iso_urls": null,
         "iso_checksum": null,
-        "rpm_repo_file": null,
         "rpm_repo_url": null
     },
     "builders": [
@@ -39,8 +38,7 @@
             "playbook_file": "provision/install_odl.yml",
             "extra_arguments": [
                 "--extra-vars",
-                "\"rpm_repo_file={{ user `rpm_repo_file` }}",
-                "rpm_repo_url={{ user `rpm_repo_url` }}\""
+                "\"rpm_repo_url={{ user `rpm_repo_url` }}\""
             ]
         }
     ],

diff --git a/packer/templates/virtualbox.json b/packer/templates/virtualbox.json
index 516b6771e49372f0a4401d9229f9d55404955390..df47f974e549588b3d6e2a5966881f1c3b8f9bba 100644 (file)
--- a/packer/templates/virtualbox.json
+++ b/packer/templates/virtualbox.json
@@ -4,7 +4,6 @@
         "os_name": null,
         "os_version": null,
         "guest_os_type": null,
-        "rpm_repo_file": null,
         "rpm_repo_url": null,
         "iso_urls": null,
         "iso_checksum": null
@@ -57,8 +56,7 @@
             "playbook_file": "provision/install_odl.yml",
             "extra_arguments": [
                 "--extra-vars",
-                "\"rpm_repo_file={{ user `rpm_repo_file` }}",
-                "rpm_repo_url={{ user `rpm_repo_url` }}\""
+                "\"rpm_repo_url={{ user `rpm_repo_url` }}\""
             ]
         }
     ],

diff --git a/packer/vars/opendaylight-3.4.0.json b/packer/vars/opendaylight-3.4.0.json
index 05eaf1e42c35704becee88d9734cd3ee2edc3203..9e6bbf9fed6254e0fd52c9217d56021420b8262d 100644 (file)
--- a/packer/vars/opendaylight-3.4.0.json
+++ b/packer/vars/opendaylight-3.4.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "3.4.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-34-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-34-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.0.0.json b/packer/vars/opendaylight-4.0.0.json
index cad56d359aa1c473bb2f96322cb2be6eb444582d..82044573e3d54ad07a3d1d22b4e69e4cb4d700af 100644 (file)
--- a/packer/vars/opendaylight-4.0.0.json
+++ b/packer/vars/opendaylight-4.0.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "4.0.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-40-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-40-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.1.0.json b/packer/vars/opendaylight-4.1.0.json
index 00e89ea5e8c12df5dd484318367f425f4c923b0e..9ebdaf7b305617887b9bbd86c64b8f06cf23034f 100644 (file)
--- a/packer/vars/opendaylight-4.1.0.json
+++ b/packer/vars/opendaylight-4.1.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "4.1.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-41-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-41-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.2.0.json b/packer/vars/opendaylight-4.2.0.json
index f17ffb678f7522b1a42bca2185bbc3cd490d89da..2882776d69c98044b5f31a803452c5c96724ab78 100644 (file)
--- a/packer/vars/opendaylight-4.2.0.json
+++ b/packer/vars/opendaylight-4.2.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "4.2.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-42-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-42-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.3.0.json b/packer/vars/opendaylight-4.3.0.json
index e95750c09b7fbe46dc60bae05d3693601614383d..7fffb1d5a56065b9f2134471be51411dec136019 100644 (file)
--- a/packer/vars/opendaylight-4.3.0.json
+++ b/packer/vars/opendaylight-4.3.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "4.3.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-43-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-43-release.repo'"
 }

diff --git a/packer/vars/opendaylight-4.4.0.json b/packer/vars/opendaylight-4.4.0.json
index eb42c3dac91e7e1b8e7f401d94c3cb9414ebd8ad..52bbb3109fc43755ae81faf09867500711b65149 100644 (file)
--- a/packer/vars/opendaylight-4.4.0.json
+++ b/packer/vars/opendaylight-4.4.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "4.4.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-44-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-44-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.0.0.json b/packer/vars/opendaylight-5.0.0.json
index 66e1eb498104e7a16d5f65aabdcf98b9e37846cb..2c57dcbf17378b0073e3ffae1aa814b94f1c8ee2 100644 (file)
--- a/packer/vars/opendaylight-5.0.0.json
+++ b/packer/vars/opendaylight-5.0.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "5.0.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-50-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-50-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.1.0.json b/packer/vars/opendaylight-5.1.0.json
index bc51743bca369bf88d5f5a62e4a292050319ebe6..03466abf00293fae3d45400d9027cc43249178e2 100644 (file)
--- a/packer/vars/opendaylight-5.1.0.json
+++ b/packer/vars/opendaylight-5.1.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "5.1.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-51-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-51-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.2.0.json b/packer/vars/opendaylight-5.2.0.json
index 413e419b4d658f454d44a92b1041517d3f83af9f..2b7fdc6419f948822dc3393152376f3456975623 100644 (file)
--- a/packer/vars/opendaylight-5.2.0.json
+++ b/packer/vars/opendaylight-5.2.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "5.2.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-52-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-52-release.repo'"
 }

diff --git a/packer/vars/opendaylight-5.3.0.json b/packer/vars/opendaylight-5.3.0.json
index 824c6ee24319d5d56a832c5f37d5a5d4cc78fe90..e60275fb3225903cb98d53591d654f7d660bdd36 100644 (file)
--- a/packer/vars/opendaylight-5.3.0.json
+++ b/packer/vars/opendaylight-5.3.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "5.3.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-53-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-53-release.repo'"
 }

diff --git a/packer/vars/opendaylight-6.0.0.json b/packer/vars/opendaylight-6.0.0.json
index 587c75e42a491f3a0acff6c35f2a63751efdd557..69c22934d177f743a185b92aee78c44f459d97a2 100644 (file)
--- a/packer/vars/opendaylight-6.0.0.json
+++ b/packer/vars/opendaylight-6.0.0.json
@@ -1,6 +1,5 @@
 {
     "odl_version": "6.0.0",
     "docker_repo": "opendaylight/odl",
-    "rpm_repo_file": "opendaylight-60-release.repo",
     "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-60-release.repo'"
 }