VSphere users have no default anymore

diff --git a/etc/create-terraform.ini.default b/etc/create-terraform.ini.default
index cf358968ceb34992dc653803d7af9c18e9bc8467..1fcae2ceb046fcafdadb7929970667ad2a4fa2e4 100644 (file)
--- a/etc/create-terraform.ini.default
+++ b/etc/create-terraform.ini.default
@@ -26,7 +26,7 @@ host = vcs01.ppbrln.internal
 port = 443
 
 ; Sollte mit einem personalisieretem Account überschrieben werden
-user = Administrator@vsphere.local
+;user =
 
 ; Bitte überschreiben ...
 ;password = 
@@ -49,7 +49,8 @@ host = test-vcsa01.pixelpark.net
 
 port = 443
 
-user = Administrator@vsphere.local
+; Sollte mit einem personalisieretem Account überschrieben werden
+;user =
 
 ;password =
 

diff --git a/lib/cr_tf/config.py b/lib/cr_tf/config.py
index 5827703ceb84e971c90898f8f1466158f7370bf4..cd6f1440cdbe15e7c867d87ac6b5daa77e18261f 100644 (file)
--- a/lib/cr_tf/config.py
+++ b/lib/cr_tf/config.py
@@ -32,7 +32,7 @@ from .errors import CrTfConfigError
 
 from .xlate import XLATOR
 
-__version__ = '1.4.0'
+__version__ = '1.4.1'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -45,7 +45,6 @@ class VsphereConfig(FbBaseObject):
 
     default_host = 'vcs01.ppbrln.internal'
     default_port = 443
-    default_user = 'Administrator@vsphere.local'
     default_dc = 'vmcc'
     default_cluster = 'vmcc-l105-01'
     default_min_root_size_gb = 32.0
@@ -63,7 +62,7 @@ class VsphereConfig(FbBaseObject):
         self._name = None
         self._host = self.default_host
         self._port = self.default_port
-        self._user = self.default_user
+        self._user = None
         self._password = None
         self._dc = self.default_dc
         self._cluster = self.default_cluster
@@ -180,11 +179,11 @@ class VsphereConfig(FbBaseObject):
     @user.setter
     def user(self, value):
         if value is None:
-            self._user = self.default_user
+            self._user = None
             return
         val = str(value).strip()
         if val == '':
-            self._user = self.default_user
+            self._user = None
         else:
             self._user = val