From c7d76e9a2bd71dfe2a2e70d9af72d16587012a40 Mon Sep 17 00:00:00 2001 From: galstrom21 Date: Mon, 23 Jul 2012 21:34:14 -0500 Subject: [PATCH] Ensuring copyright banner exists --- files/default/nova_plugin.py | 16 ++++++++++++++++ metadata.rb | 22 ++++++++++++++++++++-- recipes/api-ec2.rb | 3 ++- recipes/api-metadata.rb | 4 ++-- recipes/api-os-compute.rb | 3 ++- recipes/api-os-volume.rb | 4 ++-- recipes/compute.rb | 2 +- recipes/default.rb | 2 +- recipes/libvirt.rb | 2 +- recipes/network.rb | 2 +- recipes/nova-common.rb | 3 ++- recipes/nova-rsyslog.rb | 4 ++-- recipes/nova-scheduler-patch.rb | 2 +- recipes/nova-setup.rb | 2 +- recipes/scheduler.rb | 2 +- recipes/vncproxy.rb | 2 +- recipes/volume.rb | 18 ++++++++++++++++-- 17 files changed, 72 insertions(+), 21 deletions(-) diff --git a/files/default/nova_plugin.py b/files/default/nova_plugin.py index 4a0fbf1a..c3bd031c 100644 --- a/files/default/nova_plugin.py +++ b/files/default/nova_plugin.py @@ -1,3 +1,19 @@ +# +# Copyright 2012, 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. +# + from keystoneclient.v2_0 import Client as KeystoneClient from novaclient.client import Client as NovaClient from novaclient import exceptions diff --git a/metadata.rb b/metadata.rb index ef31f4ec..41c3f83b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,8 +3,26 @@ license "Apache 2.0" description "Installs and configures Openstack" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "1.0.8" -# recipe "mysql", "Includes the client recipe to configure a client" -# recipe "mysql::client", "Installs packages required for mysql clients using run_action magic" +api-ec2.rb compute.rb nova-common.rb nova-setup.rb +api-metadata.rb default.rb nova-db-monitoring.rb scheduler.rb +api-os-compute.rb libvirt.rb nova-rsyslog.rb vncproxy.rb +api-os-volume.rb network.rb nova-scheduler-patch.rb volume.rb +recipe "api-ec2", "" +recipe "api-metadata", "" +recipe "api-os-compute", "" +recipe "api-os-volume", "" +recipe "compute", "" +recipe "default", "" +recipe "libvirt", "" +recipe "network", "" +recipe "nova-common", "" +recipe "nova-db-monitoring", "" +recipe "nova-rsyslog", "" +recipe "nova-scheduler-patch", "" +recipe "nova-setup", "" +recipe "scheduler", "" +recipe "vncproxy", "" +recipe "volume", "" %w{ ubuntu fedora }.each do |os| supports os diff --git a/recipes/api-ec2.rb b/recipes/api-ec2.rb index 51b14a83..f7538e22 100644 --- a/recipes/api-ec2.rb +++ b/recipes/api-ec2.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: api-ec2 # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. @@ -15,6 +15,7 @@ # 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. +# ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password) include_recipe "nova::nova-common" diff --git a/recipes/api-metadata.rb b/recipes/api-metadata.rb index a57cb36d..4439c2f6 100644 --- a/recipes/api-metadata.rb +++ b/recipes/api-metadata.rb @@ -1,8 +1,8 @@ # # Cookbook Name:: nova -# Recipe:: api +# Recipe:: api-metadata # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/api-os-compute.rb b/recipes/api-os-compute.rb index 0f48103e..119c9a1e 100644 --- a/recipes/api-os-compute.rb +++ b/recipes/api-os-compute.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: api-os-compute # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. @@ -15,6 +15,7 @@ # 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. +# ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password) include_recipe "nova::nova-common" diff --git a/recipes/api-os-volume.rb b/recipes/api-os-volume.rb index 48f657cd..a402ceb9 100644 --- a/recipes/api-os-volume.rb +++ b/recipes/api-os-volume.rb @@ -1,8 +1,8 @@ # # Cookbook Name:: nova -# Recipe:: api +# Recipe:: api-os-volume # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/compute.rb b/recipes/compute.rb index 02572bf6..7e97a102 100644 --- a/recipes/compute.rb +++ b/recipes/compute.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: compute # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/default.rb b/recipes/default.rb index 87fae1ab..a0bf5ddc 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: default # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/libvirt.rb b/recipes/libvirt.rb index 477e7829..3870457c 100644 --- a/recipes/libvirt.rb +++ b/recipes/libvirt.rb @@ -1,5 +1,5 @@ # -# Cookbook Name:: openstack +# Cookbook Name:: nova # Recipe:: libvirt # # Copyright 2012, Rackspace Hosting, Inc. diff --git a/recipes/network.rb b/recipes/network.rb index f7bee11f..8f5e8f11 100644 --- a/recipes/network.rb +++ b/recipes/network.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: network # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb index abe0f140..f52ae7e8 100644 --- a/recipes/nova-common.rb +++ b/recipes/nova-common.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: common # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. @@ -16,6 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + include_recipe "nova::nova-rsyslog" include_recipe "osops-utils::autoetchosts" diff --git a/recipes/nova-rsyslog.rb b/recipes/nova-rsyslog.rb index 673e81aa..75b3e981 100644 --- a/recipes/nova-rsyslog.rb +++ b/recipes/nova-rsyslog.rb @@ -1,8 +1,8 @@ # # Cookbook Name:: nova -# Recipe:: default +# Recipe:: nova-rsyslog # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/nova-scheduler-patch.rb b/recipes/nova-scheduler-patch.rb index e210c977..3cc5be23 100644 --- a/recipes/nova-scheduler-patch.rb +++ b/recipes/nova-scheduler-patch.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: nova-scheduler-patch # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/nova-setup.rb b/recipes/nova-setup.rb index cb8db6c6..b380ad0a 100644 --- a/recipes/nova-setup.rb +++ b/recipes/nova-setup.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: nova-setup # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb index 423f7a56..cc104e91 100644 --- a/recipes/scheduler.rb +++ b/recipes/scheduler.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: scheduler # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/vncproxy.rb b/recipes/vncproxy.rb index e9eaacb7..c7d78df7 100644 --- a/recipes/vncproxy.rb +++ b/recipes/vncproxy.rb @@ -2,7 +2,7 @@ # Cookbook Name:: nova # Recipe:: vncproxy # -# Copyright 2009, Rackspace Hosting, Inc. +# Copyright 2012, 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. diff --git a/recipes/volume.rb b/recipes/volume.rb index 90205500..3dd05778 100644 --- a/recipes/volume.rb +++ b/recipes/volume.rb @@ -1,6 +1,20 @@ # -# Cookbook nova:volume -# Recipe:: default +# Cookbook Name:: nova +# Recipe:: volume +# +# Copyright 2012, 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. # include_recipe "nova::nova-common"