summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2017-11-27 09:08:06 -0800
committerSamuel Cassiba <s@cassiba.com>2017-12-10 11:38:02 -0800
commitb1c74d581ef0425d6cc48e98d623e0183a42603f (patch)
tree90e8b67081325b33526d9a694be621cd8936d118
parent88c718d574e993e350b90316e4edad205e6bf90b (diff)
telemetry refactor for Pike and Chef 13
- implemented foodcritic and cookstyle corrections - deprecated node.foo.bar method access for node['foo']['bar'] bracket syntax - moved package_overrides to common cookbook Implements blueprint modern-chef Change-Id: I7471f1ca3b2348d76e1fd502f335047053459ff4
Notes
Notes (review): Code-Review+2: Jan Klare <j.klare@cloudbau.de> Workflow+1: Christoph Albers <c.albers@x-ion.de> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 22 Dec 2017 11:44:02 +0000 Reviewed-on: https://review.openstack.org/523172 Project: openstack/cookbook-openstack-telemetry Branch: refs/heads/master
-rw-r--r--Berksfile25
-rw-r--r--LICENSE176
-rw-r--r--Rakefile31
-rw-r--r--attributes/default.rb2
-rw-r--r--metadata.rb4
-rw-r--r--recipes/api.rb8
-rw-r--r--recipes/common.rb2
-rw-r--r--recipes/gnocchi_configure.rb8
-rw-r--r--recipes/identity_registration.rb10
-rw-r--r--spec/common-rhel_spec.rb5
-rw-r--r--spec/common_spec.rb5
-rw-r--r--spec/identity_registration_spec.rb10
-rw-r--r--spec/spec_helper.rb4
13 files changed, 218 insertions, 72 deletions
diff --git a/Berksfile b/Berksfile
index f3691cc..1206722 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,17 +1,14 @@
1source "https://supermarket.chef.io" 1source 'https://supermarket.chef.io'
2 2
3metadata 3%w(common compute identity image network).each do |cookbook|
4 if Dir.exist?("../cookbook-openstack-#{cookbook}")
5 cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
6 else
7 cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
8 end
9end
4 10
5cookbook "openstack-common", 11cookbook 'openstackclient',
6 github: "openstack/cookbook-openstack-common" 12 github: 'cloudbau/cookbook-openstackclient'
7cookbook "openstack-compute",
8 github: "openstack/cookbook-openstack-compute"
9cookbook "openstack-identity",
10 github: "openstack/cookbook-openstack-identity"
11cookbook "openstack-image",
12 github: "openstack/cookbook-openstack-image"
13cookbook "openstack-network",
14 github: "openstack/cookbook-openstack-network"
15cookbook "openstackclient",
16 github: "cloudbau/cookbook-openstackclient"
17 13
14metadata
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..68c771a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,176 @@
1
2 Apache License
3 Version 2.0, January 2004
4 http://www.apache.org/licenses/
5
6 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
8 1. Definitions.
9
10 "License" shall mean the terms and conditions for use, reproduction,
11 and distribution as defined by Sections 1 through 9 of this document.
12
13 "Licensor" shall mean the copyright owner or entity authorized by
14 the copyright owner that is granting the License.
15
16 "Legal Entity" shall mean the union of the acting entity and all
17 other entities that control, are controlled by, or are under common
18 control with that entity. For the purposes of this definition,
19 "control" means (i) the power, direct or indirect, to cause the
20 direction or management of such entity, whether by contract or
21 otherwise, or (ii) ownership of fifty percent (50%) or more of the
22 outstanding shares, or (iii) beneficial ownership of such entity.
23
24 "You" (or "Your") shall mean an individual or Legal Entity
25 exercising permissions granted by this License.
26
27 "Source" form shall mean the preferred form for making modifications,
28 including but not limited to software source code, documentation
29 source, and configuration files.
30
31 "Object" form shall mean any form resulting from mechanical
32 transformation or translation of a Source form, including but
33 not limited to compiled object code, generated documentation,
34 and conversions to other media types.
35
36 "Work" shall mean the work of authorship, whether in Source or
37 Object form, made available under the License, as indicated by a
38 copyright notice that is included in or attached to the work
39 (an example is provided in the Appendix below).
40
41 "Derivative Works" shall mean any work, whether in Source or Object
42 form, that is based on (or derived from) the Work and for which the
43 editorial revisions, annotations, elaborations, or other modifications
44 represent, as a whole, an original work of authorship. For the purposes
45 of this License, Derivative Works shall not include works that remain
46 separable from, or merely link (or bind by name) to the interfaces of,
47 the Work and Derivative Works thereof.
48
49 "Contribution" shall mean any work of authorship, including
50 the original version of the Work and any modifications or additions
51 to that Work or Derivative Works thereof, that is intentionally
52 submitted to Licensor for inclusion in the Work by the copyright owner
53 or by an individual or Legal Entity authorized to submit on behalf of
54 the copyright owner. For the purposes of this definition, "submitted"
55 means any form of electronic, verbal, or written communication sent
56 to the Licensor or its representatives, including but not limited to
57 communication on electronic mailing lists, source code control systems,
58 and issue tracking systems that are managed by, or on behalf of, the
59 Licensor for the purpose of discussing and improving the Work, but
60 excluding communication that is conspicuously marked or otherwise
61 designated in writing by the copyright owner as "Not a Contribution."
62
63 "Contributor" shall mean Licensor and any individual or Legal Entity
64 on behalf of whom a Contribution has been received by Licensor and
65 subsequently incorporated within the Work.
66
67 2. Grant of Copyright License. Subject to the terms and conditions of
68 this License, each Contributor hereby grants to You a perpetual,
69 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70 copyright license to reproduce, prepare Derivative Works of,
71 publicly display, publicly perform, sublicense, and distribute the
72 Work and such Derivative Works in Source or Object form.
73
74 3. Grant of Patent License. Subject to the terms and conditions of
75 this License, each Contributor hereby grants to You a perpetual,
76 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77 (except as stated in this section) patent license to make, have made,
78 use, offer to sell, sell, import, and otherwise transfer the Work,
79 where such license applies only to those patent claims licensable
80 by such Contributor that are necessarily infringed by their
81 Contribution(s) alone or by combination of their Contribution(s)
82 with the Work to which such Contribution(s) was submitted. If You
83 institute patent litigation against any entity (including a
84 cross-claim or counterclaim in a lawsuit) alleging that the Work
85 or a Contribution incorporated within the Work constitutes direct
86 or contributory patent infringement, then any patent licenses
87 granted to You under this License for that Work shall terminate
88 as of the date such litigation is filed.
89
90 4. Redistribution. You may reproduce and distribute copies of the
91 Work or Derivative Works thereof in any medium, with or without
92 modifications, and in Source or Object form, provided that You
93 meet the following conditions:
94
95 (a) You must give any other recipients of the Work or
96 Derivative Works a copy of this License; and
97
98 (b) You must cause any modified files to carry prominent notices
99 stating that You changed the files; and
100
101 (c) You must retain, in the Source form of any Derivative Works
102 that You distribute, all copyright, patent, trademark, and
103 attribution notices from the Source form of the Work,
104 excluding those notices that do not pertain to any part of
105 the Derivative Works; and
106
107 (d) If the Work includes a "NOTICE" text file as part of its
108 distribution, then any Derivative Works that You distribute must
109 include a readable copy of the attribution notices contained
110 within such NOTICE file, excluding those notices that do not
111 pertain to any part of the Derivative Works, in at least one
112 of the following places: within a NOTICE text file distributed
113 as part of the Derivative Works; within the Source form or
114 documentation, if provided along with the Derivative Works; or,
115 within a display generated by the Derivative Works, if and
116 wherever such third-party notices normally appear. The contents
117 of the NOTICE file are for informational purposes only and
118 do not modify the License. You may add Your own attribution
119 notices within Derivative Works that You distribute, alongside
120 or as an addendum to the NOTICE text from the Work, provided
121 that such additional attribution notices cannot be construed
122 as modifying the License.
123
124 You may add Your own copyright statement to Your modifications and
125 may provide additional or different license terms and conditions
126 for use, reproduction, or distribution of Your modifications, or
127 for any such Derivative Works as a whole, provided Your use,
128 reproduction, and distribution of the Work otherwise complies with
129 the conditions stated in this License.
130
131 5. Submission of Contributions. Unless You explicitly state otherwise,
132 any Contribution intentionally submitted for inclusion in the Work
133 by You to the Licensor shall be under the terms and conditions of
134 this License, without any additional terms or conditions.
135 Notwithstanding the above, nothing herein shall supersede or modify
136 the terms of any separate license agreement you may have executed
137 with Licensor regarding such Contributions.
138
139 6. Trademarks. This License does not grant permission to use the trade
140 names, trademarks, service marks, or product names of the Licensor,
141 except as required for reasonable and customary use in describing the
142 origin of the Work and reproducing the content of the NOTICE file.
143
144 7. Disclaimer of Warranty. Unless required by applicable law or
145 agreed to in writing, Licensor provides the Work (and each
146 Contributor provides its Contributions) on an "AS IS" BASIS,
147 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148 implied, including, without limitation, any warranties or conditions
149 of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150 PARTICULAR PURPOSE. You are solely responsible for determining the
151 appropriateness of using or redistributing the Work and assume any
152 risks associated with Your exercise of permissions under this License.
153
154 8. Limitation of Liability. In no event and under no legal theory,
155 whether in tort (including negligence), contract, or otherwise,
156 unless required by applicable law (such as deliberate and grossly
157 negligent acts) or agreed to in writing, shall any Contributor be
158 liable to You for damages, including any direct, indirect, special,
159 incidental, or consequential damages of any character arising as a
160 result of this License or out of the use or inability to use the
161 Work (including but not limited to damages for loss of goodwill,
162 work stoppage, computer failure or malfunction, or any and all
163 other commercial damages or losses), even if such Contributor
164 has been advised of the possibility of such damages.
165
166 9. Accepting Warranty or Additional Liability. While redistributing
167 the Work or Derivative Works thereof, You may choose to offer,
168 and charge a fee for, acceptance of support, warranty, indemnity,
169 or other liability obligations and/or rights consistent with this
170 License. However, in accepting such obligations, You may act only
171 on Your own behalf and on Your sole responsibility, not on behalf
172 of any other Contributor, and only if You agree to indemnify,
173 defend, and hold each Contributor harmless for any liability
174 incurred by, or claims asserted against, such Contributor by reason
175 of your accepting any such warranty or additional liability.
176
diff --git a/Rakefile b/Rakefile
index c9edb13..137cc2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,40 +1,39 @@
1task default: ["test"] 1task default: ['test']
2 2
3task :test => [:syntax, :lint, :unit] 3task test: [:syntax, :lint, :unit]
4 4
5desc "Vendor the cookbooks in the Berksfile" 5desc 'Vendor the cookbooks in the Berksfile'
6task :berks_prep do 6task :berks_prep do
7 sh %{chef exec berks vendor} 7 sh %(chef exec berks vendor)
8end 8end
9 9
10desc "Run FoodCritic (syntax) tests" 10desc 'Run FoodCritic (syntax) tests'
11task :syntax do 11task :syntax do
12 sh %{chef exec foodcritic --exclude spec -f any .} 12 sh %(chef exec foodcritic --exclude spec -f any .)
13end 13end
14 14
15desc "Run RuboCop (lint) tests" 15desc 'Run RuboCop (lint) tests'
16task :lint do 16task :lint do
17 sh %{chef exec cookstyle} 17 sh %(chef exec cookstyle)
18end 18end
19 19
20desc "Run RSpec (unit) tests" 20desc 'Run RSpec (unit) tests'
21task :unit => :berks_prep do 21task unit: :berks_prep do
22 sh %{chef exec rspec --format documentation} 22 sh %(chef exec rspec --format documentation)
23end 23end
24 24
25desc "Remove the berks-cookbooks directory and the Berksfile.lock" 25desc 'Remove the berks-cookbooks directory and the Berksfile.lock'
26task :clean do 26task :clean do
27 rm_rf [ 27 rm_rf [
28 'berks-cookbooks', 28 'berks-cookbooks',
29 'Berksfile.lock' 29 'Berksfile.lock',
30 ] 30 ]
31end 31end
32 32
33desc "All-in-One Neutron build Infra using Common task" 33desc 'All-in-One Neutron build Infra using Common task'
34task :integration do 34task :integration do
35 # Use the common integration task 35 # Use the common integration task
36 sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile) 36 sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile)
37 load './Rakefile-Common' 37 load './Rakefile-Common'
38 Rake::Task["common_integration"].invoke 38 Rake::Task['common_integration'].invoke
39end 39end
40
diff --git a/attributes/default.rb b/attributes/default.rb
index 9384eaa..4d047eb 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -127,6 +127,6 @@ when 'debian'
127 'api_service' => 'ceilometer-api', 127 'api_service' => 'ceilometer-api',
128 'collector_packages' => ['ceilometer-collector', 'python-mysqldb'], 128 'collector_packages' => ['ceilometer-collector', 'python-mysqldb'],
129 'collector_service' => 'ceilometer-collector', 129 'collector_service' => 'ceilometer-collector',
130 'package_overrides' => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'", 130 'package_overrides' => '',
131 } 131 }
132end 132end
diff --git a/metadata.rb b/metadata.rb
index 997c9cd..8d7d02c 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,7 +1,7 @@
1name 'openstack-telemetry' 1name 'openstack-telemetry'
2maintainer 'openstack-chef' 2maintainer 'openstack-chef'
3maintainer_email 'openstack-dev@lists.openstack.org' 3maintainer_email 'openstack-dev@lists.openstack.org'
4license 'Apache 2.0' 4license 'Apache-2.0'
5description 'The OpenStack Metering service Ceilometer.' 5description 'The OpenStack Metering service Ceilometer.'
6long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 6long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7version '16.0.0' 7version '16.0.0'
@@ -25,7 +25,7 @@ depends 'openstack-common', '>= 16.0.0'
25depends 'openstack-identity', '>= 16.0.0' 25depends 'openstack-identity', '>= 16.0.0'
26depends 'openstackclient' 26depends 'openstackclient'
27 27
28depends 'apache2', '~> 3.2' 28depends 'apache2'
29 29
30issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url) 30issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
31source_url 'https://github.com/openstack/cookbook-openstack-telemetry' if respond_to?(:source_url) 31source_url 'https://github.com/openstack/cookbook-openstack-telemetry' if respond_to?(:source_url)
diff --git a/recipes/api.rb b/recipes/api.rb
index f2921bf..332ae7a 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -20,7 +20,7 @@
20# limitations under the License. 20# limitations under the License.
21# 21#
22 22
23require 'uri' 23require 'addressable'
24 24
25# load the methods defined in cookbook-openstack-common libraries 25# load the methods defined in cookbook-openstack-common libraries
26class ::Chef::Recipe 26class ::Chef::Recipe
@@ -51,7 +51,7 @@ apache_listen = Array(node['apache']['listen']) # include already defined listen
51# Remove the default apache2 cookbook port, as that is also the default for horizon, but with 51# Remove the default apache2 cookbook port, as that is also the default for horizon, but with
52# a different address syntax. *:80 vs 0.0.0.0:80 52# a different address syntax. *:80 vs 0.0.0.0:80
53apache_listen -= ['*:80'] 53apache_listen -= ['*:80']
54apache_listen += ["#{bind_service_address}:#{bind_service.port}"] 54apache_listen += ["#{bind_service_address}:#{bind_service['port']}"]
55node.normal['apache']['listen'] = apache_listen.uniq 55node.normal['apache']['listen'] = apache_listen.uniq
56 56
57# include the apache2 default recipe and the recipes for mod_wsgi 57# include the apache2 default recipe and the recipes for mod_wsgi
@@ -81,8 +81,8 @@ end
81web_app 'ceilometer-api' do 81web_app 'ceilometer-api' do
82 template 'wsgi-template.conf.erb' 82 template 'wsgi-template.conf.erb'
83 daemon_process 'ceilometer-api' 83 daemon_process 'ceilometer-api'
84 server_host bind_service.host 84 server_host bind_service['host']
85 server_port bind_service.port 85 server_port bind_service['port']
86 server_entry ceilometer_server_entry 86 server_entry ceilometer_server_entry
87 run_dir node['apache']['run_dir'] 87 run_dir node['apache']['run_dir']
88 log_dir node['apache']['log_dir'] 88 log_dir node['apache']['log_dir']
diff --git a/recipes/common.rb b/recipes/common.rb
index c721580..927986d 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -72,7 +72,7 @@ auth_url =
72 72
73node.default['openstack']['telemetry']['conf'].tap do |conf| 73node.default['openstack']['telemetry']['conf'].tap do |conf|
74 conf['api']['host'] = bind_service_address 74 conf['api']['host'] = bind_service_address
75 conf['api']['port'] = bind_service.port 75 conf['api']['port'] = bind_service['port']
76 conf['keystone_authtoken']['auth_url'] = auth_url 76 conf['keystone_authtoken']['auth_url'] = auth_url
77 conf['service_credentials']['auth_url'] = auth_url 77 conf['service_credentials']['auth_url'] = auth_url
78 conf['dispatcher_gnocchi']['url'] = public_endpoint 'telemetry-metric' 78 conf['dispatcher_gnocchi']['url'] = public_endpoint 'telemetry-metric'
diff --git a/recipes/gnocchi_configure.rb b/recipes/gnocchi_configure.rb
index 99cb7f1..19919f2 100644
--- a/recipes/gnocchi_configure.rb
+++ b/recipes/gnocchi_configure.rb
@@ -43,7 +43,7 @@ auth_url =
43 43
44node.default['openstack']['telemetry-metric']['conf'].tap do |conf| 44node.default['openstack']['telemetry-metric']['conf'].tap do |conf|
45 conf['api']['host'] = bind_service_address 45 conf['api']['host'] = bind_service_address
46 conf['api']['port'] = bind_service.port 46 conf['api']['port'] = bind_service['port']
47 conf['keystone_authtoken']['auth_url'] = auth_url 47 conf['keystone_authtoken']['auth_url'] = auth_url
48end 48end
49 49
@@ -105,7 +105,7 @@ apache_listen = Array(node['apache']['listen']) # include already defined listen
105# Remove the default apache2 cookbook port, as that is also the default for horizon, but with 105# Remove the default apache2 cookbook port, as that is also the default for horizon, but with
106# a different address syntax. *:80 vs 0.0.0.0:80 106# a different address syntax. *:80 vs 0.0.0.0:80
107apache_listen -= ['*:80'] 107apache_listen -= ['*:80']
108apache_listen += ["#{bind_service_address}:#{bind_service.port}"] 108apache_listen += ["#{bind_service_address}:#{bind_service['port']}"]
109node.normal['apache']['listen'] = apache_listen.uniq 109node.normal['apache']['listen'] = apache_listen.uniq
110 110
111# include the apache2 default recipe and the recipes for mod_wsgi 111# include the apache2 default recipe and the recipes for mod_wsgi
@@ -135,8 +135,8 @@ end
135web_app 'gnocchi-api' do 135web_app 'gnocchi-api' do
136 template 'wsgi-template.conf.erb' 136 template 'wsgi-template.conf.erb'
137 daemon_process 'gnocchi-api' 137 daemon_process 'gnocchi-api'
138 server_host bind_service.host 138 server_host bind_service['host']
139 server_port bind_service.port 139 server_port bind_service['port']
140 server_entry gnocchi_server_entry 140 server_entry gnocchi_server_entry
141 run_dir node['apache']['run_dir'] 141 run_dir node['apache']['run_dir']
142 log_dir node['apache']['log_dir'] 142 log_dir node['apache']['log_dir']
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index eebb50f..3b1319e 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -90,16 +90,10 @@ connection_params = {
90 # Register Service User 90 # Register Service User
91 openstack_user service_user do 91 openstack_user service_user do
92 domain_name service_domain_name 92 domain_name service_domain_name
93 project_name service_tenant_name
94 password service_pass
95 connection_params connection_params
96 end
97
98 ## Grant Service role to Service User for Service Tenant ##
99 openstack_user service_user do
100 role_name service_role 93 role_name service_role
101 project_name service_tenant_name 94 project_name service_tenant_name
95 password service_pass
102 connection_params connection_params 96 connection_params connection_params
103 action :grant_role 97 action [:create, :grant_role]
104 end 98 end
105end 99end
diff --git a/spec/common-rhel_spec.rb b/spec/common-rhel_spec.rb
index ddbdc3d..22a5a26 100644
--- a/spec/common-rhel_spec.rb
+++ b/spec/common-rhel_spec.rb
@@ -14,11 +14,6 @@ describe 'openstack-telemetry::common' do
14 expect(chef_run).to upgrade_package 'MySQL-python' 14 expect(chef_run).to upgrade_package 'MySQL-python'
15 end 15 end
16 16
17 it 'installs postgresql python packages if explicitly told' do
18 node.set['openstack']['db']['telemetry']['service_type'] = 'postgresql'
19 expect(chef_run).to upgrade_package 'python-psycopg2'
20 end
21
22 it 'installs the common package' do 17 it 'installs the common package' do
23 expect(chef_run).to upgrade_package 'openstack-ceilometer-common' 18 expect(chef_run).to upgrade_package 'openstack-ceilometer-common'
24 end 19 end
diff --git a/spec/common_spec.rb b/spec/common_spec.rb
index 76cfbf3..5e401b3 100644
--- a/spec/common_spec.rb
+++ b/spec/common_spec.rb
@@ -24,11 +24,6 @@ describe 'openstack-telemetry::common' do
24 expect(chef_run).to upgrade_package 'python-mysqldb' 24 expect(chef_run).to upgrade_package 'python-mysqldb'
25 end 25 end
26 26
27 it 'installs postgresql python packages if explicitly told' do
28 node.set['openstack']['db']['telemetry']['service_type'] = 'postgresql'
29 expect(chef_run).to upgrade_package 'python-psycopg2'
30 end
31
32 it 'installs the common package' do 27 it 'installs the common package' do
33 expect(chef_run).to upgrade_package 'ceilometer-common' 28 expect(chef_run).to upgrade_package 'ceilometer-common'
34 end 29 end
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 7adca58..d68e76d 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -77,16 +77,6 @@ describe 'openstack-telemetry::identity_registration' do
77 ).with( 77 ).with(
78 domain_name: domain_name, 78 domain_name: domain_name,
79 project_name: project_name, 79 project_name: project_name,
80 password: password,
81 connection_params: connection_params
82 )
83 end
84
85 it do
86 expect(chef_run).to grant_role_openstack_user(
87 service_user
88 ).with(
89 project_name: project_name,
90 role_name: role_name, 80 role_name: role_name,
91 password: password, 81 password: password,
92 connection_params: connection_params 82 connection_params: connection_params
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5991001..9071950 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,12 +9,12 @@ require 'chef/application'
9LOG_LEVEL = :fatal 9LOG_LEVEL = :fatal
10REDHAT_OPTS = { 10REDHAT_OPTS = {
11 platform: 'redhat', 11 platform: 'redhat',
12 version: '7.1', 12 version: '7.3',
13 log_level: ::LOG_LEVEL, 13 log_level: ::LOG_LEVEL,
14}.freeze 14}.freeze
15UBUNTU_OPTS = { 15UBUNTU_OPTS = {
16 platform: 'ubuntu', 16 platform: 'ubuntu',
17 version: '14.04', 17 version: '16.04',
18 log_level: ::LOG_LEVEL, 18 log_level: ::LOG_LEVEL,
19}.freeze 19}.freeze
20 20