Skip to content

Commit 15e07df

Browse files
BShrivastavBShrivastav
authored
Release updates for 3.1.0 (#66)
* updated the easi examples Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com> * Delete build.vpc.catalogimage.pkr.hcl Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com> * version updates Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com> * updated the versions across to the latest Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com> * version update. Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com> * Update version.go Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com> --------- Signed-off-by: Bhavesh Shrivastav <bhavesh.shrivastav@ibm.com>
1 parent 35a4db1 commit 15e07df

27 files changed

+117
-37
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Starting from version 1.7, Packer supports third-party plugin installation using
5151
packer {
5252
required_plugins {
5353
ibmcloud = {
54-
version = ">=v3.0.4"
54+
version = ">=v3.0.0"
5555
source = "github.com/IBM/ibmcloud"
5656
}
5757
}
@@ -99,7 +99,7 @@ This is a basic Packer Template used to create a custom CentOS image on IBM Clou
9999
packer {
100100
required_plugins {
101101
ibmcloud = {
102-
version = ">=v3.0.4"
102+
version = ">=v3.0.0"
103103
source = "github.com/IBM/ibmcloud"
104104
}
105105
}

‎developer/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ run-centos-ansible:
4141
cd ..; packer build -var-file="developer/variables.pkrvars.hcl" developer/examples/build.vpc.centos-ansible.pkr.hcl
4242

4343
run-centos-encrypted:
44-
cd ..; packer validate -var-file="developer/variables.pkrvars.hcl" developer/examples/build.vpc.centos-encrypted.pkr.hcl
45-
cd ..; packer build -var-file="developer/variables.pkrvars.hcl" developer/examples/build.vpc.centos-encrypted.pkr.hcl
44+
cd ..; packer validate -var-file="developer/variables-encrypted.pkrvars.hcl" developer/examples/build.vpc.centos-encrypted.pkr.hcl
45+
cd ..; packer build -var-file="developer/variables-encrypted.pkrvars.hcl" developer/examples/build.vpc.centos-encrypted.pkr.hcl
4646

4747
run-rhel:
4848
cd ..; packer validate -var-file="developer/variables.pkrvars.hcl" developer/examples/build.vpc.rhel.pkr.hcl

‎developer/examples/build.classic.centos-ansible.pkr.hcl

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// packer {
2-
// required_plugins {
3-
// ibmcloud = {
4-
// version = ">=v3.0.4"
5-
// source = "github.com/IBM/ibmcloud"
6-
// }
7-
// }
8-
// }
1+
packer {
2+
required_plugins {
3+
ibmcloud = {
4+
version = ">=v3.0.0"
5+
source = "github.com/IBM/ibmcloud"
6+
}
7+
}
8+
}
99

1010
variable "unique-id" {
1111
type = string

‎developer/examples/build.classic.centos.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.classic.windows.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.catalogimage-offering.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.catalogimage-version.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.centos-ansible.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.centos-encrypted.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.centos-parallel.pkr copy.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.centos-parallel.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.centos.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.rhel.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎developer/examples/build.vpc.windows.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.0.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }

‎examples/build.classic.centos-ansible.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.classic.centos.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.classic.windows.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.catalogimage.pkr.hcl ‎examples/build.vpc.catalogimage-offering.pkr.hcl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// packer {
22
// required_plugins {
33
// ibmcloud = {
4-
// version = ">=v3.0.4"
4+
// version = ">=v3.1.0"
55
// source = "github.com/IBM/ibmcloud"
66
// }
77
// }
@@ -11,7 +11,7 @@ variable "IBM_API_KEY" {
1111
type = string
1212
}
1313

14-
variable "CATALOG_OFFERING_VERSION_CRN" {
14+
variable "CATALOG_OFFERING_CRN" {
1515
type = string
1616
}
1717

@@ -49,7 +49,7 @@ source "ibmcloud-vpc" "catalog" {
4949
resource_group_id = var.RESOURCE_GROUP_ID
5050
security_group_id = var.SECURITY_GROUP_ID
5151

52-
catalog_offering_version_crn = var.CATALOG_OFFERING_VERSION_CRN
52+
catalog_offering_crn = var.CATALOG_OFFERING_CRN
5353

5454
vsi_profile = "bx2-2x8"
5555
vsi_interface = "public"

‎examples/build.vpc.catalogimage-version.pkr.hcl

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
packer {
2+
required_plugins {
3+
ibmcloud = {
4+
version = ">=v3.0.0"
5+
source = "github.com/IBM/ibmcloud"
6+
}
7+
}
8+
}
9+
10+
variable "IBM_API_KEY" {
11+
type = string
12+
}
13+
14+
variable "CATALOG_OFFERING_VERSION_CRN" {
15+
type = string
16+
}
17+
18+
variable "SUBNET_ID" {
19+
type = string
20+
}
21+
22+
variable "REGION" {
23+
type = string
24+
}
25+
26+
variable "RESOURCE_GROUP_ID" {
27+
type = string
28+
}
29+
30+
variable "SECURITY_GROUP_ID" {
31+
type = string
32+
}
33+
// variable "VPC_URL" {
34+
// type = string
35+
// }
36+
// variable "IAM_URL" {
37+
// type = string
38+
// }
39+
40+
41+
locals {
42+
timestamp = regex_replace(timestamp(), "[- TZ:]", "")
43+
}
44+
45+
source "ibmcloud-vpc" "catalog" {
46+
api_key = var.IBM_API_KEY
47+
region = var.REGION
48+
subnet_id = var.SUBNET_ID
49+
resource_group_id = var.RESOURCE_GROUP_ID
50+
security_group_id = var.SECURITY_GROUP_ID
51+
52+
catalog_offering_version_crn = var.CATALOG_OFFERING_VERSION_CRN
53+
54+
vsi_profile = "bx2-2x8"
55+
vsi_interface = "public"
56+
vsi_user_data_file = ""
57+
58+
image_name = "packer-catalog-${local.timestamp}"
59+
60+
communicator = "ssh"
61+
ssh_username = "root"
62+
ssh_port = 22
63+
ssh_timeout = "15m"
64+
65+
timeout = "30m"
66+
}
67+
68+
build {
69+
sources = [
70+
"source.ibmcloud-vpc.catalog"
71+
]
72+
73+
provisioner "shell" {
74+
execute_command = "{{.Vars}} bash '{{.Path}}'"
75+
inline = [
76+
"echo 'Hello from IBM Cloud Packer Plugin - VPC Infrastructure'",
77+
"echo 'Hello from IBM Cloud Packer Plugin - VPC Infrastructure' >> /hello.txt"
78+
]
79+
}
80+
}

‎examples/build.vpc.centos-ansible.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.centos-encrypted.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.centos-parallel.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.centos.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.rhel.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.windows.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎examples/build.vpc.zprofile.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packer {
22
required_plugins {
33
ibmcloud = {
4-
version = ">=v3.0.4"
4+
version = ">=v3.0.0"
55
source = "github.com/IBM/ibmcloud"
66
}
77
}

‎version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var IBMCloudPluginVersion *version.PluginVersion
88

99
var (
1010
// Version is the main version number that is being run at the moment.
11-
Version = "v3.0.0"
11+
Version = "v3.1.0"
1212
VersionPrerelease = "dev"
1313
)
1414

0 commit comments

Comments
 (0)