Change in vdsm[master]: vdsm_config: move download certificate
danken at redhat.com
danken at redhat.com
Sat Apr 12 13:27:32 UTC 2014
Dan Kenigsberg has posted comments on this change.
Change subject: vdsm_config: move download certificate
......................................................................
Patch Set 8: Code-Review-1
(4 comments)
http://gerrit.ovirt.org/#/c/26718/8/vdsm_reg/vdsm-config
File vdsm_reg/vdsm-config:
Line 97:
Line 98: if [ ! -z "$management_server_fingerprint" ]; then
Line 99: if ! grep fingerprint /etc/vdsm-reg/vdsm-reg.conf &> /dev/null
Line 100: then
Line 101: echo "# Fingerprint of oVirt Engine CA" >> /etc/vdsm-reg/vdsm-reg.conf
better be like everything else in this file: put these lines in vdsm-reg.conf.in and replace them with sed.
Line 102: echo "fingerprint = $management_server_fingerprint" >> /etc/vdsm-reg/vdsm-reg.conf
Line 103: persist /etc/vdsm-reg/vdsm-reg.conf
Line 104: fi
Line 105: fi
http://gerrit.ovirt.org/#/c/26718/8/vdsm_reg/vdsm-reg-setup.in
File vdsm_reg/vdsm-reg-setup.in:
Line 27: from ConfigParser import NoOptionError
Line 28: try:
Line 29: from ovirtnode import ovirtfunctions
Line 30: except ImportError:
Line 31: # Continue if it's not a ovirt-node based distro
Why? Do we expect to have vdsm-reg elsewhere?
Line 32: pass
Line 33:
Line 34: TICKET_RETRIES=3
Line 35: DEFAULT_CONFIG_FILE="/etc/vdsm-reg/vdsm-reg.conf"
Line 319:
Line 320: cfg_port = config.get('vars', 'vdc_host_port')
Line 321: cfg_host = config.get('vars', 'vdc_host_name')
Line 322:
Line 323: if cfg_port and cfg_host is not None \
How can cfg_host can ever be None?
Line 324: and not os.path.exists(engineWebCACert):
Line 325: if deployUtil.getRhevmCert(cfg_host, cfg_port):
Line 326: if deployUtil.isOvirt():
Line 327: ovirtfunctions.ovirt_store_config(engineWebCACert)
Line 330: engine_fprint = deployUtil.generateFingerPrint(engineWebCACert)
Line 331: if cfg_fprint.upper() != engine_fprint.upper():
Line 332: if deployUtil.isOvirt():
Line 333: ovirtfunctions.ovirt_safe_delete_config(engineWebCACert)
Line 334: print "Failed: Fingerprint provided in vdsm-reg" \
Please conform with other error text in this file
Line 335: " differs from Engine"
Line 336: else:
Line 337: print "Failed downloading the Engine certificate file"
Line 338:
--
To view, visit http://gerrit.ovirt.org/26718
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia2c025eedd2be92b9418ddbe01efc02c913af2a7
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
More information about the vdsm-patches
mailing list