Skip to content

Commit 9822c93

Browse files
committed
moving evmserverd to core
1 parent ff23128 commit 9822c93

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

Diff for: spec/models/miq_worker/systemd_common_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
it "every worker has a matching systemd target and service file", :providers_common => true do
66
expected_units = (Vmdb::Plugins.systemd_units + Rails.root.join("systemd").glob("*.*")).map(&:basename).map(&:to_s)
77

8-
expected_units.delete("manageiq.target")
8+
expected_units -= %w[manageiq-db-ready.service evmserverd.service manageiq.target]
99

1010
found_units = MiqWorkerType.worker_classes.flat_map do |worker_class|
1111
service_base_name = worker_class.service_base_name

Diff for: systemd/evmserverd.service

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[Unit]
2+
Description=EVM server daemon
3+
After=memcached.service manageiq-db-ready.service
4+
Wants=memcached.service manageiq-db-ready.service
5+
6+
[Service]
7+
WorkingDirectory=/var/www/miq/vmdb
8+
EnvironmentFile=/etc/default/manageiq*.properties
9+
Environment=EVMSERVER=true
10+
ExecStart=/usr/bin/ruby lib/workers/bin/evm_server.rb
11+
Group=manageiq
12+
UMask=0002
13+
Restart=on-failure
14+
15+
[Install]
16+
WantedBy=multi-user.target

Diff for: systemd/manageiq-db-ready.service

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[Unit]
2+
Description=ManageIQ DB Ready
3+
After=network.target
4+
Before=evmserverd.service
5+
ConditionPathExists=/var/www/miq/vmdb/config/database.yml
6+
7+
[Service]
8+
ExecStart=/usr/bin/manageiq-db-ready
9+
EnvironmentFile=/etc/default/manageiq*.properties
10+
TimeoutStartSec=infinity
11+
Type=oneshot
12+
13+
[Install]
14+
WantedBy=multi-user.target

0 commit comments

Comments
 (0)