removed deprecated generation directive

IBM-Cloud · Apr 26, 2021 · f30cae0 · f30cae0
1 parent 80eba16
commit f30cae0
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 32 deletions.
diff --git a/tests/runner.sh b/tests/runner.sh
@@ -41,7 +41,6 @@ fi
 # log in
 ibmcloud config --check-version=false
 ibmcloud login --apikey $API_KEY -r $REGION -g $RESOURCE_GROUP
-ibmcloud is target --gen 2
 
 if [ "$KEYS" ];
 then

diff --git a/vpc-app-deploy/README.md b/vpc-app-deploy/README.md
@@ -3,15 +3,14 @@ How to install software and files onto a Virtual Private Cloud, VPC, virtual ser
 
 Here is the full [solution tutorial](https://cloud.ibm.com/docs/solution-tutorials?topic=solution-tutorials-vpc-app-deploy)
 
-Each of the following examples will do the deployment as descibed in the tutorial then test the deployment and finally destroy the stuff provisioned.
+Each of the following examples will do the deployment as described in the tutorial then test the deployment and finally destroy the stuff provisioned.
 
 
 First you must initialize the current shell:
 ```
 cp export.template export
 vi export; # fill in the environment variables
 source export
-ibmcloud is target --gen 2
 ```
 
 To run the cli example:

diff --git a/vpc-app-deploy/ansible/tf/main.tf b/vpc-app-deploy/ansible/tf/main.tf
@@ -2,7 +2,6 @@
 provider "ibm" {
   region           = "${var.region}"
   ibmcloud_api_key = "${var.ibmcloud_api_key}"
-  generation       = 2
   ibmcloud_timeout = "${var.ibmcloud_timeout}"
 }
 

diff --git a/vpc-app-deploy/tf/main.tf b/vpc-app-deploy/tf/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   region           = var.region
   ibmcloud_api_key = var.ibmcloud_api_key
-  generation       = 2
   ibmcloud_timeout = var.ibmcloud_timeout
 }
 

diff --git a/vpc-app-deploy/tfinstance/main.tf b/vpc-app-deploy/tfinstance/main.tf
@@ -29,7 +29,6 @@ provider "ibm" {
   region           = var.region
   ibmcloud_api_key = var.ibmcloud_api_key
   ibmcloud_timeout = var.ibmcloud_timeout
-  generation       = 2
 }
 
 data "ibm_resource_group" "group" {

diff --git a/vpc-autoscale/providers.tf b/vpc-autoscale/providers.tf
@@ -1,6 +1,5 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   region           = var.region
-  generation       = 2
   ibmcloud_timeout = var.ibmcloud_timeout
 }
diff --git a/vpc-cockroachdb-mzr/main.tf b/vpc-cockroachdb-mzr/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   ibmcloud_timeout = 300
-  generation       = 2
   region           = var.vpc_region
 }
 

diff --git a/vpc-import-image/000-prereqs.sh b/vpc-import-image/000-prereqs.sh
@@ -9,7 +9,7 @@ ibmcloud target -g $RESOURCE_GROUP_NAME
 
 echo ">>> Setting VPC Gen for compute..."
 if ibmcloud is >/dev/null; then
-  ibmcloud is target --gen 2
+  echo "is plugin is OK"
 else
   echo "Make sure vpc-infrastructure plugin is properly installed with ibmcloud plugin install vpc-infrastructure."
   exit 1

diff --git a/vpc-import-image/create-vpc-vsi/main.tf b/vpc-import-image/create-vpc-vsi/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   region           = var.region
-  generation       = 2
 }
 
 data "ibm_is_image" "ds_image" {

diff --git a/vpc-instance-storage/providers.tf b/vpc-instance-storage/providers.tf
@@ -1,6 +1,5 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   ibmcloud_timeout = 300
-  generation       = 2
   region           = var.vpc_region
 }
diff --git a/vpc-lamp/instance.tf b/vpc-lamp/instance.tf
@@ -106,7 +106,7 @@ resource "ibm_is_instance" "vpc_vsi" {
   name           = "${var.resources_prefix}-vsi"
   vpc            = ibm_is_vpc.vpc.id
   zone           = "${var.vpc_region}-1" 
-  keys           = ["${data.ibm_is_ssh_key.ssh_key.id}"]
+  keys           = [data.ibm_is_ssh_key.ssh_key.id]
   image          = data.ibm_is_image.image_name.id
   profile        = var.vpc_image_profile
   resource_group = data.ibm_resource_group.group.id

diff --git a/vpc-lamp/main.tf b/vpc-lamp/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   ibmcloud_timeout = 300
-  generation       = 2
   region           = var.vpc_region
 }
 

diff --git a/vpc-migrate-from-classic/000-prereqs.sh b/vpc-migrate-from-classic/000-prereqs.sh
@@ -6,7 +6,7 @@ ibmcloud target -g $RESOURCE_GROUP_NAME
 
 echo ">>> Setting VPC Gen for compute..."
 if ibmcloud is >/dev/null; then
-  ibmcloud is target --gen 2
+  echo "is plugin is OK"
 else
   echo "Make sure vpc-infrastructure plugin is properly installed with ibmcloud plugin install vpc-infrastructure."
   exit 1

diff --git a/vpc-migrate-from-classic/create-vpc-ssh-key/main.tf b/vpc-migrate-from-classic/create-vpc-ssh-key/main.tf
@@ -4,7 +4,6 @@ variable "ssh_key_name" {}
 
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
-  generation       = 2
 }
 
 resource "ibm_is_ssh_key" "key" {

diff --git a/vpc-migrate-from-classic/create-vpc-vsi/main.tf b/vpc-migrate-from-classic/create-vpc-vsi/main.tf
@@ -2,7 +2,6 @@ provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   region           = var.region
   ibmcloud_timeout = var.ibmcloud_timeout
-  generation       = 2
 }
 
 data "ibm_is_image" "ds_image" {

diff --git a/vpc-migrate-from-classic/pipeline_build.sh b/vpc-migrate-from-classic/pipeline_build.sh
@@ -26,7 +26,7 @@ install_software() {
   ibmcloud login --apikey $IBMCLOUD_API_KEY -r $REGION
   ibmcloud plugin install vpc-infrastructure -f
   ibmcloud plugin install cloud-object-storage -f
-  ibmcloud is target --gen 1
+  # ibmcloud is target --gen 1
   ibmcloud plugin update -all
 
   # qemu

diff --git a/vpc-multi-region/README.md b/vpc-multi-region/README.md
@@ -12,11 +12,6 @@ The scripts in this directory can be used to deploy or clean up the resources fo
 ## Instructions
 
 1. In a browser visit [IAM authorizations](https://cloud.ibm.com/iam/authorizations) and add an authorization from the source: **VPC Infrastructure**, **Load Balancer for VPC** to the Target **Certificate Manager**
-1. Target the VPC generation:
-
-   ```
-   ibmcloud is target --gen 2
-   ```
 
 1. Open the terminal and add your SSH key
 

diff --git a/vpc-one-vsi/tf/providers.tf b/vpc-one-vsi/tf/providers.tf
@@ -1,6 +1,5 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   region           = var.region
-  generation       = 2
   ibmcloud_timeout = var.ibmcloud_timeout
 }
diff --git a/vpc-public-app-private-backend/tf/main.tf b/vpc-public-app-private-backend/tf/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   region           = var.region
   ibmcloud_api_key = var.ibmcloud_api_key
-  generation       = 2
   ibmcloud_timeout = var.ibmcloud_timeout
 }
 

diff --git a/vpc-secure-management-bastion-server/tf/main.tf b/vpc-secure-management-bastion-server/tf/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   region           = var.region
   ibmcloud_api_key = var.ibmcloud_api_key
-  generation       = 2
   ibmcloud_timeout = var.ibmcloud_timeout
 }
 

diff --git a/vpc-site2site-vpn/tf/main.tf b/vpc-site2site-vpn/tf/main.tf
@@ -1,7 +1,6 @@
 provider "ibm" {
   region                = var.region
   ibmcloud_api_key      = var.ibmcloud_api_key
-  generation            = 2
   iaas_classic_username = var.iaas_classic_username
   iaas_classic_api_key  = var.iaas_classic_api_key
   ibmcloud_timeout      = var.ibmcloud_timeout

diff --git a/vpc-terraform-multicloud/multicloud/ibm.tf b/vpc-terraform-multicloud/multicloud/ibm.tf
@@ -1,7 +1,6 @@
 # VPC with one subnet, one VSI and a floating IP
 provider "ibm" {
   region           = var.ibm_region
-  generation       = 2
 }
 
 resource "ibm_is_vpc" "vpc" {

diff --git a/vpc-terraform-multicloud/part1a/ibm.tf b/vpc-terraform-multicloud/part1a/ibm.tf
@@ -1,7 +1,6 @@
 # VPC with one subnet, one VSI and a floating IP
 provider "ibm" {
   region           = var.ibm_region
-  generation       = 2
 }
 
 resource "ibm_is_vpc" "vpc" {

diff --git a/vpc-terraform-multicloud/part1b/ibm.tf b/vpc-terraform-multicloud/part1b/ibm.tf
@@ -1,7 +1,6 @@
 # VPC with one subnet, one VSI and a floating IP
 provider "ibm" {
   region           = var.ibm_region
-  generation       = 2
 }
 
 resource "ibm_is_vpc" "vpc" {

diff --git a/vpc-terraform-multicloud/part1c/ibm.tf b/vpc-terraform-multicloud/part1c/ibm.tf
@@ -1,7 +1,6 @@
 # VPC with one subnet, one VSI and a floating IP
 provider "ibm" {
   region           = var.ibm_region
-  generation       = 2
 }
 
 resource "ibm_is_vpc" "vpc" {

diff --git a/vpc-terraform-multicloud/part2/ibm.tf b/vpc-terraform-multicloud/part2/ibm.tf
@@ -1,7 +1,6 @@
 # VPC with one subnet, one VSI and a floating IP
 provider "ibm" {
   region           = var.ibm_region
-  generation       = 2
 }
 
 resource "ibm_is_vpc" "vpc" {

diff --git a/vpc-terraform-multicloud/work/ibm.tf b/vpc-terraform-multicloud/work/ibm.tf
@@ -2,7 +2,6 @@
 provider "ibm" {
   region           = var.ibm_region
   ibmcloud_api_key = var.ibmcloud_api_key # /DELETE_ON_PUBLISH/d
-  generation       = 2
 }
 
 resource "ibm_is_vpc" "vpc" {