diff --git a/client/auth.go b/client/auth.go index 3f2a1c3f5..c701635ca 100644 --- a/client/auth.go +++ b/client/auth.go @@ -103,7 +103,6 @@ func LoadKeystoneAuthOptionsFromEnv() *KeystoneAuthOptions { } opt.Password = pwdCiphertext - opt.TenantName = os.Getenv(OsTenantName) projectName := os.Getenv(OsProjectName) opt.DomainID = os.Getenv(OsUserDomainId) diff --git a/script/devsds/install.sh b/script/devsds/install.sh index 9f009d04f..4f1443ef7 100755 --- a/script/devsds/install.sh +++ b/script/devsds/install.sh @@ -157,7 +157,7 @@ echo echo "Execute commands blow to set up ENVs which are needed by OpenSDS CLI:" echo "------------------------------------------------------------------" echo "export OPENSDS_AUTH_STRATEGY=$OPENSDS_AUTH_STRATEGY" -echo "export OPENSDS_ENDPOINT=https://localhost:50040" +echo "export OPENSDS_ENDPOINT=http://localhost:50040" if osds::util::is_service_enabled keystone; then echo "source $DEV_STACK_DIR/openrc" fi diff --git a/script/devsds/lib/certificate.sh b/script/devsds/lib/certificate.sh index 0f0923ad1..4f047ded8 100644 --- a/script/devsds/lib/certificate.sh +++ b/script/devsds/lib/certificate.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright (c) 2019 Huawei Technologies Co., Ltd. All Rights Reserved. # diff --git a/script/tools/pwdEncrypter/pwdEncrypter.go b/script/tools/pwdEncrypter/passwordencrypter.go similarity index 93% rename from script/tools/pwdEncrypter/pwdEncrypter.go rename to script/tools/pwdEncrypter/passwordencrypter.go index 46cc41f91..dd087f8ed 100644 --- a/script/tools/pwdEncrypter/pwdEncrypter.go +++ b/script/tools/pwdEncrypter/passwordencrypter.go @@ -30,7 +30,7 @@ const ( ) type tool struct { - encrypter string `yaml:"PwdEncrypter,omitempty"` + PwdEncrypter string `yaml:"PwdEncrypter,omitempty"` } var encrypterCommand = &cobra.Command{ @@ -59,7 +59,7 @@ func encrypter(cmd *cobra.Command, args []string) { } // Encrypt the password - encrypterTool := pwd.NewPwdEncrypter(pwdEncrypter.encrypter) + encrypterTool := pwd.NewPwdEncrypter(pwdEncrypter.PwdEncrypter) plaintext, err := encrypterTool.Encrypter(args[0]) if err != nil { fmt.Println("Encrypt password error:", err) @@ -70,7 +70,7 @@ func encrypter(cmd *cobra.Command, args []string) { } func loadConf(f string) (*tool, error) { - var conf = &tool{} + conf := &tool{} confYaml, err := ioutil.ReadFile(f) if err != nil { return nil, fmt.Errorf("Read config yaml file (%s) failed, reason:(%v)", f, err)