diff options
| author | baiyuan <bybai@cn.ibm.com> | 2015-05-26 03:59:29 -0400 |
|---|---|---|
| committer | baiyuan <bybai@cn.ibm.com> | 2015-06-03 00:59:09 -0400 |
| commit | 662bfb4887d5f66352db5eb78d2c2985260c07d1 (patch) | |
| tree | c40145d6934fb74d15d1bb449648bd2df070fda2 /ironic/drivers/modules/console_utils.py | |
| parent | 9bf6987a2012173bc130606fc30b5b42d54aac07 (diff) | |
| download | ironic-662bfb4887d5f66352db5eb78d2c2985260c07d1.tar.gz | |
fix node-get-console returns url always start with http
When we specify terminal_cert_dir in /etc/ironic/ironic.conf,
ironic node-get-console returns console_info url which should
start with https; When we do not specify terminal_cert_dir in
/etc/ironic/ironic.conf, console_info url should start with http.
Change-Id: Ief27e87a4f0f583954e54af6a03baf2c0b6d1104
Closes-Bug: 1458748
Diffstat (limited to 'ironic/drivers/modules/console_utils.py')
| -rw-r--r-- | ironic/drivers/modules/console_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py index 8b6b0128e..dfa77b310 100644 --- a/ironic/drivers/modules/console_utils.py +++ b/ironic/drivers/modules/console_utils.py @@ -155,8 +155,10 @@ def get_shellinabox_console_url(port): console_host = CONF.my_ip if netutils.is_valid_ipv6(console_host): console_host = '[%s]' % console_host - console_url = "http://%s:%s" % (console_host, port) - return console_url + scheme = 'https' if CONF.console.terminal_cert_dir else 'http' + return '%(scheme)s://%(host)s:%(port)s' % {'scheme': scheme, + 'host': console_host, + 'port': port} def start_shellinabox_console(node_uuid, port, console_cmd): |