Refactoring monit start/stop commands
This commit is contained in:
parent
040ccc35f2
commit
9b9b75a2f5
@ -119,51 +119,10 @@ when "fedora"
|
|||||||
"nova_vncproxy_consoleauth_packages" => ["openstack-nova"],
|
"nova_vncproxy_consoleauth_packages" => ["openstack-nova"],
|
||||||
"libvirt_packages" => ["libvirt"],
|
"libvirt_packages" => ["libvirt"],
|
||||||
"libvirt_service" => "libvirtd",
|
"libvirt_service" => "libvirtd",
|
||||||
|
"mysql_service" => "mysqld",
|
||||||
"common_packages" => ["openstack-nova"],
|
"common_packages" => ["openstack-nova"],
|
||||||
"iscsi_helper" => "ietadm",
|
"iscsi_helper" => "ietadm",
|
||||||
"package_overrides" => "",
|
"package_overrides" => "",
|
||||||
"monit_commands" => {
|
|
||||||
"mysqld" => {
|
|
||||||
"start" => "/usr/sbin/service mysqld start",
|
|
||||||
"stop" => "/usr/sbin/service mysqld stop"
|
|
||||||
},
|
|
||||||
"nova-compute" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-compute start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-compute stop"
|
|
||||||
},
|
|
||||||
"nova-network" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-network start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-network stop"
|
|
||||||
},
|
|
||||||
"nova-scheduler" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-scheduler start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-scheduler stop"
|
|
||||||
},
|
|
||||||
"nova-volume" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-volume start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-volume stop"
|
|
||||||
},
|
|
||||||
"nova-api-os-compute" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-api-os-compute start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-api-os-compute stop"
|
|
||||||
},
|
|
||||||
"nova-api-os-volume" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-api-os-volume start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-api-os-volume stop"
|
|
||||||
},
|
|
||||||
"nova-api-ec2" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-api-ec2 start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-api-ec2 stop"
|
|
||||||
},
|
|
||||||
"nova-api-metadata" => {
|
|
||||||
"start" => "/usr/sbin/service openstack-nova-api-metadata start",
|
|
||||||
"stop" => "/usr/sbin/service openstack-nova-api-metadata stop"
|
|
||||||
},
|
|
||||||
"libvirt-bin" => {
|
|
||||||
"start" => "/usr/sbin/service libvirt-bin start",
|
|
||||||
"stop" => "/usr/sbin/service libvirt-bin stop"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
when "ubuntu"
|
when "ubuntu"
|
||||||
default["nova"]["platform"] = {
|
default["nova"]["platform"] = {
|
||||||
@ -189,55 +148,9 @@ when "ubuntu"
|
|||||||
"nova_vncproxy_consoleauth_service" => "nova-consoleauth",
|
"nova_vncproxy_consoleauth_service" => "nova-consoleauth",
|
||||||
"libvirt_packages" => ["libvirt-bin"],
|
"libvirt_packages" => ["libvirt-bin"],
|
||||||
"libvirt_service" => "libvirt-bin",
|
"libvirt_service" => "libvirt-bin",
|
||||||
|
"mysql_service" => "mysql",
|
||||||
"common_packages" => ["nova-common"],
|
"common_packages" => ["nova-common"],
|
||||||
"iscsi_helper" => "tgtadm",
|
"iscsi_helper" => "tgtadm",
|
||||||
"package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'",
|
"package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
|
||||||
"monit_commands" => {
|
|
||||||
"mysqld" => {
|
|
||||||
"start" => "/usr/sbin/service mysql start",
|
|
||||||
"stop" => "/usr/sbin/service mysql stop"
|
|
||||||
},
|
|
||||||
"nova-compute" => {
|
|
||||||
"start" => "/usr/sbin/service nova-compute start",
|
|
||||||
"stop" => "/usr/sbin/service nova-compute stop"
|
|
||||||
},
|
|
||||||
"nova-network" => {
|
|
||||||
"start" => "/usr/sbin/service nova-network start",
|
|
||||||
"stop" => "/usr/sbin/service nova-network stop"
|
|
||||||
},
|
|
||||||
"nova-scheduler" => {
|
|
||||||
"start" => "/usr/sbin/service nova-scheduler start",
|
|
||||||
"stop" => "/usr/sbin/service nova-scheduler stop"
|
|
||||||
},
|
|
||||||
"nova-volume" => {
|
|
||||||
"start" => "/usr/sbin/service nova-volume start",
|
|
||||||
"stop" => "/usr/sbin/service nova-volume stop"
|
|
||||||
},
|
|
||||||
"nova-api-os-compute" => {
|
|
||||||
"start" => "/usr/sbin/service nova-api-os-compute start",
|
|
||||||
"stop" => "/usr/sbin/service nova-api-os-compute stop"
|
|
||||||
},
|
|
||||||
"nova-api-os-volume" => {
|
|
||||||
"start" => "/usr/sbin/service nova-api-os-volume start",
|
|
||||||
"stop" => "/usr/sbin/service nova-api-os-volume stop"
|
|
||||||
},
|
|
||||||
"nova-api-ec2" => {
|
|
||||||
"start" => "/usr/sbin/service nova-api-ec2 start",
|
|
||||||
"stop" => "/usr/sbin/service nova-api-ec2 stop"
|
|
||||||
},
|
|
||||||
"nova-api-metadata" => {
|
|
||||||
"start" => "/usr/sbin/service nova-api-metadata start",
|
|
||||||
"stop" => "/usr/sbin/service nova-api-metadata stop"
|
|
||||||
},
|
|
||||||
"nova-consoleauth" => {
|
|
||||||
"start" => "/usr/sbin/service nova-consoleauth start",
|
|
||||||
"stop" => "/usr/sbin/service nova-consoleauth stop"
|
|
||||||
},
|
|
||||||
"libvirt-bin" => {
|
|
||||||
"start" => "/usr/sbin/service libvirt-bin start",
|
|
||||||
"stop" => "/usr/sbin/service libvirt-bin stop"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-api-ec2" do
|
monit_procmon "nova-api-ec2" do
|
||||||
process_name "nova-api-ec2"
|
process_name "nova-api-ec2"
|
||||||
start_cmd platform_options["monit_commands"]["nova-api-ec2"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["api_ec2_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-api-ec2"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["api_ec2_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-api-metadata" do
|
monit_procmon "nova-api-metadata" do
|
||||||
process_name "nova-api-metadata"
|
process_name "nova-api-metadata"
|
||||||
start_cmd platform_options["monit_commands"]["nova-api-metadata"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["nova_api_metadata_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-api-metadata"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["nova_api_metadata_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-api-os-compute" do
|
monit_procmon "nova-api-os-compute" do
|
||||||
process_name "nova-api-os-compute"
|
process_name "nova-api-os-compute"
|
||||||
start_cmd platform_options["monit_commands"]["nova-api-os-compute"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["api_os_compute_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-api-os-compute"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["api_os_compute_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-api-os-volume" do
|
monit_procmon "nova-api-os-volume" do
|
||||||
process_name "nova-api-os-volume"
|
process_name "nova-api-os-volume"
|
||||||
start_cmd platform_options["monit_commands"]["nova-api-os-volume"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["api_os_volume_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-api-os-volume"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["api_os_volume_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-compute" do
|
monit_procmon "nova-compute" do
|
||||||
process_name "nova-compute"
|
process_name "nova-compute"
|
||||||
start_cmd platform_options["monit_commands"]["nova-compute"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["nova_compute_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-compute"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["nova_compute_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -48,8 +48,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "libvirt-bin" do
|
monit_procmon "libvirt-bin" do
|
||||||
process_name "libvirtd"
|
process_name "libvirtd"
|
||||||
start_cmd platform_options["monit_commands"]["libvirt-bin"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["libvirt_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["libvirt-bin"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["libvirt_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -27,8 +27,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-network" do
|
monit_procmon "nova-network" do
|
||||||
process_name "nova-network"
|
process_name "nova-network"
|
||||||
start_cmd platform_options["monit_commands"]["nova-network"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["nova_network_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-network"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["nova_network_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Cookbook Name:: nova
|
# Cookbook Name:: nova
|
||||||
# Recipe:: nova-db
|
# Recipe:: nova-db-monitoring
|
||||||
#
|
#
|
||||||
# Copyright 2009, Rackspace Hosting, Inc.
|
# Copyright 2009, Rackspace Hosting, Inc.
|
||||||
#
|
#
|
||||||
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "mysqld" do
|
monit_procmon "mysqld" do
|
||||||
process_name "mysqld"
|
process_name "mysqld"
|
||||||
start_cmd platform_options["monit_commands"]["mysqld"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["mysql_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["mysqld"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["mysql_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-scheduler" do
|
monit_procmon "nova-scheduler" do
|
||||||
process_name "nova-scheduler"
|
process_name "nova-scheduler"
|
||||||
start_cmd platform_options["monit_commands"]["nova-scheduler"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["nova_scheduler_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-scheduler"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["nova_scheduler_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-consoleauth" do
|
monit_procmon "nova-consoleauth" do
|
||||||
process_name "nova-consoleauth"
|
process_name "nova-consoleauth"
|
||||||
start_cmd platform_options["monit_commands"]["nova-consoleauth"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["nova_vncproxy_consoleauth_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-consoleauth"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["nova_vncproxy_consoleauth_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
@ -26,8 +26,8 @@ if node["enable_monit"]
|
|||||||
|
|
||||||
monit_procmon "nova-volume" do
|
monit_procmon "nova-volume" do
|
||||||
process_name "nova-volume"
|
process_name "nova-volume"
|
||||||
start_cmd platform_options["monit_commands"]["nova-volume"]["start"]
|
start_cmd "/usr/sbin/service " + platform_options["nova_volume_service"] + " start"
|
||||||
stop_cmd platform_options["monit_commands"]["nova-volume"]["stop"]
|
stop_cmd "/usr/sbin/service " + platform_options["nova_volume_service"] + " stop"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
########################################
|
########################################
|
||||||
|
Loading…
Reference in New Issue
Block a user