dashboard refactor for Pike and Chef 13
- implemented foodcritic and cookstyle corrections - deprecated node.foo.bar method access for node['foo']['bar'] bracket access - added workaround for bug #1616265 - deprecated postgresql support - moved package_overrides to common cookbook Implements blueprint modern-chef Change-Id: I1e0be7d59414897adf82ac21d2430df2525a61d9
This commit is contained in:
parent
5bfcedf378
commit
1b4d4f8259
20
Berksfile
20
Berksfile
|
@ -1,10 +1,14 @@
|
|||
source "https://supermarket.chef.io"
|
||||
source 'https://supermarket.chef.io'
|
||||
|
||||
%w(common identity).each do |cookbook|
|
||||
if Dir.exist?("../cookbook-openstack-#{cookbook}")
|
||||
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
|
||||
else
|
||||
cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
|
||||
end
|
||||
end
|
||||
|
||||
cookbook 'openstackclient',
|
||||
github: 'cloudbau/cookbook-openstackclient'
|
||||
|
||||
metadata
|
||||
|
||||
cookbook "openstack-common",
|
||||
github: "openstack/cookbook-openstack-common"
|
||||
cookbook "openstack-identity",
|
||||
github: "openstack/cookbook-openstack-identity"
|
||||
cookbook "openstackclient",
|
||||
github: "cloudbau/cookbook-openstackclient"
|
||||
|
|
|
@ -0,0 +1,176 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
31
Rakefile
31
Rakefile
|
@ -1,40 +1,39 @@
|
|||
task default: ["test"]
|
||||
task default: ['test']
|
||||
|
||||
task :test => [:syntax, :lint, :unit]
|
||||
task test: [:syntax, :lint, :unit]
|
||||
|
||||
desc "Vendor the cookbooks in the Berksfile"
|
||||
desc 'Vendor the cookbooks in the Berksfile'
|
||||
task :berks_prep do
|
||||
sh %{chef exec berks vendor}
|
||||
sh %(chef exec berks vendor)
|
||||
end
|
||||
|
||||
desc "Run FoodCritic (syntax) tests"
|
||||
desc 'Run FoodCritic (syntax) tests'
|
||||
task :syntax do
|
||||
sh %{chef exec foodcritic --exclude spec -f any .}
|
||||
sh %(chef exec foodcritic --exclude spec -f any .)
|
||||
end
|
||||
|
||||
desc "Run RuboCop (lint) tests"
|
||||
desc 'Run RuboCop (lint) tests'
|
||||
task :lint do
|
||||
sh %{chef exec cookstyle}
|
||||
sh %(chef exec cookstyle)
|
||||
end
|
||||
|
||||
desc "Run RSpec (unit) tests"
|
||||
task :unit => :berks_prep do
|
||||
sh %{chef exec rspec --format documentation}
|
||||
desc 'Run RSpec (unit) tests'
|
||||
task unit: :berks_prep do
|
||||
sh %(chef exec rspec --format documentation)
|
||||
end
|
||||
|
||||
desc "Remove the berks-cookbooks directory and the Berksfile.lock"
|
||||
desc 'Remove the berks-cookbooks directory and the Berksfile.lock'
|
||||
task :clean do
|
||||
rm_rf [
|
||||
'berks-cookbooks',
|
||||
'Berksfile.lock'
|
||||
'Berksfile.lock',
|
||||
]
|
||||
end
|
||||
|
||||
desc "All-in-One Neutron build Infra using Common task"
|
||||
desc 'All-in-One Neutron build Infra using Common task'
|
||||
task :integration do
|
||||
# Use the common integration task
|
||||
sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile)
|
||||
load './Rakefile-Common'
|
||||
Rake::Task["common_integration"].invoke
|
||||
Rake::Task['common_integration'].invoke
|
||||
end
|
||||
|
||||
|
|
|
@ -98,7 +98,6 @@ default['openstack']['dashboard']['webroot'] = '/'
|
|||
# Put common ones here and platform specific ones below.
|
||||
default['openstack']['dashboard']['db_python_packages'] = {
|
||||
mysql: [],
|
||||
postgresql: [],
|
||||
sqlite: [],
|
||||
}
|
||||
|
||||
|
@ -145,7 +144,7 @@ when 'debian'
|
|||
default['openstack']['dashboard']['login_redirect_url'] = nil
|
||||
default['openstack']['dashboard']['platform'] = {
|
||||
'memcache_python_packages' => ['python-memcache'],
|
||||
'package_overrides' => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'",
|
||||
'package_overrides' => '',
|
||||
}
|
||||
default['openstack']['dashboard']['platform']['horizon_packages'] = ['node-less', 'openstack-dashboard']
|
||||
default['openstack']['dashboard']['apache']['sites-path'] = "#{node['apache']['dir']}/sites-available/openstack-dashboard.conf"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
name 'openstack-dashboard'
|
||||
maintainer 'openstack-chef'
|
||||
maintainer_email 'openstack-dev@lists.openstack.org'
|
||||
license 'Apache 2.0'
|
||||
license 'Apache-2.0'
|
||||
description 'Installs/Configures the OpenStack Dashboard (Horizon)'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
version '16.0.0'
|
||||
|
@ -12,8 +12,8 @@ end
|
|||
|
||||
depends 'openstack-common', '>= 16.0.0'
|
||||
depends 'openstack-identity', '>= 16.0.0'
|
||||
depends 'apache2', '~> 3.2'
|
||||
depends 'poise-python', '~> 1.5.1'
|
||||
depends 'apache2'
|
||||
depends 'poise-python'
|
||||
|
||||
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)
|
||||
|
|
|
@ -53,9 +53,9 @@ apache2_listen = Array(node['apache']['listen'])
|
|||
# a different address syntax. *:80 vs 0.0.0.0:80
|
||||
apache2_listen -= ['*:80']
|
||||
|
||||
apache2_listen += ["#{http_bind.host}:#{http_bind.port}"]
|
||||
apache2_listen += ["#{http_bind['host']}:#{http_bind['port']}"]
|
||||
if node['openstack']['dashboard']['use_ssl']
|
||||
apache2_listen += ["#{https_bind.host}:#{https_bind.port}"]
|
||||
apache2_listen += ["#{https_bind['host']}:#{https_bind['port']}"]
|
||||
end
|
||||
|
||||
node.normal['apache']['listen'] = apache2_listen.uniq
|
||||
|
@ -163,9 +163,9 @@ template node['openstack']['dashboard']['apache']['sites-path'] do
|
|||
ssl_key_file: ssl_key_file.to_s,
|
||||
ssl_chain_file: ssl_chain_file.to_s,
|
||||
http_bind_address: http_bind_address,
|
||||
http_bind_port: http_bind.port.to_i,
|
||||
http_bind_port: http_bind['port'].to_i,
|
||||
https_bind_address: https_bind_address,
|
||||
https_bind_port: https_bind.port.to_i
|
||||
https_bind_port: https_bind['port'].to_i
|
||||
)
|
||||
|
||||
notifies :run, 'execute[restore-selinux-context]', :immediately
|
||||
|
|
|
@ -123,4 +123,20 @@ execute 'openstack-dashboard collectstatic' do
|
|||
action :nothing
|
||||
end
|
||||
|
||||
# workaround for
|
||||
# https://bugs.launchpad.net/openstack-chef/+bug/1496158
|
||||
secret_file =
|
||||
::File.join(node['openstack']['dashboard']['django_path'],
|
||||
'openstack_dashboard',
|
||||
'local',
|
||||
'.secret_key_store')
|
||||
|
||||
file secret_file do
|
||||
owner node['openstack']['dashboard']['horizon_user']
|
||||
group node['openstack']['dashboard']['horizon_user']
|
||||
mode 0600
|
||||
subscribes :create, 'service[apache2]', :immediately
|
||||
only_if { ::File.exist?(secret_file) }
|
||||
end
|
||||
|
||||
include_recipe 'openstack-dashboard::apache2-server'
|
||||
|
|
|
@ -11,11 +11,6 @@ shared_examples 'virtualhost port configurator' do |port_attribute_name, port_at
|
|||
expect(chef_run).not_to render_file(file.name).with_content(/^NameVirtualHost/)
|
||||
end
|
||||
|
||||
it 'sets NameVirtualHost directives when apache 2.2' do
|
||||
node.set['apache']['version'] = '2.2'
|
||||
expect(chef_run).to render_file(file.name).with_content(/^NameVirtualHost 0.0.0.0:#{port_attribute_value}$/)
|
||||
end
|
||||
|
||||
it 'sets the VirtualHost directive' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^#{virtualhost_directive}$/)
|
||||
end
|
||||
|
@ -458,11 +453,6 @@ describe 'openstack-dashboard::apache2-server' do
|
|||
end
|
||||
|
||||
context 'directory options' do
|
||||
it 'sets default options for apache 2.2' do
|
||||
node.set['apache']['version'] = '2.2'
|
||||
expect(chef_run).to render_file(file.name).with_content(/^\s*Order allow,deny\n\s*allow from all$/)
|
||||
end
|
||||
|
||||
it 'sets default options for apache 2.4' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^\s*Require all granted$/)
|
||||
end
|
||||
|
|
|
@ -7,7 +7,7 @@ ChefSpec::Coverage.start! { add_filter 'openstack-dashboard' }
|
|||
LOG_LEVEL = :fatal
|
||||
REDHAT_OPTS = {
|
||||
platform: 'redhat',
|
||||
version: '7.1',
|
||||
version: '7.3',
|
||||
log_level: LOG_LEVEL,
|
||||
}.freeze
|
||||
UBUNTU_OPTS = {
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
<%= node["openstack"]["dashboard"]["custom_template_banner"] %>
|
||||
|
||||
<% if node['apache']['version'] != '2.4' -%>
|
||||
NameVirtualHost <%= @http_bind_address %>:<%= @http_bind_port %>
|
||||
<% end -%>
|
||||
|
||||
<VirtualHost <%= @http_bind_address %>:<%= @http_bind_port %>>
|
||||
<% if node["openstack"]["dashboard"]["server_hostname"] -%>
|
||||
ServerName <%= node["openstack"]["dashboard"]["server_hostname"] %>
|
||||
|
@ -22,10 +18,6 @@ NameVirtualHost <%= @http_bind_address %>:<%= @http_bind_port %>
|
|||
TraceEnable <%= node['openstack']['dashboard']['traceenable'] %>
|
||||
</VirtualHost>
|
||||
|
||||
<% if node['apache']['version'] != '2.4' -%>
|
||||
NameVirtualHost <%= @https_bind_address %>:<%= @https_bind_port %>
|
||||
<% end -%>
|
||||
|
||||
<VirtualHost <%= @https_bind_address %>:<%= @https_bind_port %>>
|
||||
<% if node["openstack"]["dashboard"]["server_hostname"] -%>
|
||||
ServerName <%= node["openstack"]["dashboard"]["server_hostname"] %>
|
||||
|
@ -53,23 +45,13 @@ NameVirtualHost <%= @https_bind_address %>:<%= @https_bind_port %>
|
|||
<Directory <%= node["openstack"]["dashboard"]["dash_path"] %>>
|
||||
Options Indexes FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
<% if node['apache']['version'] == '2.4' -%>
|
||||
Require all granted
|
||||
<% else -%>
|
||||
Order allow,deny
|
||||
allow from all
|
||||
<% end -%>
|
||||
</Directory>
|
||||
|
||||
<Directory <%= node["openstack"]["dashboard"]["static_path"] %>>
|
||||
Options FollowSymLinks MultiViews
|
||||
AllowOverride None
|
||||
<% if node['apache']['version'] == '2.4' -%>
|
||||
Require all granted
|
||||
<% else -%>
|
||||
Order allow,deny
|
||||
allow from all
|
||||
<% end -%>
|
||||
</Directory>
|
||||
|
||||
<% if node["openstack"]["dashboard"]["use_ssl"] -%>
|
||||
|
@ -95,9 +77,7 @@ NameVirtualHost <%= @https_bind_address %>:<%= @https_bind_port %>
|
|||
CustomLog <%= node["apache"]["log_dir"] %>/<%= node["openstack"]["dashboard"]["access_log"] %> combined
|
||||
TraceEnable <%= node['openstack']['dashboard']['traceenable'] %>
|
||||
<% unless node["openstack"]["dashboard"]["cache_html"] %>
|
||||
<% if node['apache']['version'] >= '2.4' -%>
|
||||
SetEnvIfExpr "req('accept') =~/html/" NO_CACHE
|
||||
<% end -%>
|
||||
Header merge Cache-Control no-cache env=NO_CACHE
|
||||
Header merge Cache-Control no-store env=NO_CACHE
|
||||
<% end -%>
|
||||
|
|
Loading…
Reference in New Issue