Alex Lourie has uploaded a new change for review. Change subject: packaging: Starting ssh before adding host in AIO ......................................................................
packaging: Starting ssh before adding host in AIO In some cases during the AIO installation, host cannot be added because ssh server is not started by default on Fedora 18. This patch verifies that AIO plugin requires openssh-server package and that ssh service is started before adding host. Bug-Url: https://bugzilla.redhat.com/896472 Change-Id: I84cbacec81d08cc72d8951887b5ad44c3c2cb4fa Signed-off-by: Alex Lourie <[email protected]> (cherry picked from commit 52268c01b099ddce58aae9627c701761d46b92fd) (cherry picked from commit bb2ed17e901695c0fa92e24bd2e7f9425a623373) --- M packaging/fedora/setup/plugins/all_in_one_100.py M packaging/fedora/spec/ovirt-engine.spec.in 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/12133/1 diff --git a/packaging/fedora/setup/plugins/all_in_one_100.py b/packaging/fedora/setup/plugins/all_in_one_100.py index 5af602f..c5453a5 100644 --- a/packaging/fedora/setup/plugins/all_in_one_100.py +++ b/packaging/fedora/setup/plugins/all_in_one_100.py @@ -56,7 +56,7 @@ ERROR_LIBVIRT_STATUS = "Error: Could not get status of the libvirt service" ERROR_JBOSS_STATUS = "Error: There's a problem with JBoss service.\ Check that it's up and rerun setup." - +ERROR_SSHD_START = "Error: sshd service could not be started. Cannot continue" # PARAMS PAUSE = 10 SLEEP_PERIOD = 25 # period in seconds, this is waiting until JBoss is up @@ -279,6 +279,12 @@ global controller logging.debug("Adding the local host") try: + sshd = utils.Service("sshd") + if sshd.available(): + sshd.autoStart() + sshd.start() + else: + raise Exception(ERROR_SSHD_START) controller.CONF["API_OBJECT"].hosts.add(params.Host(name=LOCAL_HOST, address=controller.CONF["HOST_FQDN"], reboot_after_installation=False, diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 990845c..922a045 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -345,6 +345,7 @@ Requires: %{name}-sdk Requires: vdsm Requires: ovirt-host-deploy-offline +Requires: openssh-server %description setup-plugin-allinone All-in-one plugin for %{product_name_short}'s setup -- To view, visit http://gerrit.ovirt.org/12133 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84cbacec81d08cc72d8951887b5ad44c3c2cb4fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: engine_3.2 Gerrit-Owner: Alex Lourie <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
