openstack
/
cookbook-openstack-dashboard
Code Issues Proposed changes

Updates for rocky 

- Replace git.openstack.org with opendev.org
- Update some documentation
- Move README.md to README.rst for better rendering
- Drop obsolete bootstrap.sh script

Change-Id: If98eef94a31bd0f082a869dc2278d21abcf47b59
This commit is contained in:
Lance Albertson 2019-12-05 16:22:06 -08:00
parent e58df346ee
commit 411e70a2e3
6 changed files with 165 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Berksfile
View File

@ -1,14 +1,11 @@
source 'https://supermarket.chef.io'
%w(common identity).each do |cookbook|
if Dir.exist?("../cookbook-openstack-#{cookbook}")
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
%w(client -common -identity).each do |cookbook|
if Dir.exist?("../cookbook-openstack#{cookbook}")
cookbook "openstack#{cookbook}", path: "../cookbook-openstack#{cookbook}"
else
cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}"
cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}"
end
end
cookbook 'openstackclient',
git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
metadata

110
README.md
View File

@ -1,110 +0,0 @@
Team and repository tags
========================
[![Team and repository tags](https://governance.openstack.org/tc/badges/cookbook-openstack-dashboard.svg)](https://governance.openstack.org/tc/reference/tags/index.html)
<!-- Change things from this point on -->
![Chef OpenStack Logo](https://www.openstack.org/themes/openstack/images/project-mascots/Chef%20OpenStack/OpenStack_Project_Chef_horizontal.png)
Description
===========
Installs the OpenStack Dashboard service **Horizon** as part of the OpenStack
reference deployment Chef for OpenStack. The
https://github.com/openstack/openstack-chef contains documentation for using
this cookbook in the context of a full OpenStack deployment. Horizon is
currently installed from packages.
https://docs.openstack.org/mitaka/config-reference/dashboard.html
Requirements
============
- Chef 12 or higher
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
dependency resolution)
Platform
========
- ubuntu
- redhat
- centos
Cookbooks
=========
The following cookbooks are dependencies:
- 'apache2', '~> 3.1'
- 'openstack-common', '>= 14.0.0'
- 'openstack-identity', '>= 14.0.0'
Attributes
==========
Please see the extensive inline documentation in `attributes/*.rb` for
descriptions of all the settable attributes for this cookbook.
Note that all attributes are in the `default['openstack']` "namespace"
Recipes
=======
## openstack-dashboard::horizon
- Sets up the packages needed to run the Horizon dashboard and its dependencies.
Includes openstack-dashboard::apache2-server recipe.
## openstack-dashboard::apache2-server
- Installs the Apache webserver and sets up an `mod_wsgi` container to run the
Horizon dashboard.
## openstack-dashboard::neutron-lbaas-dashboard
- Installs the python neutron-lbaas-dashboard package. Includes
openstack-dashboard::horizon recipe at the beginning.
License and Author
==================
| | |
|:---------------------|:---------------------------------------------------|
| **Author** | Justin Shepherd (<justin.shepherd@rackspace.com>) |
| **Author** | Jason Cannavale (<jason.cannavale@rackspace.com>) |
| **Author** | Ron Pedde (<ron.pedde@rackspace.com>) |
| **Author** | Joseph Breu (<joseph.breu@rackspace.com>) |
| **Author** | William Kelly (<william.kelly@rackspace.com>) |
| **Author** | Darren Birkett (<darren.birkett@rackspace.co.uk>) |
| **Author** | Evan Callicoat (<evan.callicoat@rackspace.com>) |
| **Author** | Jay Pipes (<jaypipes@att.com>) |
| **Author** | John Dewey (<jdewey@att.com>) |
| **Author** | Matt Ray (<matt@opscode.com>) |
| **Author** | Sean Gallagher (<sean.gallagher@att.com>) |
| **Author** | Chen Zhiwei (<zhiwchen@cn.ibm.com>) |
| **Author** | Jian Hua Geng (<gengjh@cn.ibm.com>) |
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
| **Author** | Eric Zhou (<iartarisi@suse.cz>) |
| **Author** | Jens Rosenboom (<j.rosenboom@x-ion.de>) |
| **Author** | Mark Vanderwiel (<vanderwl@us.ibm.com>) |
| **Author** | Jan Klare (<j.klare@cloudbau.de>) |
| **Author** | Christoph Albers (<c.albers@x-ion.de>) |
| | |
| **Copyright** | Copyright (c) 2012, Rackspace US, Inc. |
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
| **Copyright** | Copyright (c) 2013-2015, IBM, Corp. |
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH. |
| **Copyright** | Copyright (c) 2014, x-ion GmbH. |
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

152
README.rst Normal file
View File

@ -0,0 +1,152 @@
OpenStack Chef Cookbook - dashboard
===================================
.. image:: https://governance.openstack.org/badges/cookbook-openstack-dashboard.svg
:target: https://governance.openstack.org/reference/tags/index.html
Description
===========
Installs the OpenStack Dashboard service **Horizon** as part of the
OpenStack reference deployment Chef for OpenStack. The `OpenStack
chef-repo`_ contains documentation for using this cookbook in the
context of a full OpenStack deployment. Horizon is currently installed
from packages.
.. _OpenStack chef-repo: https://opendev.org/openstack/openstack-chef
https://docs.openstack.org/horizon/latest/
Requirements
============
- Chef 14 or higher
- ChefDK 3.2.30 for testing (also includes Berkshelf for cookbook
dependency resolution)
Platform
========
- ubuntu
- redhat
- centos
Cookbooks
=========
The following cookbooks are dependencies:
- 'apache2', '~> 5.0.1'
- 'openstack-common', '>= 18.0.0'
- 'openstack-identity', '>= 18.0.0'
- 'poise-python'
Attributes
==========
Please see the extensive inline documentation in ``attributes/*.rb`` for
descriptions of all the settable attributes for this cookbook.
Note that all attributes are in the ``default['openstack']`` "namespace"
Recipes
=======
openstack-dashboard::horizon
----------------------------
- Sets up the packages needed to run the Horizon dashboard and its
dependencies. Includes openstack-dashboard::apache2-server recipe.
openstack-dashboard::apache2-server
-----------------------------------
- Installs the Apache webserver and sets up an ``mod_wsgi`` container to
run the Horizon dashboard.
openstack-dashboard::neutron-fwaas-dashboard
--------------------------------------------
- Installs the python neutron-fwaas-dashboard package. Includes
openstack-dashboard::horizon recipe at the beginning.
openstack-dashboard::neutron-lbaas-dashboard
--------------------------------------------
- Installs the python neutron-lbaas-dashboard package. Includes
openstack-dashboard::horizon recipe at the beginning.
License and Author
==================
+-----------------+---------------------------------------------------+
| **Author** | Justin Shepherd (justin.shepherd@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jason Cannavale (jason.cannavale@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Ron Pedde (ron.pedde@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Joseph Breu (joseph.breu@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | William Kelly (william.kelly@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Darren Birkett (darren.birkett@rackspace.co.uk) |
+-----------------+---------------------------------------------------+
| **Author** | Evan Callicoat (evan.callicoat@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jay Pipes (jaypipes@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | John Dewey (jdewey@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | Matt Ray (matt@opscode.com) |
+-----------------+---------------------------------------------------+
| **Author** | Sean Gallagher (sean.gallagher@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | Chen Zhiwei (zhiwchen@cn.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jian Hua Geng (gengjh@cn.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Ionut Artarisi (iartarisi@suse.cz) |
+-----------------+---------------------------------------------------+
| **Author** | Eric Zhou (iartarisi@suse.cz) |
+-----------------+---------------------------------------------------+
| **Author** | Jens Rosenboom (j.rosenboom@x-ion.de) |
+-----------------+---------------------------------------------------+
| **Author** | Mark Vanderwiel (vanderwl@us.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jan Klare (j.klare@cloudbau.de) |
+-----------------+---------------------------------------------------+
| **Author** | Christoph Albers (c.albers@x-ion.de) |
+-----------------+---------------------------------------------------+
| **Author** | Lance Albertson (lance@osuosl.org) |
+-----------------+---------------------------------------------------+
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2012, Rackspace US, Inc. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2013-2015, IBM, Corp. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2014, x-ion GmbH. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2016-2019, Oregon State University |
+-----------------+---------------------------------------------------+
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
::
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

2
Rakefile
View File

@ -33,7 +33,7 @@ end
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)
sh %(wget -nv -t 3 -O Rakefile-Common https://opendev.org/openstack/cookbook-openstack-common/raw/branch/master/Rakefile)
load './Rakefile-Common'
Rake::Task['common_integration'].invoke
end

9
bootstrap.sh
View File

@ -1,9 +0,0 @@
#!/bin/bash -x
## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
## It relies on the common bootstrap.sh from stackforge/cookbook-openstack-common for installing common dependencies.
curl https://raw.githubusercontent.com/stackforge/cookbook-openstack-common/master/bootstrap.sh \
--retry 3 \
--silent \
--show-error \
| /bin/bash -x

12
metadata.rb
View File

@ -3,9 +3,13 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0'
description 'Installs/Configures the OpenStack Dashboard (Horizon)'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '18.0.0'
recipe 'horizon', 'Sets up the packages needed to run the Horizon dashboard and its dependencies.'
recipe 'apache2-server', 'Installs the Apache webserver to run the Horizon dashboard.'
recipe 'neutron-fwaas-dashboard', 'Installs the python neutron-fwaas-dashboard package.'
recipe 'neutron-lbaas-dashboard', 'Installs the python neutron-lbaas-dashboard package.'
%w(ubuntu redhat centos).each do |os|
supports os
end
@ -15,6 +19,6 @@ depends 'openstack-identity', '>= 18.0.0'
depends 'apache2', '5.0.1'
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)
chef_version '>= 12.5' if respond_to?(:chef_version)
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-dashboard'
chef_version '>= 14.0'