diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/c_exec.go | 4 | ||||
| -rw-r--r-- | src/c_lhosts.go | 4 | ||||
| -rw-r--r-- | src/i_info.go | 14 |
3 files changed, 18 insertions, 4 deletions
diff --git a/src/c_exec.go b/src/c_exec.go index c62c8d5..ba93ec0 100644 --- a/src/c_exec.go +++ b/src/c_exec.go @@ -164,8 +164,8 @@ func c_format_openstack(host *HostNode, pass string) ([]string, []string) { "OS_USERNAME=" + host.User, "OS_PASSWORD=" + pass, "OS_AUTH_URL=" + host.Host, - "OS_USER_DOMAIN_ID=" + host.Stack.UserDomainId, - "OS_PROJECT_ID=" + host.Stack.ProjectId, + "OS_USER_DOMAIN_ID=" + host.Stack.UserDomainID, + "OS_PROJECT_ID=" + host.Stack.ProjectID, "OS_IDENTITY_API_VERSION=" + host.Stack.IdentityAPI, "OS_IMAGE_API_VERSION=" + host.Stack.ImageAPI, "OS_NETWORK_API_VERSION=" + host.Stack.NetworkAPI, diff --git a/src/c_lhosts.go b/src/c_lhosts.go index 026b65a..869b0f9 100644 --- a/src/c_lhosts.go +++ b/src/c_lhosts.go @@ -53,8 +53,8 @@ package main type StackSettings struct { - UserDomainId string `yaml:"user_domain_id"` - ProjectId string `yaml:"project_id"` + UserDomainID string `yaml:"user_domain_id"` + ProjectID string `yaml:"project_id"` IdentityAPI string `yaml:"identity_api_version"` ImageAPI string `yaml:"image_api_version"` NetworkAPI string `yaml:"network_api_version"` diff --git a/src/i_info.go b/src/i_info.go index 1620e05..1064e2d 100644 --- a/src/i_info.go +++ b/src/i_info.go @@ -336,6 +336,20 @@ func i_info_openstack(ui HardUI, host *HostNode, line int) int { (ui.dim[W] / 3) + 13, line, ui.dim[W] - 2, line, ui.style[STYLE_DEF], host.Host) if line += 1; line > ui.dim[H] - 3 { return line } + i_draw_text(ui.s, + (ui.dim[W] / 3) + 3, line, ui.dim[W] - 2, line, + ui.style[STYLE_TITLE], "User domain ID: ") + i_draw_text(ui.s, + (ui.dim[W] / 3) + 13, line, ui.dim[W] - 2, line, + ui.style[STYLE_DEF], host.Stack.UserDomainID) + if line += 1; line > ui.dim[H] - 3 { return line } + i_draw_text(ui.s, + (ui.dim[W] / 3) + 3, line, ui.dim[W] - 2, line, + ui.style[STYLE_TITLE], "Project ID: ") + i_draw_text(ui.s, + (ui.dim[W] / 3) + 13, line, ui.dim[W] - 2, line, + ui.style[STYLE_DEF], host.Stack.ProjectID) + if line += 1; line > ui.dim[H] - 3 { return line } return line } |