diff options
author | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-03-19 13:41:33 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-03-27 15:27:09 -0700 |
commit | 564913e994d87f58475d4ebf447b4773dd09eca5 (patch) | |
tree | 7f5cb5303559e125938fc6ffff35bfd94f69c3ab /packer/templates | |
parent | ab9695083c89827b329090fe825ba3e4ff686713 (diff) |
Upgrade to common-packer
- Enable builder.json
- Relove unused provision scripts
- Update ci-management-packer-jobs
- Update builder.yaml
Change-Id: I0c9abcd33fd3acb84690863dca966a01731dc64c
Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'packer/templates')
-rw-r--r-- | packer/templates/basebuild.json | 53 | ||||
l--------- | packer/templates/builder.json | 1 | ||||
l---------[-rw-r--r--] | packer/templates/docker.json | 55 |
3 files changed, 2 insertions, 107 deletions
diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json deleted file mode 100644 index ff84a72d6..000000000 --- a/packer/templates/basebuild.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "variables": { - "stack_tenant": null, - "stack_user": null, - "stack_pass": null, - "stack_network": null, - "base_image": null, - "cloud_user": null, - "distro": null, - "cloud_user_data": null - }, - "builders": [ - { - "type": "openstack", - "identity_endpoint": "https://auth.vexxhost.net/v2.0/", - "tenant_name": "{{user `stack_tenant`}}", - "username": "{{user `stack_user`}}", - "password": "{{user `stack_pass`}}", - "region": "ca-ymq-1", - "ssh_username": "{{user `cloud_user`}}", - "image_name": "{{user `distro`}} - basebuild - {{isotime \"20060102-1504\"}}", - "source_image_name": "{{user `base_image`}}", - "flavor": "v1-standard-1", - "availability_zone": "ca-ymq-2", - "networks": [ - "{{user `stack_network`}}" - ], - "user_data_file": "{{user `cloud_user_data`}}" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir -p /tmp/packer" - ] - }, - { - "type": "file", - "source": "provision/basebuild/", - "destination": "/tmp/packer" - }, - { - "type": "shell", - "scripts": [ - "provision/baseline.sh", - "provision/basebuild.sh", - "provision/system_reseal.sh" - ], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - } - ] -} diff --git a/packer/templates/builder.json b/packer/templates/builder.json new file mode 120000 index 000000000..bd227be50 --- /dev/null +++ b/packer/templates/builder.json @@ -0,0 +1 @@ +../common-packer/templates/builder.json
\ No newline at end of file diff --git a/packer/templates/docker.json b/packer/templates/docker.json index 1c8d3ec56..edea6d285 100644..120000 --- a/packer/templates/docker.json +++ b/packer/templates/docker.json @@ -1,54 +1 @@ -{ - "variables": { - "stack_tenant": null, - "stack_user": null, - "stack_pass": null, - "stack_network": null, - "base_image": null, - "cloud_user": null, - "distro": null, - "cloud_user_data": null - }, - "builders": [ - { - "type": "openstack", - "identity_endpoint": "https://auth.vexxhost.net/v2.0/", - "tenant_name": "{{user `stack_tenant`}}", - "username": "{{user `stack_user`}}", - "password": "{{user `stack_pass`}}", - "region": "ca-ymq-1", - "ssh_username": "{{user `cloud_user`}}", - "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}", - "source_image_name": "{{user `base_image`}}", - "flavor": "v1-standard-1", - "availability_zone": "ca-ymq-2", - "networks": [ - "{{user `stack_network`}}" - ], - "user_data_file": "{{user `cloud_user_data`}}" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir -p /tmp/packer" - ] - }, - { - "type": "file", - "source": "provision/basebuild/", - "destination": "/tmp/packer" - }, - { - "type": "shell", - "scripts": [ - "provision/baseline.sh", - "provision/basebuild.sh", - "provision/docker.sh", - "provision/system_reseal.sh" - ], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - } - ] -} +../common-packer/templates/docker.json
\ No newline at end of file |