X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fcaas%2Fconfig.py;h=9bfa280ffeb0debec23406cdd5285909939fdfaa;hb=07e2d272a64f764a4d9d61c886b9b21f24b30f07;hp=e5275c54f2e7b18617728e21c261d9264037ccf1;hpb=e19e8ce998299bb201a22682215614dd981ad6fc;p=ta%2Fconfig-manager.git

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index e5275c5..9bfa280 100644
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -29,7 +29,7 @@ BM_SOFT_EVICTION_THRESHOLD = "4Gi"
 VNF_EMBEDDED_HARD_EVICTION_THRESHOLD = "200Mi"
 BM_HARD_EVICTION_THRESHOLD = "2Gi"
 ADMIN_PWD_LENGTH = 20
-DEFAULT_CAAS_INFRA_LOG_TYPE = 'remote_syslog'
+DEFAULT_CAAS_INFRA_LOG_TYPE = 'elasticsearch'
 
 
 class Config(config.Config):
@@ -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