Modifications for new terraform version, version bump to 1.5.0

diff --git a/lib/cr_tf/__init__.py b/lib/cr_tf/__init__.py
index 515d14db911c68ee6d39740cf82389d196736b2c..2304d5c77965fe808b8371c21cf2f4be81a67d8c 100644 (file)
--- a/lib/cr_tf/__init__.py
+++ b/lib/cr_tf/__init__.py
@@ -1,12 +1,12 @@
 #!/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = '1.4.12'
+__version__ = '1.5.0'
 
-MIN_VERSION_TERRAFORM = '0.12.2'
-MAX_VERSION_TERRAFORM = '0.12.99'
+MIN_VERSION_TERRAFORM = '1.0.5'
+MAX_VERSION_TERRAFORM = '1.2.0'
 
-MIN_VERSION_VSPHERE_PROVIDER = '1.11.0'
+MIN_VERSION_VSPHERE_PROVIDER = '2.0.0'
 
 CFGFILE_BASENAME = 'create-terraform.ini'
 

diff --git a/lib/cr_tf/handler.py b/lib/cr_tf/handler.py
index a702059295b21bf29521872994b516a3645063e2..80405f0ada85e7dbffcc2353d12283a095f243b1 100644 (file)
--- a/lib/cr_tf/handler.py
+++ b/lib/cr_tf/handler.py
@@ -2305,7 +2305,6 @@ class CreateTerraformHandler(BaseHandler):
 
         tpl = textwrap.dedent('''\
         variable "vsphere_user" {
-          default     = "Administrator@vsphere.local"
           description = "vSphere accountname to be used."
           type        = string
         }
@@ -2371,9 +2370,9 @@ class CreateTerraformHandler(BaseHandler):
           allow_unverified_ssl = true
         ''')
 
-        if self.min_version_vsphere_provider:
-            content += '  version              = ">= {}"\n'.format(
-                str(self.min_version_vsphere_provider))
+#        if self.min_version_vsphere_provider:
+#            content += '  version              = ">= {}"\n'.format(
+#                str(self.min_version_vsphere_provider))
 
         content += textwrap.dedent('''\
         }