From 3d1d8039cfe5b9a6fed619e502614c2b8538907b Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Wed, 6 Jul 2016 12:06:11 -0700 Subject: [PATCH] Style and lint fixes to support newer ChefDK Change-Id: Idc239c737c0c1324a8756f88e9874d3e4dce3d35 --- README.md | 8 ++++---- attributes/default.rb | 2 +- metadata.rb | 2 ++ spec/spec_helper.rb | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5db11f2..29b2bbc 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Requirements ============ - Chef 12 or higher -- chefdk 0.9.0 for testing (also includes berkshelf for cookbook dependency - resolution) +- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook + dependency resolution) Platform ======== @@ -29,8 +29,8 @@ Cookbooks The following cookbooks are dependencies: - 'apache2', '~> 3.1' -- 'openstack-common', '>= 13.0.0' -- 'openstack-identity', '>= 13.0.0' +- 'openstack-common', '>= 14.0.0' +- 'openstack-identity', '>= 14.0.0' Attributes ========== diff --git a/attributes/default.rb b/attributes/default.rb index 4554de4..943bb50 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -113,7 +113,7 @@ when 'rhel' default['openstack']['dashboard']['ssl']['key_dir'] = '/etc/pki/tls/private/' default['openstack']['dashboard']['local_settings_path'] = '/etc/openstack-dashboard/local_settings' default['openstack']['dashboard']['django_path'] = '/usr/share/openstack-dashboard' - default['openstack']['dashboard']['policy_files_path'] = '/etc/openstack-dashboard' + default['openstack']['dashboard']['policy_files_path'] = '/etc/openstack-dashboard' default['openstack']['dashboard']['login_url'] = "#{node['openstack']['dashboard']['webroot']}auth/login/" default['openstack']['dashboard']['logout_url'] = "#{node['openstack']['dashboard']['webroot']}auth/logout/" default['openstack']['dashboard']['login_redirect_url'] = node['openstack']['dashboard']['webroot'] diff --git a/metadata.rb b/metadata.rb index ba7402a..0964713 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,6 +1,8 @@ name 'openstack-dashboard' maintainer 'openstack-chef' maintainer_email 'openstack-dev@lists.openstack.org' +issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url) +source_url 'https://github.com/openstack/cookbook-openstack-dashboard' if respond_to?(:source_url) license 'Apache 2.0' description 'Installs/Configures the OpenStack Dashboard (Horizon)' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b3ac2a1..8404de3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,12 +9,12 @@ REDHAT_OPTS = { platform: 'redhat', version: '7.1', log_level: LOG_LEVEL -} +}.freeze UBUNTU_OPTS = { platform: 'ubuntu', version: '14.04', log_level: LOG_LEVEL -} +}.freeze # Build a regex for a section of lines def build_section(lines)