Updated Modulefile for release candidate 2

Updated Modulefile to match naming conventions and dependencies
for rest of puppet-openstack projects. Updated .gitreview to
use stable/havana

Change-Id: I55ddda3bf1c89e5f6127ab3fb1a6a2d7c2f2e4d6

diff --git a/.fixtures.yml b/.fixtures.yml
index 2a9ac53591a97cfcb6f304790a31ab1dcbf296f1..369a2f08e560f67a8e64fec4f5884b4299193d15 100644 (file)
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,9 +1,13 @@
 fixtures:
   repositories:
     'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile'
-    'keystone': 'git://github.com/stackforge/puppet-keystone.git'
+    'keystone':
+      repo: 'git://github.com/stackforge/puppet-keystone.git'
+      ref: 'stable/havana'
     'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
-    'nova': 'git://github.com/stackforge/puppet-nova.git'
+    'nova':
+      repo: 'git://github.com/stackforge/puppet-nova.git'
+      ref: 'stable/havana'
     'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
   symlinks:
     'ceilometer': "#{source_dir}"

diff --git a/.gitreview b/.gitreview
index 721c4d8a5ed9b5a408a92833378ca2940ba91c1a..ce604084d5780fc5378b39ea6a9428475de43f47 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=stackforge/puppet-ceilometer.git
+defaultbranch=stable/havana

diff --git a/Modulefile b/Modulefile
index 8e5c93cc4e8e41739d3febd58957781451217908..ba03c70e569c6bd4db1e7a3169962783252b3127 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -1,13 +1,14 @@
-name    'enovance-ceilometer'
-version '0.0.1'
-source 'none'
+name    'puppetlabs-ceilometer'
+version '3.0.0-rc2'
+source 'https://github.com/stackforge/puppet-ceilometer'
 author 'enovance'
 license 'Apache License, Version 2.0'
 summary 'Install/configure Openstack Ceilometer'
 description 'Install/configure Openstack Ceilometer'
-project_page 'https://launchpad.net/ceilometer'
+project_page 'https://launchpad.net/puppet-ceilometer'
 
 # Dependencies
+dependency 'puppetlabs/keystone', '>=3.0.0 <4.0.0'
 dependency 'puppetlabs/stdlib', '>= 3.2.0'
-dependency 'cprice404/inifile', '>= 0.9.0'
+dependency 'puppetlabs/inifile', '>=1.0.0 <2.0.0'
 dependency 'puppetlabs/mysql', '>= 0.5.0'

diff --git a/README b/README
deleted file mode 100644 (file)
index 2a81834..0000000
--- a/README
+++ /dev/null
@@ -1,27 +0,0 @@
-puppet-ceilometer
-
-This is the ceilometer module.
-
-License
--------
-
-Apache License 2.0
-
-   Copyright 2012 eNovance <licensing@enovance.com>
-
-   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.
-
-Contact
--------
-
-techs@enovance.com

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..bd2f058
--- /dev/null
+++ b/README.md
@@ -0,0 +1,75 @@
+ceilometer
+==========
+
+#### Table of Contents
+
+1. [Overview - What is the ceilometer module?](#overview)
+2. [Module Description - What does the module do?](#module-description)
+3. [Setup - The basics of getting started with ceilometer](#setup)
+4. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
+5. [Limitations - OS compatibility, etc.](#limitations)
+6. [Development - Guide for contributing to the module](#development)
+7. [Contributors - Those with commits](#contributors)
+8. [Release Notes - Notes on the most recent updates to the module](#release-notes)
+
+Overview
+--------
+
+The ceilometer module is part of [Stackforge](https://github.com/stackforge), an effort by the
+OpenStack infrastructure team to provice continuous integration testing and code review for
+OpenStack and OpenStack community projects not part of the core software. The module itself
+is used to flexibly configure and manage the metering service for OpenStack.
+
+Module Description
+------------------
+
+The ceilometer module is an attempt to make Puppet capable of managing the entirety of ceilometer.
+This includes manifests to provision the ceilometer api, agents, and database stores. A
+ceilometer_config type is supplied to assist in the manipulation of configuration files.
+
+Setup
+-----
+
+**What the ceilometer module affects**
+
+* ceilometer, the metering service for OpenStack
+
+### Installing ceilometer
+
+  example% puppet module install puppetlabs/ceilometer
+
+### Beginning with ceilometer
+
+Implementation
+--------------
+
+### ceilometer
+
+ceilometer is a combination of Puppet manifests and Ruby code to deliver configuration and
+extra functionality through types and providers.
+
+Limitations
+-----------
+
+* The ceilometer modules have only been tested on RedHat and Ubuntu family systems.
+
+Development
+-----------
+
+Developer documentation for the entire puppet-openstack project
+
+* https://wiki.openstack.org/wiki/Puppet-openstack#Developer_documentation
+
+Contributors
+------------
+
+* https://github.com/stackforge/puppet-ceilometer/graphs/contributors
+
+This is the ceilometer module.
+
+Release Notes
+-------------
+
+** 3.0.0 **
+
+* Initial release of the puppet-ceilometer module.