From 9c2b805b986b5e6aa8899490c7181c316784e83f Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Thu, 3 Aug 2017 09:04:30 -0400 Subject: [PATCH] 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 --- packer/templates/docker.json | 4 +--- packer/templates/libvirt.json | 4 +--- packer/templates/virtualbox.json | 4 +--- packer/vars/opendaylight-3.4.0.json | 1 - packer/vars/opendaylight-4.0.0.json | 1 - packer/vars/opendaylight-4.1.0.json | 1 - packer/vars/opendaylight-4.2.0.json | 1 - packer/vars/opendaylight-4.3.0.json | 1 - packer/vars/opendaylight-4.4.0.json | 1 - packer/vars/opendaylight-5.0.0.json | 1 - packer/vars/opendaylight-5.1.0.json | 1 - packer/vars/opendaylight-5.2.0.json | 1 - packer/vars/opendaylight-5.3.0.json | 1 - packer/vars/opendaylight-6.0.0.json | 1 - 14 files changed, 3 insertions(+), 20 deletions(-) diff --git a/packer/templates/docker.json b/packer/templates/docker.json index 2d1dec7..3ff590c 100644 --- 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 1fe29db..ffadc14 100644 --- 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 516b677..df47f97 100644 --- 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 05eaf1e..9e6bbf9 100644 --- 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 cad56d3..8204457 100644 --- 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 00e89ea..9ebdaf7 100644 --- 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 f17ffb6..2882776 100644 --- 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 e95750c..7fffb1d 100644 --- 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 eb42c3d..52bbb31 100644 --- 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 66e1eb4..2c57dcb 100644 --- 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 bc51743..03466ab 100644 --- 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 413e419..2b7fdc6 100644 --- 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 824c6ee..e60275f 100644 --- 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 587c75e..69c2293 100644 --- 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'" } -- 2.36.6