Merge "FIX: Set default IPMI privilege level"

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index e5275c5..5cd0b9c 100644 (file)
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -61,6 +61,9 @@ class Config(config.Config):
         user_conf = self.confman.get_users_config_handler()
         self.set_caas_parameter('helm_home', "/home/{}/.helm".format(user_conf.get_admin_user()))
         self.set_caas_parameter('flavour', self.flavour_set())
+        admin_pwd = self.get_caas_parameter('admin_password')
+        self.config[self.ROOT]['admin_password'] = \
+                admin_pwd if admin_pwd != '' else self.generate_pwd(ADMIN_PWD_LENGTH)
         if not self.get_caas_parameter('dns_domain'):
             self.set_caas_parameter('dns_domain', DEFAULT_CAAS_DNS_DOMAIN)
         if not self.get_caas_parameter('infra_log_store'):
@@ -179,6 +182,9 @@ class Config(config.Config):
     def set_caas_parameter(self, parameter, value):
         self.config[self.ROOT][parameter] = value
 
+    def get_admin_password(self):
+        return self.config.get(self.ROOT, {}).get('admin_password')
+
     @staticmethod
     def generate_pwd(pwd_length):
         character_pool = string.ascii_letters + string.digits

diff --git a/cmdatahandlers/src/cmdatahandlers/users/config.py b/cmdatahandlers/src/cmdatahandlers/users/config.py
index 3aebbbf..9607194 100644 (file)
--- a/cmdatahandlers/src/cmdatahandlers/users/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/users/config.py
@@ -110,16 +110,3 @@ class Config(config.Config):
         self.config[self.ROOT]['admin_user_password'] = self.MASK
         self.config[self.ROOT]['initial_user_password'] = self.MASK
 
-    def get_admin_password(self):
-        """ get the admin password
-
-            Return:
-
-            The admin password
-
-            Raise:
-
-            ConfigError in-case of an error
-        """
-        return self.config[self.ROOT]['admin_password']
-

diff --git a/userconfigtemplate/user_config.yaml b/userconfigtemplate/user_config.yaml
index fff4488..64677ac 100644 (file)
--- a/userconfigtemplate/user_config.yaml
+++ b/userconfigtemplate/user_config.yaml
@@ -29,7 +29,7 @@
 ###        - Minor changes in template (e.g. new optional attributes or
 ###          changes in possible values, value ranges or default values)
 ###        - Backwards compatible
-version: 2.0.3
+version: 2.0.4
 
 ### Cloud name can consist of lower case letters, digits and dash (-).
 ### Name must start and end with a letter or a digit.
@@ -254,6 +254,13 @@ caas:
     ### The default value is: rec.io
     #dns_domain: "<VALUE>"
 
+    ### Tenant networks.
+    ### This list contains all provider networks dedicated to be used by CaaS tenant users.
+    ### These provider networks needs to binded homogenously to all CaaS hosts and the
+    ### provider network type must be caas.
+    ### SR-IOV provider networks also supported.
+    #tenant_networks: ["tenant_net1", "tenant_net2"]
+
 ### Storage configuration
 storage:
     #backends: