diff --git a/attributes/default.rb b/attributes/default.rb index b6cba829..fcf2b41b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -212,6 +212,10 @@ when "ubuntu" "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" diff --git a/recipes/vncproxy-monitoring.rb b/recipes/vncproxy-monitoring.rb new file mode 100644 index 00000000..4b03b215 --- /dev/null +++ b/recipes/vncproxy-monitoring.rb @@ -0,0 +1,32 @@ +# +# Cookbook Name:: nova +# Recipe:: consoleauth-monitoring +# +# Copyright 2009, Rackspace Hosting, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +######################################## +# BEGIN MONIT SECTION +# TODO(shep): This needs to be encased in an if block for the monit_enabled environment toggle + +include_recipe "monit::server" +platform_options = node["nova"]["platform"] + +monit_procmon "nova-consoleauth" do + process_name "nova-consoleauth" + start_cmd platform_options["monit_commands"]["nova-consoleauth"]["start"] + stop_cmd platform_options["monit_commands"]["nova-consoleauth"]["stop"] +end +######################################## diff --git a/recipes/vncproxy.rb b/recipes/vncproxy.rb index b3c4c4b7..3787cd68 100644 --- a/recipes/vncproxy.rb +++ b/recipes/vncproxy.rb @@ -58,4 +58,8 @@ when "ubuntu","debian" action :enable subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed end + + # TODO(shep): this needs to be if blocked on env collectd toggle + # Include recipe(nova::vncproxy-monitoring) + include_recipe "nova::vncproxy-monitoring" end