Code Review
/
integration
/
packaging.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add ODL Sodium rpm repo files
[integration/packaging.git]
/
packer
/
templates
/
docker.json
diff --git
a/packer/templates/docker.json
b/packer/templates/docker.json
index 2d1dec75dce053a688e6dbc93dda6dd9786144bd..cd32d0db5588491d294365c401b00d6eb9f4f605 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,
"os_name": null,
"os_version": null,
"docker_repo": null,
- "rpm_repo_file": null,
"rpm_repo_url": null
},
"builders": [
"rpm_repo_url": null
},
"builders": [
@@
-21,6
+20,7
@@
"scripts": [
"provision/config_docker_{{ user `os_name`}}.sh",
"provision/config_ansible_{{ user `os_name`}}.sh",
"scripts": [
"provision/config_docker_{{ user `os_name`}}.sh",
"provision/config_ansible_{{ user `os_name`}}.sh",
+ "provision/update_{{ user `os_name`}}.sh",
"provision/cleanup_{{ user `os_name`}}.sh",
"provision/minimize.sh"
]
"provision/cleanup_{{ user `os_name`}}.sh",
"provision/minimize.sh"
]
@@
-30,8
+30,7
@@
"playbook_file": "provision/install_odl.yml",
"extra_arguments": [
"--extra-vars",
"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` }}\""
]
}
],
]
}
],