Douglas Schilling Landgraf has uploaded a new change for review. Change subject: autoreg: vdsm-tool register verb ......................................................................
autoreg: vdsm-tool register verb - Added support to vdsm-tool register verb - Added key management_server_fingerprint - Added key engine_admin_password See also: vdsm-tool: Add register verb https://gerrit.ovirt.org/#/c/40966/ engine_page: vdsm-tool register verb integration https://gerrit.ovirt.org/#/c/41081/ Change-Id: I7417dfcf4165d88e4e22b315a03d0e4ac8984571 Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M autoinstall/autoreg-args M autoinstall/autoreg.py 2 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node-plugin-vdsm refs/changes/82/41082/1 diff --git a/autoinstall/autoreg-args b/autoinstall/autoreg-args index 8568cc7..1eefeb0 100644 --- a/autoinstall/autoreg-args +++ b/autoinstall/autoreg-args @@ -2,4 +2,5 @@ management_server_port management_server_fingerprint rhevm_admin_password +engine_admin_password ovirt_vdsm_disable diff --git a/autoinstall/autoreg.py b/autoinstall/autoreg.py index 16550c8..73a7de6 100644 --- a/autoinstall/autoreg.py +++ b/autoinstall/autoreg.py @@ -25,6 +25,7 @@ from ovirt.node.setup.vdsm import engine_page from ovirt.node.utils import system +# Log: /var/log/ovirt-node.log LOGGER = log.getLogger(__name__) ARGS = system.kernel_cmdline_arguments() @@ -43,15 +44,23 @@ def main(): LOGGER.info("== autoinstall: starting validation for kernel arguments ==") + # For autoreg using check-fqdn = False as previous autoinstall + # doesn't check CA cert + vdsm_tool_cmd = "vdsm-tool register --check-fqdn False " + if "ovirt_vdsm_disable" in ARGS: LOGGER.info("autoinstall: ovirt_vdsm_disabled is set, nothing to do!") return 0 + triggered_autoreg = False if is_karg_set("management_server"): # Updating OVIRT_MANAGEMENT_SERVER in /etc/default/ovirt engine_page.VDSM().update(server=ARGS["management_server"], port=None, cert_path=None) + vdsm_tool_cmd += "--engine-fqdn {s} ".format( + s=ARGS["management_server"]) + triggered_autoreg = True if is_karg_set("management_server_port"): if not is_karg_set("management_server", debug=False): @@ -64,15 +73,30 @@ engine_page.VDSM().update(server=ARGS["management_server"], port=ARGS["management_server_port"], cert_path=None) + vdsm_tool_cmd += "--engine-https-port {p} ".format( + p=ARGS["management_server_port"]) + triggered_autoreg = True - # For rhevm_admin_password use: + if is_karg_set("management_server_fingerprint"): + vdsm_tool_cmd += "--fingerprint {f}".format( + f=ARGS["management_server_fingerprint"]) + triggered_autoreg = True + + # For rhevm_admin_password/engine_admin_password use: # openssl passwd -1 to genereate the password + admin_pwd = None if is_karg_set("rhevm_admin_password"): + admin_pwd = "rhevm_admin_password" + + if is_karg_set("engine_admin_password"): + admin_pwd = "engine_admin_password" + + if admin_pwd: try: _functions.unmount_config("/etc/shadow") _functions.unmount_config("/etc/passwd") engine_page.execute_cmd("/usr/sbin/usermod -p %s root" % - ARGS["rhevm_admin_password"]) + ARGS[admin_pwd]) engine_page.execute_cmd("chage -E -1 root") utils.fs.Config().persist("/etc/shadow") @@ -86,6 +110,15 @@ SSH().update(pwauth=True) SSH().commit() + if triggered_autoreg: + LOGGER.info("autoinstall: vdsm-tool register command") + LOGGER.info("{c}".format(c=vdsm_tool_cmd)) + out, ret = engine_page.execute_cmd(vdsm_tool_cmd) + LOGGER.info("autoinstall: vdsm-tool ret: {o}".format(o=out)) + if ret != 0: + LOGGER.error("autoinstall: vdsm-tool register command FAILED!") + LOGGER.error("Full log: /var/log/vdsm/register.log") + LOGGER.info("== autoinstall: finished ==") return 0 -- To view, visit https://gerrit.ovirt.org/41082 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7417dfcf4165d88e4e22b315a03d0e4ac8984571 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node-plugin-vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
