Style and lint fixes to support newer ChefDK
Change-Id: Idc239c737c0c1324a8756f88e9874d3e4dce3d35
(cherry picked from commit 3d1d8039cf
)
This commit is contained in:
parent
a85e10d33d
commit
ba000e235e
|
@ -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
|
||||
========
|
||||
|
|
|
@ -119,7 +119,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']
|
||||
|
|
|
@ -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'))
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue