Skip to content

Commit 1d2d3ca

Browse files
authored
Merge pull request #1850 from outscale/image_name
Updates to the outscale provider
2 parents 2776e8c + 97f0bab commit 1d2d3ca

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

images/capi/packer/outscale/config.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ packer {
22
required_plugins {
33
outscale = {
44
source = "github.com/outscale/outscale"
5-
version = "~> 1.2.0"
5+
version = "~> 1.5.0"
66
}
77
}
88
}

images/capi/packer/outscale/packer.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
"builders": [
33
{
44
"access_key": "{{ user `access_key` }}",
5+
"force_delete_snapshot": "{{user `overwrite_existing`}}",
6+
"force_deregister": "{{user `overwrite_existing`}}",
57
"global_permission": "{{ user `global_permission` }}",
68
"omi_account_ids": [
79
"{{ user `account_id` }}"
810
],
11+
"omi_boot_modes": [
12+
"legacy",
13+
"uefi"
14+
],
915
"omi_name": "{{user `omi_name`}}",
1016
"region": "{{ user `region` }}",
1117
"secret_key": "{{ user `secret_key` }}",
@@ -18,6 +24,7 @@
1824
"{{ user `owner` }}"
1925
]
2026
},
27+
"ssh_interface": "public_ip",
2128
"ssh_username": "outscale",
2229
"tags": {
2330
"Base_OMI_Name": "{{ .SourceOMIName }}",
@@ -28,6 +35,7 @@
2835
"distribution_version": "{{user `distribution_version`}}",
2936
"kubernetes_version": "{{user `kubernetes_semver`}}"
3037
},
38+
"temporary_security_group_source_cidr": "{{user `ssh_source_cidr` }}",
3139
"type": "outscale-bsu",
3240
"vm_type": "{{user `vm_type`}}"
3341
}
@@ -119,13 +127,15 @@
119127
"kubernetes_semver": null,
120128
"kubernetes_series": null,
121129
"kubernetes_source_type": null,
122-
"omi_name": "{{user `build_name`}}-{{user `distribution_version`}}-kubernetes-{{user `kubernetes_semver`}}-{{timestamp}}",
130+
"omi_name": "{{user `build_name`}}-kubernetes-{{user `kubernetes_semver`}}-{{isotime `2006-01-02`}}",
131+
"overwrite_existing": "false",
123132
"owner": "Outscale",
124133
"region": "{{env `OSC_REGION`}}",
125134
"runc_sha256": null,
126135
"runc_url": "https://github.com/opencontainers/runc/releases/download/v{{user `runc_version`}}/runc.amd64",
127136
"runc_version": null,
128137
"secret_key": "{{env `OSC_SECRET_KEY`}}",
129-
"vm_type": "tinav5.c2r4p2"
138+
"ssh_source_cidr": "0.0.0.0/0",
139+
"vm_type": "tinav6.c2r4p2"
130140
}
131141
}

0 commit comments

Comments
 (0)