Removing TODO

recipes/api-ec2.rb

@@ -138,6 +138,5 @@ keystone_register "Register Compute Endpoint" do
   action :create_endpoint
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-ec2-monitoring)
 include_recipe "nova::api-ec2-monitoring"

recipes/api-metadata.rb

@@ -65,6 +65,5 @@ template "/etc/nova/api-paste.ini" do
   notifies :restart, resources(:service => "nova-api-metadata"), :delayed
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-metadata-monitoring)
 include_recipe "nova::api-metadata-monitoring"

recipes/api-os-compute.rb

@@ -138,6 +138,5 @@ keystone_register "Register Compute Endpoint" do
   action :create_endpoint
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-os-compute-monitoring)
 include_recipe "nova::api-os-compute-monitoring"

recipes/api-os-volume.rb

@@ -65,6 +65,5 @@ template "/etc/nova/api-paste.ini" do
   notifies :restart, resources(:service => "nova-api-os-volume"), :delayed
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-os-volume-monitoring)
 include_recipe "nova::api-os-volume-monitoring"

recipes/compute.rb

@@ -48,6 +48,5 @@ end
 
 include_recipe "nova::libvirt"
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::compute-monitoring)
 include_recipe "nova::compute-monitoring"

recipes/libvirt.rb

@@ -98,6 +98,5 @@ template "/etc/default/libvirt-bin" do
   notifies :restart, resources(:service => "libvirt-bin"), :immediately
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::libvirt-monitoring)
 include_recipe "nova::libvirt-monitoring"

recipes/network.rb

@@ -35,6 +35,5 @@ service "nova-network" do
   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::network-monitoring)
 include_recipe "nova::network-monitoring"

recipes/scheduler.rb

@@ -42,6 +42,5 @@ service "nova-scheduler" do
   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::scheduler-monitoring)
 include_recipe "nova::scheduler-monitoring"

recipes/vncproxy.rb

@@ -59,7 +59,6 @@ when "ubuntu","debian"
     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

recipes/volume.rb

@@ -59,6 +59,5 @@ keystone_register "Register Volume Endpoint" do
   action :create_endpoint
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::volume-monitoring)
 include_recipe "nova::volume-monitoring"