lib/specinfra/command/fedora.rb in specinfra-1.18.3 vs lib/specinfra/command/fedora.rb in specinfra-1.18.4
- old
+ new
@@ -1,11 +1,11 @@
module SpecInfra
module Command
class Fedora < RedHat
def check_enabled(service, target="multi-user.target")
- host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
- if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+ host_port = SpecInfra.configuration.ssh ? [SpecInfra.configuration.ssh.host, SpecInfra.configuration.ssh.options[:port]] : ['localhost', nil]
+ if property.has_key?(:os_by_host) && property[:os_by_host][host_port][:release].to_i < 15
super
else
# Fedora 15+ uses systemd which no longer has runlevels but targets
# For backwards compatibility, Fedora provides pseudo targets for
# runlevels
@@ -15,11 +15,11 @@
"systemctl --plain list-dependencies #{target} | grep '^#{escape(service)}.service$'"
end
end
def check_running(service)
- host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
- if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+ host_port = SpecInfra.configuration.ssh ? [SpecInfra.configuration.ssh.host, SpecInfra.configuration.ssh.options[:port]] : ['localhost', nil]
+ if property.has_key?(:os_by_host) && property[:os_by_host][host_port][:release].to_i < 15
super
else
"systemctl is-active #{escape(service)}.service"
end
end