update travis ci config with newes chefdk and adapt to cookstyle
* this is a preparation step for fully updation to chef13 (see also PR #7 for more updates)
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
# install chefdk for testing
 | 
			
		||||
install:
 | 
			
		||||
  - wget https://packages.chef.io/stable/ubuntu/12.04/chefdk_0.17.17-1_amd64.deb
 | 
			
		||||
  - sudo dpkg -i chefdk_0.17.17-1_amd64.deb
 | 
			
		||||
  - wget https://packages.chef.io/files/stable/chefdk/2.4.17/ubuntu/16.04/chefdk_2.4.17-1_amd64.deb
 | 
			
		||||
  - sudo dpkg -i chefdk_2.4.17-1_amd64.deb
 | 
			
		||||
# run all rake tasks (lint, style and unit)
 | 
			
		||||
script: rake
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								Rakefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Rakefile
									
									
									
									
									
								
							@@ -23,9 +23,9 @@ task :lint do
 | 
			
		||||
  sh %(chef exec foodcritic --epic-fail any .)
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
desc 'Run RuboCop (style) tests'
 | 
			
		||||
desc 'Run cookstyle tests'
 | 
			
		||||
task :style do
 | 
			
		||||
  sh %(chef exec rubocop)
 | 
			
		||||
  sh %(chef exec cookstyle)
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
desc 'Run RSpec (unit) tests'
 | 
			
		||||
 
 | 
			
		||||
@@ -17,10 +17,15 @@
 | 
			
		||||
name 'openstackclient'
 | 
			
		||||
maintainer 'cloudbau GmbH'
 | 
			
		||||
maintainer_email 'j.klare@cloudbau.de'
 | 
			
		||||
license 'Apache v2.0'
 | 
			
		||||
license 'Apache-2.0'
 | 
			
		||||
description 'Installs the fog-openstack gem and offers LWRPs to use it'
 | 
			
		||||
issues_url 'https://github.com/cloudbau/cookbook-openstackclient/issues'
 | 
			
		||||
source_url 'https://github.com/cloudbau/cookbook-openstackclient'
 | 
			
		||||
chef_version '>= 12.5' if respond_to?(:chef_version)
 | 
			
		||||
version '16.0.0'
 | 
			
		||||
 | 
			
		||||
%w(ubuntu redhat centos).each do |os|
 | 
			
		||||
  supports os
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
gem 'fog-openstack'
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ connection_params = {
 | 
			
		||||
  openstack_username:     'admin',
 | 
			
		||||
  openstack_api_key:      'password',
 | 
			
		||||
  openstack_project_name: 'admin',
 | 
			
		||||
  openstack_domain_id:    'default'
 | 
			
		||||
  openstack_domain_id:    'default',
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
openstack_domain 'mydomain' do
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ connection_params = {
 | 
			
		||||
  openstack_username:     'admin',
 | 
			
		||||
  openstack_api_key:      'password',
 | 
			
		||||
  openstack_project_name: 'admin',
 | 
			
		||||
  openstack_domain_id:    'default'
 | 
			
		||||
  openstack_domain_id:    'default',
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
%w(public internal admin).each do |interface|
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ connection_params = {
 | 
			
		||||
  openstack_username:     'admin',
 | 
			
		||||
  openstack_api_key:      'password',
 | 
			
		||||
  openstack_project_name: 'admin',
 | 
			
		||||
  openstack_domain_id:    'default'
 | 
			
		||||
  openstack_domain_id:    'default',
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
openstack_project 'myproject' do
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ connection_params = {
 | 
			
		||||
  openstack_username:     'admin',
 | 
			
		||||
  openstack_api_key:      'password',
 | 
			
		||||
  openstack_project_name: 'admin',
 | 
			
		||||
  openstack_domain_id:    'default'
 | 
			
		||||
  openstack_domain_id:    'default',
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
openstack_role 'myrole' do
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ connection_params = {
 | 
			
		||||
  openstack_username:     'admin',
 | 
			
		||||
  openstack_api_key:      'password',
 | 
			
		||||
  openstack_project_name: 'admin',
 | 
			
		||||
  openstack_domain_id:    'default'
 | 
			
		||||
  openstack_domain_id:    'default',
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
openstack_service 'myservice' do
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ connection_params = {
 | 
			
		||||
  openstack_username:     'admin',
 | 
			
		||||
  openstack_api_key:      'password',
 | 
			
		||||
  openstack_project_name: 'admin',
 | 
			
		||||
  openstack_domain_id:    'default'
 | 
			
		||||
  openstack_domain_id:    'default',
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
openstack_user 'myuser' do
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ end
 | 
			
		||||
 | 
			
		||||
UBUNTU_OPTS = {
 | 
			
		||||
  platform: 'ubuntu',
 | 
			
		||||
  version: '16.04'
 | 
			
		||||
  version: '16.04',
 | 
			
		||||
}.freeze
 | 
			
		||||
 | 
			
		||||
at_exit { ChefSpec::Coverage.report! }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user