Changed option names in lxd config.go to correspond toml/json names

yyyar · Jun 7, 2017 · 201476f · 201476f
1 parent ccfb356
commit 201476f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/config/config.go b/src/config/config.go
@@ -234,9 +234,9 @@ type LXDDiscoveryConfig struct {
 	LXDServerRemoteName     string `toml:"lxd_server_remote_name" json:"lxd_server_remote_name"`
 	LXDServerRemotePassword string `toml:"lxd_server_remote_password" json:"lxd_server_remote_password"`
 
-	LXDClientConfigDirectory  string `toml:"lxd_config_directory" json:"lxd_config_directory"`
-	LXDClientGenerateCerts    bool   `toml:"lxd_generate_client_certs" json:"lxd_generate_client_certs"`
-	LXDClientAcceptServerCert bool   `toml:"lxd_accept_server_cert" json:"lxd_accept_server_cert"`
+	LXDConfigDirectory     string `toml:"lxd_config_directory" json:"lxd_config_directory"`
+	LXDGenerateClientCerts bool   `toml:"lxd_generate_client_certs" json:"lxd_generate_client_certs"`
+	LXDAcceptServerCert    bool   `toml:"lxd_accept_server_cert" json:"lxd_accept_server_cert"`
 
 	LXDContainerLabelKey   string `toml:"lxd_container_label_key" json:"lxd_container_label_key"`
 	LXDContainerLabelValue string `toml:"lxd_container_label_value" json:"lxd_container_label_value"`

diff --git a/src/discovery/lxd.go b/src/discovery/lxd.go
@@ -154,7 +154,7 @@ func lxdBuildClient(cfg config.DiscoveryConfig) (*lxd.Client, error) {
 	if strings.HasPrefix(cfg.LXDServerAddress, "https:") {
 
 		/* Validate or generate certificates on the client side (gobetween) */
-		if err := lxdhelpers.ValidateClientCertificates(lxdConfig, cfg.LXDClientGenerateCerts); err != nil {
+		if err := lxdhelpers.ValidateClientCertificates(lxdConfig, cfg.LXDGenerateClientCerts); err != nil {
 			return nil, err
 		}
 
@@ -180,7 +180,7 @@ func lxdBuildClient(cfg config.DiscoveryConfig) (*lxd.Client, error) {
 			 * But if there's an error, then gobetween will try to download the server's cert.
 			 */
 			if _, err := client.GetServerConfig(); err != nil {
-				if cfg.LXDClientAcceptServerCert {
+				if cfg.LXDAcceptServerCert {
 					var err error
 					client, err = lxdhelpers.GetRemoteCertificate(client, cfg.LXDServerRemoteName)
 					if err != nil {
@@ -236,7 +236,7 @@ func lxdBuildConfig(cfg config.DiscoveryConfig) (lxd.Config, error) {
 
 	/* Build an LXD configuration that will connect to the requested LXD server */
 	config := lxd.Config{
-		ConfigDir: cfg.LXDClientConfigDirectory,
+		ConfigDir: cfg.LXDConfigDirectory,
 		Remotes:   make(map[string]lxd.RemoteConfig),
 	}
 	config.Remotes[cfg.LXDServerRemoteName] = lxd.RemoteConfig{Addr: cfg.LXDServerAddress}

diff --git a/src/manager/manager.go b/src/manager/manager.go
@@ -356,8 +356,8 @@ func prepareConfig(name string, server config.Server, defaults config.Connection
 			server.Discovery.LXDServerRemoteName = "local"
 		}
 
-		if server.Discovery.LXDClientConfigDirectory == "" {
-			server.Discovery.LXDClientConfigDirectory = os.ExpandEnv("$HOME/.config/lxc")
+		if server.Discovery.LXDConfigDirectory == "" {
+			server.Discovery.LXDConfigDirectory = os.ExpandEnv("$HOME/.config/lxc")
 		}
 
 		if server.Discovery.LXDContainerInterface == "" {