openstack
/
cookbook-openstack-dashboard
Code Issues Proposed changes

Style and lint fixes to support newer ChefDK 

Change-Id: Idc239c737c0c1324a8756f88e9874d3e4dce3d35
This commit is contained in:
Samuel Cassiba 2016-07-06 12:06:11 -07:00
parent 8717d2f073
commit 3d1d8039cf
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -13,8 +13,8 @@ Requirements
============ ============
- Chef 12 or higher - Chef 12 or higher
- chefdk 0.9.0 for testing (also includes berkshelf for cookbook dependency - chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
resolution) dependency resolution)
Platform Platform
======== ========
@ -29,8 +29,8 @@ Cookbooks
The following cookbooks are dependencies: The following cookbooks are dependencies:
- 'apache2', '~> 3.1' - 'apache2', '~> 3.1'
- 'openstack-common', '>= 13.0.0' - 'openstack-common', '>= 14.0.0'
- 'openstack-identity', '>= 13.0.0' - 'openstack-identity', '>= 14.0.0'
Attributes Attributes
========== ==========

2
attributes/default.rb
View File

@ -113,7 +113,7 @@ when 'rhel'
default['openstack']['dashboard']['ssl']['key_dir'] = '/etc/pki/tls/private/' default['openstack']['dashboard']['ssl']['key_dir'] = '/etc/pki/tls/private/'
default['openstack']['dashboard']['local_settings_path'] = '/etc/openstack-dashboard/local_settings' default['openstack']['dashboard']['local_settings_path'] = '/etc/openstack-dashboard/local_settings'
default['openstack']['dashboard']['django_path'] = '/usr/share/openstack-dashboard' 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']['login_url'] = "#{node['openstack']['dashboard']['webroot']}auth/login/"
default['openstack']['dashboard']['logout_url'] = "#{node['openstack']['dashboard']['webroot']}auth/logout/" default['openstack']['dashboard']['logout_url'] = "#{node['openstack']['dashboard']['webroot']}auth/logout/"
default['openstack']['dashboard']['login_redirect_url'] = node['openstack']['dashboard']['webroot'] default['openstack']['dashboard']['login_redirect_url'] = node['openstack']['dashboard']['webroot']

2
metadata.rb
View File

@ -1,6 +1,8 @@
name 'openstack-dashboard' name 'openstack-dashboard'
maintainer 'openstack-chef' maintainer 'openstack-chef'
maintainer_email 'openstack-dev@lists.openstack.org' 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' license 'Apache 2.0'
description 'Installs/Configures the OpenStack Dashboard (Horizon)' description 'Installs/Configures the OpenStack Dashboard (Horizon)'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

4
spec/spec_helper.rb
View File

@ -9,12 +9,12 @@ REDHAT_OPTS = {
platform: 'redhat', platform: 'redhat',
version: '7.1', version: '7.1',
log_level: LOG_LEVEL log_level: LOG_LEVEL
} }.freeze
UBUNTU_OPTS = { UBUNTU_OPTS = {
platform: 'ubuntu', platform: 'ubuntu',
version: '14.04', version: '14.04',
log_level: LOG_LEVEL log_level: LOG_LEVEL
} }.freeze
# Build a regex for a section of lines # Build a regex for a section of lines
def build_section(lines) def build_section(lines)