diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f9eab2..414fd97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This file is used to list changes made in each version of the cookbook-openstack ## 9.0.1 * Allow setting passwords via attributes by using the get_password method +* bump berkshelf to 2.0.18 to allow Supermarket support ## 9.0.0 * Initial release of cookbook-openstack-database for Icehouse diff --git a/Gemfile b/Gemfile index a76d565..092e18d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,10 @@ source 'https://rubygems.org' gem 'chef', '~> 11.8' gem 'json', '<= 1.7.7' # chef 11 dependency -gem 'berkshelf', '~> 2.0.10' +gem 'berkshelf', '~> 2.0.18' +gem 'hashie', '~> 2.0' gem 'chefspec', '~> 3.4.0' +gem 'rspec', '~> 2.14.1' gem 'fauxhai', '>= 2.1.0' gem 'foodcritic', '~> 4.0.0' gem 'rubocop', '~> 0.18.1' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 3efbf16..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,236 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - 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) - ast (1.1.0) - berkshelf (2.0.10) - activesupport (~> 3.2.0) - addressable (~> 2.3.4) - buff-shell_out (~> 0.1) - 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.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.1) - buff-ruby_engine (~> 0.1.0) - builder (3.2.2) - celluloid (0.14.1) - timers (>= 1.0.0) - celluloid-io (0.14.1) - celluloid (>= 0.14.1) - nio4r (>= 0.4.5) - chef (11.8.2) - chef-zero (~> 1.6, >= 1.6.2) - diff-lcs (~> 1.2, >= 1.2.4) - erubis (~> 2.7) - highline (~> 1.6, >= 1.6.9) - json (>= 1.4.4, <= 1.7.7) - mime-types (~> 1.16) - mixlib-authentication (~> 1.3) - mixlib-cli (~> 1.3) - mixlib-config (~> 2.0) - mixlib-log (~> 1.3) - mixlib-shellout (~> 1.2) - net-ssh (~> 2.6) - net-ssh-multi (~> 1.1.0) - ohai (~> 6.0) - pry (~> 0.9) - puma (~> 1.6) - rest-client (>= 1.0.4, < 1.7.0) - yajl-ruby (~> 1.1) - chef-zero (1.7.2) - hashie (~> 2.0) - json - mixlib-log (~> 1.3) - moneta (< 0.7.0) - rack - chefspec (3.4.0) - 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) - coderay (1.1.0) - diff-lcs (1.2.5) - erubis (2.7.0) - faraday (0.8.8) - multipart-post (~> 1.2.0) - fauxhai (2.1.0) - net-ssh - ohai - ffi (1.9.3) - foodcritic (4.0.0) - erubis - gherkin (~> 2.11) - nokogiri (~> 1.5) - rake - rufus-lru (~> 1.0) - treetop (~> 1.4) - yajl-ruby (~> 1.1) - gherkin (2.12.2) - multi_json (~> 1.3) - gssapi (1.0.3) - ffi (>= 1.0.1) - gyoku (1.1.0) - builder (>= 2.1.2) - hashie (2.0.5) - highline (1.6.20) - httpclient (2.3.4.1) - httpi (0.9.7) - rack - i18n (0.6.9) - ipaddress (0.8.0) - json (1.7.7) - little-plugger (1.1.3) - logging (1.8.1) - little-plugger (>= 1.1.3) - multi_json (>= 1.3.6) - method_source (0.8.2) - mime-types (1.25.1) - minitar (0.5.4) - mixlib-authentication (1.3.0) - mixlib-log - mixlib-cli (1.4.0) - mixlib-config (2.1.0) - mixlib-log (1.6.0) - mixlib-shellout (1.3.0) - moneta (0.6.0) - multi_json (1.8.2) - multipart-post (1.2.0) - net-http-persistent (2.9) - 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.5.0) - nokogiri (1.5.10) - nori (1.1.5) - ohai (6.20.0) - ipaddress - mixlib-cli - mixlib-config - mixlib-log - mixlib-shellout - systemu (~> 2.5.2) - yajl-ruby - parser (2.1.7) - ast (~> 1.1) - slop (~> 3.4, >= 3.4.5) - polyglot (0.3.5) - powerpack (0.0.9) - pry (0.9.12.4) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - puma (1.6.3) - rack (~> 1.2) - rack (1.5.2) - rainbow (2.0.0) - rake (10.3.2) - rbzip2 (0.2.0) - rest-client (1.6.7) - mime-types (>= 1.16) - retryable (1.3.3) - 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) - erubis - faraday (>= 0.8.4) - hashie (>= 2.0.2) - json (>= 1.7.7) - 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) - winrm (~> 1.1.0) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rubocop (0.18.1) - json (>= 1.7.7, < 2) - parser (~> 2.1.3) - powerpack (~> 0.0.6) - rainbow (>= 1.99.1, < 3.0) - rubyntlm (0.1.1) - rufus-lru (1.0.5) - savon (0.9.5) - akami (~> 1.0) - builder (>= 2.1.2) - gyoku (>= 0.4.0) - httpi (~> 0.9) - nokogiri (>= 1.4.0) - nori (~> 1.0) - wasabi (~> 1.0) - slop (3.4.7) - solve (0.8.2) - strainer (3.3.0) - berkshelf (~> 2.0) - buff-platform (~> 0.1) - systemu (2.5.2) - thor (0.18.1) - timers (1.1.0) - treetop (1.5.3) - polyglot (~> 0.3) - uuidtools (2.1.4) - varia_model (0.2.0) - buff-extensions (~> 0.2) - hashie (>= 2.0.2) - wasabi (1.0.0) - nokogiri (>= 1.4.0) - winrm (1.1.3) - gssapi (~> 1.0.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) - yajl-ruby (1.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - berkshelf (~> 2.0.10) - chef (~> 11.8) - chefspec (~> 3.4.0) - fauxhai (>= 2.1.0) - foodcritic (~> 4.0.0) - json (<= 1.7.7) - rubocop (~> 0.18.1) - strainer