From 5f509c35e8280b81cf90f31a62ecdaf2bc5e5747 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 9 Sep 2021 16:14:21 +0200 Subject: [PATCH] Modifications for new terraform version, version bump to 1.5.0 --- lib/cr_tf/__init__.py | 8 ++++---- lib/cr_tf/handler.py | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/cr_tf/__init__.py b/lib/cr_tf/__init__.py index 515d14d..2304d5c 100644 --- 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 a702059..80405f0 100644 --- 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('''\ } -- 2.39.5