upgrade to Havana release

also upgrade gems:
- berkshelf, ~> 2.0.10
- chefspec, ~> 3.0.2
- foodcritic, ~> 3.0.3

Change-Id: I732f73d02263e3257167898826dbb8d0f60a064d
This commit is contained in:
Ionuț Arțăriși 2013-12-11 11:18:04 +01:00
parent 461f3102d0
commit 9423f6110d
17 changed files with 147 additions and 244 deletions

View File

@ -4,14 +4,14 @@
"path": "."
},
"openstack-common": {
"locked_version": "0.4.3",
"locked_version": "8.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-common.git",
"ref": "eb5eed7126b6a6efbaf803e8a594d610cf661e97"
"ref": "d5f852daf5d0f3001ddbf1688c43a4bb21e8ca00"
},
"openstack-identity": {
"locked_version": "7.0.0",
"locked_version": "8.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-identity.git",
"ref": "b881af26095cfa869a6970067c49597a0ee63586"
"ref": "3b001b7e07758e2c81b5ae4d1bff8e4a1472b24a"
},
"apt": {
"locked_version": "2.0.0"

View File

@ -2,6 +2,10 @@ openstack-metering Cookbook CHANGELOG
==============================
This file is used to list changes made in each version of the openstack-metering cookbook.
## 8.0.0
### New version
* Upgrade to upstream Havana release
## 7.1.1
### Bug
* Relax the dependency on openstack-identity to the 7.x series

View File

@ -2,8 +2,8 @@ source "https://rubygems.org"
gem "chef", "~> 11.4.4"
gem "json", "<= 1.7.7" # chef 11 dependency
gem "berkshelf", "~> 2.0.3"
gem "chefspec", "~> 1.3.0"
gem "foodcritic"
gem "berkshelf", "~> 2.0.10"
gem "chefspec", "~> 3.0.2"
gem "foodcritic", "~> 3.0.3"
gem "strainer"
gem "tailor"

View File

@ -1,30 +1,34 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (3.2.14)
activesupport (3.2.16)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
akami (1.2.0)
gyoku (>= 0.4.0)
nokogiri (>= 1.4.0)
berkshelf (2.0.7)
berkshelf (2.0.10)
activesupport (~> 3.2.0)
addressable (~> 2.3.4)
buff-shell_out (~> 0.1)
celluloid (>= 0.14.0)
chozo (>= 0.6.1)
faraday (>= 0.8.5)
hashie (>= 2.0.2)
minitar (~> 0.5.4)
rbzip2 (~> 0.2.0)
retryable (~> 1.3.3)
ridley (~> 1.2.1)
ridley (~> 1.5.0)
solve (>= 0.5.0)
thor (~> 0.18.0)
buff-config (0.4.0)
buff-extensions (~> 0.3)
varia_model (~> 0.1)
buff-extensions (0.5.0)
buff-ignore (1.1.1)
buff-platform (0.1.0)
buff-ruby_engine (0.1.0)
buff-shell_out (0.1.0)
buff-shell_out (0.1.1)
buff-ruby_engine (~> 0.1.0)
builder (3.2.2)
celluloid (0.14.1)
@ -46,97 +50,88 @@ GEM
ohai (>= 0.6.0)
rest-client (>= 1.0.4, < 1.7.0)
yajl-ruby (~> 1.1)
chefspec (1.3.1)
chef (>= 10.0)
erubis
fauxhai (>= 0.1.1, < 2.0)
minitest-chef-handler (>= 0.6.0)
rspec (~> 2.0)
chefspec (3.0.2)
chef (~> 11.0)
fauxhai (~> 2.0)
rspec (~> 2.14)
chozo (0.6.1)
activesupport (>= 3.2.0)
hashie (>= 2.0.2)
multi_json (>= 1.3.0)
ci_reporter (1.9.0)
builder (>= 2.1.2)
diff-lcs (1.2.4)
diff-lcs (1.2.5)
erubis (2.7.0)
faraday (0.8.7)
multipart-post (~> 1.1)
fauxhai (1.1.1)
httparty
faraday (0.8.8)
multipart-post (~> 1.2.0)
fauxhai (2.0.0)
net-ssh
ohai
ffi (1.9.0)
foodcritic (2.2.0)
ffi (1.9.3)
foodcritic (3.0.3)
erubis
gherkin (~> 2.11.7)
nokogiri (~> 1.5.4)
rake
treetop (~> 1.4.10)
yajl-ruby (~> 1.1.0)
gherkin (2.11.8)
multi_json (~> 1.3)
gssapi (1.0.3)
ffi (>= 1.0.1)
gyoku (1.0.0)
gyoku (1.1.0)
builder (>= 2.1.2)
hashie (2.0.5)
highline (1.6.19)
httparty (0.11.0)
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
httpclient (2.2.0.2)
highline (1.6.20)
httpclient (2.3.4.1)
httpi (0.9.7)
rack
i18n (0.6.4)
i18n (0.6.9)
ipaddress (0.8.0)
json (1.7.7)
little-plugger (1.1.3)
log_switch (0.4.0)
logging (1.6.2)
logging (1.8.1)
little-plugger (>= 1.1.3)
mime-types (1.23)
multi_json (>= 1.3.6)
mime-types (2.0)
minitar (0.5.4)
minitest (4.7.5)
minitest-chef-handler (1.0.1)
chef
ci_reporter
minitest (~> 4.7.3)
mixlib-authentication (1.3.0)
mixlib-log
mixlib-cli (1.3.0)
mixlib-config (1.1.2)
mixlib-config (2.1.0)
mixlib-log (1.6.0)
mixlib-shellout (1.2.0)
multi_json (1.7.7)
multi_xml (0.5.4)
mixlib-shellout (1.3.0)
multi_json (1.8.2)
multipart-post (1.2.0)
net-http-persistent (2.9)
net-ssh (2.6.8)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.1)
net-ssh (>= 2.1.4)
net-ssh-gateway (>= 0.99.0)
nio4r (0.4.6)
nio4r (0.5.0)
nokogiri (1.5.10)
nori (1.1.5)
ohai (6.18.0)
ohai (6.20.0)
ipaddress
mixlib-cli
mixlib-config
mixlib-log
mixlib-shellout
systemu
systemu (~> 2.5.2)
yajl-ruby
polyglot (0.3.3)
rack (1.5.2)
rake (10.1.0)
rbzip2 (0.2.0)
rest-client (1.6.7)
mime-types (>= 1.16)
retryable (1.3.3)
ridley (1.2.4)
ridley (1.5.3)
addressable
buff-config (~> 0.2)
buff-extensions (~> 0.3)
buff-ignore (~> 1.1)
buff-shell_out (~> 0.1)
celluloid (~> 0.14.0)
celluloid-io (~> 0.14.0)
@ -147,6 +142,7 @@ GEM
mixlib-authentication (>= 1.3.0)
net-http-persistent (>= 2.8)
net-ssh
nio4r (>= 0.5.0)
retryable
solve (>= 0.4.4)
varia_model (~> 0.1)
@ -155,10 +151,10 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.4)
rspec-expectations (2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.1)
rspec-mocks (2.14.4)
rubyntlm (0.1.1)
savon (0.9.5)
akami (~> 1.0)
@ -168,11 +164,12 @@ GEM
nokogiri (>= 1.4.0)
nori (~> 1.0)
wasabi (~> 1.0)
solve (0.6.1)
strainer (3.0.5)
solve (0.8.2)
strainer (3.3.0)
berkshelf (~> 2.0)
buff-platform (~> 0.1)
systemu (2.5.2)
tailor (1.2.1)
tailor (1.3.1)
log_switch (>= 0.3.0)
term-ansicolor (>= 1.0.5)
text-table (>= 1.2.2)
@ -181,21 +178,21 @@ GEM
text-table (1.2.3)
thor (0.18.1)
timers (1.1.0)
tins (0.8.3)
treetop (1.4.14)
tins (0.13.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
uuidtools (2.1.4)
varia_model (0.1.1)
varia_model (0.2.0)
buff-extensions (~> 0.2)
hashie (>= 2.0.2)
wasabi (1.0.0)
nokogiri (>= 1.4.0)
winrm (1.1.2)
winrm (1.1.3)
gssapi (~> 1.0.0)
httpclient (~> 2.2.0.2)
logging (~> 1.6.1)
nokogiri (~> 1.5.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (~> 1.6, >= 1.6.1)
nokogiri (~> 1.5)
rubyntlm (~> 0.1.1)
savon (= 0.9.5)
uuidtools (~> 2.1.2)
@ -205,10 +202,10 @@ PLATFORMS
ruby
DEPENDENCIES
berkshelf (~> 2.0.3)
berkshelf (~> 2.0.10)
chef (~> 11.4.4)
chefspec (~> 1.3.0)
foodcritic
chefspec (~> 3.0.2)
foodcritic (~> 3.0.3)
json (<= 1.7.7)
strainer
tailor

View File

@ -65,11 +65,13 @@ License and Author
| **Author** | John Dewey (<jdewey@att.com>) |
| **Author** | Justin Shepherd (<jshepher@rackspace.com>) |
| **Author** | Salman Baset (<sabaset@us.ibm.com>) |
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
| | |
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
| **Copyright** | Copyright (c) 2013, AT&T Services, Inc. |
| **Copyright** | Copyright (c) 2013, Rackspace US, Inc. |
| **Copyright** | Copyright (c) 2013, IBM Corp. |
| **Copyright** | Copyright (c) 2013, SUSE Linux GmbH |
Licensed under the Apache License, Version 2.0 (the "License");

View File

@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com"
license "Apache 2.0"
description "The OpenStack Metering service Ceilometer."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "7.1.1"
version "8.0.0"
recipe "openstack-metering::agent-central", "Installs agent central service."
recipe "openstack-metering::agent-compute", "Installs agent compute service."
@ -17,5 +17,5 @@ recipe "openstack-metering::identity_registration", "Registers the endpoints wit
supports os
end
depends "openstack-common", "~> 0.4.0"
depends "openstack-identity", "~> 7.0"
depends "openstack-common", "~> 8.0"
depends "openstack-identity", "~> 8.0"

View File

@ -4,7 +4,7 @@ describe "openstack-metering::agent-central" do
before { metering_stubs }
describe "opensuse" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run.converge "openstack-metering::agent-central"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::agent-central" do
before { metering_stubs }
describe "ubuntu" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-metering::agent-central"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::agent-compute" do
before { metering_stubs }
describe "opensuse" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run.converge "openstack-metering::agent-compute"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::agent-compute" do
before { metering_stubs }
describe "ubuntu" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-metering::agent-compute"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::api" do
before { metering_stubs }
describe "opensuse" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run.converge "openstack-metering::api"
end

View File

@ -4,24 +4,18 @@ describe "openstack-metering::api" do
before { metering_stubs }
describe "ubuntu" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-metering::api"
end
expect_runs_common_recipe
describe "/var/cache/ceilometer" do
before do
@dir = @chef_run.directory "/var/cache/ceilometer"
end
it "has proper owner" do
expect(@dir).to be_owned_by "ceilometer", "ceilometer"
end
it "has proper modes" do
expect(sprintf("%o", @dir.mode)).to eq "700"
end
it "creates the /var/cache/ceilometer directory" do
expect(@chef_run).to create_directory("/var/cache/ceilometer").with(
user: "ceilometer",
group: "ceilometer",
mode: 0700
)
end
it "starts api service" do

View File

@ -4,7 +4,7 @@ describe "openstack-metering::collector" do
before { metering_stubs }
describe "opensuse" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run.converge "openstack-metering::collector"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::collector" do
before { metering_stubs }
describe "ubuntu" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-metering::collector"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::common" do
before { metering_stubs }
describe "opensuse" do
before do
@chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run.converge "openstack-metering::common"
end

View File

@ -4,7 +4,7 @@ describe "openstack-metering::common" do
before { metering_stubs }
describe "ubuntu" do
before do
@chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
@chef_run = ::ChefSpec::Runner.new(::UBUNTU_OPTS) do |n|
n.set["openstack"]["metering"]["syslog"]["use"] = true
end
@chef_run.converge "openstack-metering::common"
@ -18,173 +18,79 @@ describe "openstack-metering::common" do
expect(@chef_run).to install_package "ceilometer-common"
end
describe "/etc/ceilometer" do
before do
@dir = @chef_run.directory "/etc/ceilometer"
end
it "has proper owner" do
expect(@dir).to be_owned_by "ceilometer", "ceilometer"
end
it "has proper modes" do
expect(sprintf("%o", @dir.mode)).to eq "750"
end
it "creates the /etc/ceilometer directory" do
expect(@chef_run).to create_directory("/etc/ceilometer").with(
user: "ceilometer",
group: "ceilometer",
mode: 0750
)
end
describe "/etc/ceilometer" do
before do
@file = @chef_run.template "/etc/ceilometer/ceilometer.conf"
@filename = "/etc/ceilometer/ceilometer.conf"
end
it "has proper owner" do
expect(@file).to be_owned_by("ceilometer", "ceilometer")
it "creates the file" do
expect(@chef_run).to create_template(@filename).with(
user: "ceilometer",
group: "ceilometer",
mode: 0640
)
end
it "has proper modes" do
expect(sprintf("%o", @file.mode)).to eq("640")
context "with rabbitmq default" do
[/^rabbit_userid = guest$/,
/^rabbit_password = rabbit-pass$/,
/^rabbit_port = 5672$/,
/^rabbit_host = 127.0.0.1$/,
/^rabbit_virtual_host = \/$/,
/^auth_uri = http:\/\/127.0.0.1:5000\/v2.0$/,
/^auth_host = 127.0.0.1$/,
/^auth_port = 35357$/,
/^auth_protocol = http$/
].each do |content|
it "has a \#{content.source[1...-1]}\" line" do
expect(@chef_run).to render_file(@filename).with_content(content)
end
end
end
it "has rabbit_user" do
expect(@chef_run).to create_file_with_content @file.name,
"rabbit_userid = guest"
end
context "with qpid enabled" do
before do
@chef_run.node.set['openstack']['metering']['mq']['service_type'] = "qpid"
end
it "has rabbit_password" do
expect(@chef_run).to create_file_with_content @file.name,
"rabbit_password = rabbit-pass"
end
it "has rabbit_port" do
expect(@chef_run).to create_file_with_content @file.name,
"rabbit_port = 5672"
end
it "has rabbit_host" do
expect(@chef_run).to create_file_with_content @file.name,
"rabbit_host = 127.0.0.1"
end
it "has rabbit_virtual_host" do
expect(@chef_run).to create_file_with_content @file.name,
"rabbit_virtual_host = /"
end
it "has auth_uri" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_uri = http://127.0.0.1:5000/v2.0"
end
it "has auth_host" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_host = 127.0.0.1"
end
it "has auth_port" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_port = 35357"
end
it "has auth_protocol" do
expect(@chef_run).to create_file_with_content @file.name,
"auth_protocol = http"
[/^qpid_hostname=127.0.0.1$/,
/^qpid_port=5672$/,
/^qpid_username=$/,
/^qpid_password=$/,
/^qpid_sasl_mechanisms=$/,
/^qpid_reconnect=true$/,
/^qpid_reconnect_timeout=0$/,
/^qpid_reconnect_limit=0$/,
/^qpid_reconnect_interval_min=0$/,
/^qpid_reconnect_interval_max=0$/,
/^qpid_reconnect_interval_max=0$/,
/^qpid_reconnect_interval=0$/,
/^qpid_heartbeat=60$/,
/^qpid_protocol=tcp$/,
/^qpid_tcp_nodelay=true$/
].each do |content|
it "has a \#{content.source[1...-1]}\" line" do
expect(@chef_run).to render_file(@filename).with_content(content)
end
end
end
end
describe "qpid" do
before do
@file = @chef_run.template "/etc/ceilometer/ceilometer.conf"
@chef_run.node.set['openstack']['metering']['mq']['service_type'] = "qpid"
end
it "has qpid_hostname" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_hostname=127.0.0.1"
end
it "has qpid_port" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_port=5672"
end
it "has qpid_username" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_username="
end
it "has qpid_password" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_password="
end
it "has qpid_sasl_mechanisms" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_sasl_mechanisms="
end
it "has qpid_reconnect" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect=true"
end
it "has qpid_reconnect_timeout" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect_timeout=0"
end
it "has qpid_reconnect_limit" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect_limit=0"
end
it "has qpid_reconnect_interval_min" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect_interval_min=0"
end
it "has qpid_reconnect_interval_max" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect_interval_max=0"
end
it "has qpid_reconnect_interval_max" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect_interval_max=0"
end
it "has qpid_reconnect_interval" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_reconnect_interval=0"
end
it "has qpid_heartbeat" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_heartbeat=60"
end
it "has qpid_protocol" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_protocol=tcp"
end
it "has qpid_tcp_nodelay" do
expect(@chef_run).to create_file_with_content @file.name,
"qpid_tcp_nodelay=true"
end
end
describe "/etc/ceilometer/policy.json" do
before do
@dir = @chef_run.cookbook_file "/etc/ceilometer/policy.json"
end
it "has proper owner" do
expect(@dir).to be_owned_by "ceilometer", "ceilometer"
end
it "has proper modes" do
expect(sprintf("%o", @dir.mode)).to eq "640"
end
it "installs the /etc/ceilometer/policy.json file" do
expect(@chef_run).to create_cookbook_file("/etc/ceilometer/policy.json").with(
user: "ceilometer",
group: "ceilometer",
mode: 0640
)
end
end
end

View File

@ -3,7 +3,7 @@ require_relative "spec_helper"
describe "openstack-metering::identity_registration" do
before do
metering_stubs
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-metering::identity_registration"
end