Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Chore: Turn on SBOM for MSB"
[ci-management.git]
/
packer
/
templates
/
redis.json
diff --git
a/packer/templates/redis.json
b/packer/templates/redis.json
index
2b3c03f
..
657f109
100644
(file)
--- a/
packer/templates/redis.json
+++ b/
packer/templates/redis.json
@@
-14,8
+14,8
@@
},
"builders": [
{
},
"builders": [
{
- "name": "
vexxhost
",
- "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20
060102-150405.000
\"}}",
+ "name": "
openstack
",
+ "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20
180101-1003
\"}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"identity_endpoint": "{{user `cloud_auth_url`}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"identity_endpoint": "{{user `cloud_auth_url`}}",
@@
-24,7
+24,6
@@
"tenant_name": "{{user `cloud_tenant`}}",
"domain_name": "Default",
"region": "ca-ymq-1",
"tenant_name": "{{user `cloud_tenant`}}",
"domain_name": "Default",
"region": "ca-ymq-1",
- "availability_zone": "ca-ymq-2",
"networks": [
"{{user `cloud_network`}}"
],
"networks": [
"{{user `cloud_network`}}"
],
@@
-40,9
+39,7
@@
"provisioners": [
{
"type": "shell",
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
@@
-51,6
+48,8
@@
},
{
"type": "ansible",
},
{
"type": "ansible",
+ "command": "./common-packer/ansible-playbook.sh",
+ "skip_version_check": true,
"playbook_file": "provision/redis.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
"playbook_file": "provision/redis.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",