Merge pull request #99 from xbezdick/master

Update openstack modules to their latest master branches
Add puppet-n1k-vsm

Add support for Cisco VSM(Virtual Supervisor Module) Foreman puppet
agent deployment logic.
VSM is a Cisco NX-OS based virtual machine which uses its northbound
REST API to communicate with OpenStack Nova Cloud Controller.
It maintains a virtual chassis where each slot (from slot 3 to slot 66 or 3
to slot 130) is taken a VEM module (Virtual Ethernet Module) which, in turn,
is a virtual switch infra structure provided by N1KV  on each server.

Fixes: rhbz#1121788
Latest vswitch
containing "Refactored...ovs_redhat provider
Merge pull request #103 from gildub/update/vswitch

Latest vswitch
Merge pull request #102 from imcsk8/puppet-n1k-vsm

Please create backport PR for branch icehouse.
Update rabbitmq submodule to 4.1.0
Removed nagios because of wrong commit
Readded Nagios with latest update
Merge pull request #106 from RedHatEMEA/icehouse

Update rabbitmq submodule to 4.1.0
Merge pull request #107 from gildub/nagios+latest

Nagios+latest
Set correct path to n1k-vsm module

In previous commit this module was added but it
had the wrong path.
Merge pull request #116 from imcsk8/n1k-vsm

Set correct path to n1k-vsm module
Update ceilometer to latest master

commit 957c2120d0ee0b9db08bfddcce996686ba61d97d
Author: Mike Dorman <mdorman@godaddy.com>
Date:   Thu Sep 4 13:49:30 2014 -0600

    Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true

    The kombu_ssl_* parameters should not be required when rabbit_use_ssl => true
    Rather, rabbit_use_ssl must be set to true if the kombu_ssl_* parameters are
    used.

    Change-Id: I7664dda2c66ffb34ceb56ada722574ae0e490f8f
    Closes-Bug: 1356083
Update cinder to latest master

commit 2da616a4a52d3086fe3a291b9199fc7313575504
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Mon Sep 15 10:24:47 2014 -0400

    Use $::processorcount to compute API workers number

    As we do in other OpenStack Puppet modules, let's use $::processorcount
    fact to compute the number of API workers and improve scalability for
    cinder-api service.

    Change-Id: Iac3e1305ba0b22d70e874e038eb10914311d5695
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

commit da2f5a125cae6fbed0384d9316434f953eb9ea7b
Author: Risto Laurikainen <risto.laurikainen@csc.fi>
Date:   Fri Aug 22 15:37:23 2014 +0300

    Make user creation optional when creating service.

    In some cases it is useful to be able to just configure
    the service in Keystone and not the service user. This
    is the case when e.g. a read only LDAP backend is used.
    Added parameters configure_user and configure_user_role
    (default to true).

    Change-Id: I021976f1eafa881755c0abbe1f6ba1b546dee111
    Closes-Bug: 1360232
Update glance to latest master

commit 246842f13cd06aeb0ce07959ff892f21749a340f
Author: Risto Laurikainen <risto.laurikainen@csc.fi>
Date:   Fri Aug 22 15:38:36 2014 +0300

    Make user creation optional when creating service.

    In some cases it is useful to be able to just configure
    the service in Keystone and not the service user. This
    is the case when e.g. a read only LDAP backend is used.
    Added parameters configure_user and configure_user_role
    (default to true).

    Change-Id: If9bb802ff2bb0b3ece55f36df773059ba9c7e9de
    Closes-Bug: 1360232
Update heat to latest master

commit a95a9435dcb5f4b24b2e53213fe05b5466b46d6a
Author: Colleen Murphy <colleen@puppetlabs.com>
Date:   Fri Jul 11 10:40:32 2014 -0700

    Migrate mysql backend to use openstacklib::db::mysql

    Implements: blueprint commmon-openstack-database-resource
    Change-Id: I71e1bf084139524e41276e5cbd7f5be02d07e825

commit a4a20a9012114ee21ad175422d3a9d5f0ab41120
Author: Mike Dorman <mdorman@godaddy.com>
Date:   Thu Sep 4 10:59:21 2014 -0600

    Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true

    The kombu_ssl_* parameters should not be required when rabbit_use_ssl => true
    Rather, rabbit_use_ssl must be set to true if the kombu_ssl_* parameters are
    used.

    Change-Id: If9cceb4f4090c8b39079aa1aae2f53640c9ac0ff
    Closes-Bug: 1356083
Update keystone to latest master

commit a7c891b2200829a3d52e7e5ad2ed40563d727c09
Author: Christian Schnidrig <christian.schnidrig@switch.ch>
Date:   Wed Sep 17 15:43:23 2014 +0200

    Duplicate definition of parameters in ldap.pp

        Closes-Bug: 1367582

    Change-Id: I9915cb884d9024ed2b71932826ffa4837884fd46

commit 45ac386600c0e79942834da8b69bf09a4809d7bd
Merge: e381349 89a6506
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 15 19:08:29 2014 +0000

    Merge "Fix usage of admin_endpoint"

commit e381349c1b838301dd730aa3cd146ecacc75aa7c
Merge: 8bd5f39 f277297
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 3 14:58:44 2014 +0000

    Merge "Add extended logging options."

commit 8bd5f39b26c2847fe2612ee0ccfdba06bf2d82ad
Merge: db8339e 6e108f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 3 03:28:24 2014 +0000

    Merge "Migrate mysql backend to use openstacklib::db::mysql"

commit f277297080251ec2fe789363c3c5dd0877c9435d
Author: Johannes Grassler <j.grassler@syseleven.de>
Date:   Mon Sep 1 12:27:30 2014 +0000

    Add extended logging options.

    There is a range of extended logging options in Openstack services that use
    openstack.common.logger (Ceilometer, Cinder, Heat, Keystone, Nova). Adding
    keystone::logging to support them. This change is identical to
    <https://review.openstack.org/#/c/113560/> but it applies to puppet-keystone
    instead of puppet-ceilometer.

    No blueprint/spec, as discussed in the IRC meeting on 08-11-2014.

    Change-Id: I88fcf025b9467090d21d1a10a5af9b270f8ef11e

commit 6e108f23b8d6c0b82fbf3f200669224db0a7a5ba
Author: Colleen Murphy <colleen@puppetlabs.com>
Date:   Fri Jul 11 10:47:18 2014 -0700

    Migrate mysql backend to use openstacklib::db::mysql

    Implements: blueprint commmon-openstack-database-resource
    Change-Id: I5dc293c1b8033000523fae504f789199599cf447

commit 89a650631189ffc2f857845d138666a046f0ae5f
Author: Michael Chapman <woppin@gmail.com>
Date:   Mon Aug 4 23:34:21 2014 +1000

    Fix usage of admin_endpoint

    The admin_endpoint in keystone.conf is used
    to advertise for service discovery to a client, and
    should not contain the identity version as this will
    be appended based on which versions are available.

    This patch changes the behavior of the native types that
    depend on admin_endpoint and the service validation to
    accept a url without a version appended. In both cases,
    the version will be set to v2.0, as there is no suitable
    conf option in keystone.conf from which the available
    versions can be deduced. This allows the correct, versionless
    admin_endpoint to be set in keystone.conf for the service
    itself.

    Change-Id: I0c1ebd9f1cf452828698555e7c642fac770aa73f
Update neutron to latest master

commit 3445712b1818160899862e8cf114604cb946813f
Author: Jakub Libosvar <libosvar@redhat.com>
Date:   Fri Sep 12 16:23:52 2014 +0200

    Set Neutron workers according CPU count

    In order to improve scalability of neutron-server and
    neutron-metadata-agent we need to spawn multiple processes. This patch
    changes default of api, rpc and metadata workers according to processors
    count on physical machine.

    Change-Id: I0480f1652b181e50a8c10230c293d6dfdec3a670

commit 67cc3a88ce0e0575617d74b1718b28da1070b8ff
Merge: 519d2b5 e396f24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 9 18:51:51 2014 +0000

    Merge "Fixed manage_service feature"

commit e396f24b5d694b9dcf81f9d1dc9b95727af0a5ba
Author: Martin Magr <mmagr@redhat.com>
Date:   Tue Aug 26 17:54:12 2014 +0200

    Fixed manage_service feature

    Using manage_service=>false in class neutron::agents::ovs generates
    error. This patch is fixing the issue and makes mentioned use-case
    installable.

    Change-Id: I5a3205c3e21e1312463f47d938f5854a189c5d38
    Closes-bug: #1359823
Update nova to latest master

commit 0c402aeed61899caea3b0f25be44bee00305e443
Merge: 8a63ea4 3fffc72
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 18 16:05:07 2014 +0000

    Merge "Add quotes for bareword instances of 'type'"

commit 3fffc726c2b5c56ff995b7f65be888563ef33a22
Author: Mike Dorman <mdorman@godaddy.com>
Date:   Wed Sep 17 16:26:04 2014 -0600

    Add quotes for bareword instances of 'type'

    In Puppet 3.7.x, 'type' is now a reserved word.  So it must
    be quoted to avoid reserved word usage errors.

    Closes-Bug: 1370748

    Change-Id: I3bb9b0482baebdce549faa1aaf2b0f6073c95e90

commit 8a63ea41d54722b0c41653deef913fe789219f6f
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Mon Sep 15 09:28:58 2014 -0400

    Support workers number of EC2 service

    Beside Nova API & metadata, bring workers management support to EC2
    service.

    Change-Id: I9617aa971558534eaf84dd3e5e912411918d4497
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

commit ae171f93ed8dc60e6597ec03a7cfd7c7b70e65ed
Merge: d5e18c4 08e37e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 15 02:47:39 2014 +0000

    Merge "Add ability to set floating IP Pool names"

commit d5e18c490619bce916a1a99def42122db9aff4d9
Merge: a050b2c 816fe4a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 9 18:56:30 2014 +0000

    Merge "Join enabled_ssl_apis array"

commit a050b2c36eba258a76f466b697219588585e66a7
Merge: 61429e7 14f31f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 9 06:23:43 2014 +0000

    Merge "crontab to move deleted instance rows to another database table"

commit 14f31f40a7408727d3c7825ba1ce61a89de4ad30
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Wed Aug 20 12:06:12 2014 +0200

    crontab to move deleted instance rows to another database table

    Create a crontab which moves deleted instances rows to another database table that you don't have to backup.
    This is done to optimize database management at scale.
    Depending on the amount of deleted instances that you get on a daily
    basis you want to modify the $max_rows parameter.

    This feature is implemented as in nova CLI and addressed by this
    blueprint: https://blueprints.launchpad.net/nova/+spec/db-archiving

    Change-Id: Ia03fa6862aefcbcc7d7949b08d00bacf679cb548
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

commit 61429e79ddfc0308657482cb57e411f82c8a0165
Author: Mike Dorman <mdorman@godaddy.com>
Date:   Wed Sep 3 12:43:11 2014 -0600

    Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true

    The kombu_ssl_* parameters should not be required when rabbit_use_ssl => true
    Rather, rabbit_use_ssl must be set to true if the kombu_ssl_* parameters are
    used.

    (Similar to this patch to puppet-neutron: https://review.openstack.org/#/c/113671/ )

    Closes-Bug: 1356083
    Change-Id: I6a27ebf359c1910e221e9dc31711c6af569dc0ce

commit 816fe4a78a330c2e2c6eb0849566d1777b8e91f6
Author: Xav Paice <xav@catalyst.net.nz>
Date:   Mon Aug 25 14:30:10 2014 +1200

    Join enabled_ssl_apis array

    Adds a stdlib join() to the enabled_ssl_apis so we can specify more than one.

    Closes bug: #1360978

    Change-Id: Ifd290fea802fc926a9e34076393c2c55c3cd9cf5

commit 08e37e94c8f98eabb53a5db45d74d85bf7be9538
Author: Aimon Bustardo <Aimon.Bustardo@NexusIS.com>
Date:   Tue Aug 26 15:54:53 2014 -0700

    Add ability to set floating IP Pool names

      - Defaults to 'nova'
      - Allows user to create multiple pools outside
        of the 'nova::manage::floating' definition.

    Change-Id: Ia0482cf24a7d9b9589e9b401879268f40e397be3
Update openstack to latest master

commit d81d2d86280d5739cc896a48b68d7309e765047a
Author: Aimon Bustardo <Aimon.Bustardo@NexusIS.com>
Date:   Sat May 17 10:42:07 2014 -0400

    Fix upstream rspec failure in cinder

    - This is a fix to code that made it into master which was causing
      jenkins to fail

    Change-Id: Ic5373aa552e20c83dfc03464544f3f8339be0e24

commit b8153e04fc2ca680a42d0eb94e0ab3fe30c24956
Merge: 63896a8 0e1c7af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 22 04:37:49 2014 +0000

    Merge "Fixed typos in readme"

commit 63896a854c1610227289f2b325d15a3e849b3e49
Merge: 38d0d47 77a984a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 4 17:44:40 2014 +0000

    Merge "Remove unsupported --no-cache CLI parameter"

commit 38d0d47d703f98aa313af25945d04374331c54f2
Merge: 24b7249 f93374e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 4 17:44:14 2014 +0000

    Merge "Update Cirros to 0.3.2"

commit 24b72492d92fac02f0ea8d727e0a0b6929e8da03
Merge: 6509520 445f443
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 4 13:19:15 2014 +0000

    Merge "Updated to match semver and release notes."

commit 77a984a6a39d170c3e790d342842a10574755e70
Author: Chris Ricker <chricker@cisco.com>
Date:   Fri Apr 4 05:29:07 2014 -0700

    Remove unsupported --no-cache CLI parameter

    Current versions of python-novaclient no longer support the --no-cache
    option, and instead require a --os-cache option to use the cache.

    Change-Id: Id0f11edbbdf0aaebc230346cb316b07d567a261b
    Closes-Bug: #1302560

commit f93374ebdfd5d26ac1deccafe57493bf6ec296d3
Author: Chris Ricker <chricker@cisco.com>
Date:   Thu Apr 3 05:11:09 2014 -0700

    Update Cirros to 0.3.2

    Update Cirros image install to use newest version (0.3.2).

    Change-Id: Ifedeec1c6660bde11c0833e2e50d3b316170fe76
    Closes-Bug: #1301901

commit 445f443226d72ed4e765378a6e502925e5908062
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Mar 21 16:22:42 2014 -0700

    Updated to match semver and release notes.

    Before this update the Modulefile was not following semver in
    relation to stable/havana, and the README files were not in sync.
    This update introduces proper semver and consistency.

    Change-Id: Idcc436bb2bdc5180dbeb5eeed8e7342c30c757ae

commit 0e1c7afee4ae62581ca21b4f212784f85ff7ee7b
Author: rajinir <rajini_ram@dell.com>
Date:   Thu Mar 27 13:21:11 2014 -0500

    Fixed typos in readme

    Change-Id: Ifc000e35f7471eec0a98bfee5937140173fe57b4

commit 6509520a044e8e47d788e4902aa4c40bd45d2bcf
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 15:38:31 2014 -0700

    Fixed gate by Updating Gemfile to pin Rake to 10.1.1

    The latest Rake update requires Ruby >= 1.9. Bundler in the
    current gate uses 1.8.x. This update fixes the gate by pinning
    Rake to the last known working version.

    Change-Id: Ic0338578860a069c1cab86b94e7aac2049dd88dd

commit 6b35e7870543154e4fd94d380456ac81caaa8d11
Merge: 16c4e7f d4b5fae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 18 16:28:48 2014 +0000

    Merge "Add configuration for glance-api used by cinder."

commit 16c4e7fc5af1c53120d52baf7014bc84841e4af9
Author: uberj <jaxbr503@gmail.com>
Date:   Sun Mar 16 19:03:17 2014 -0700

    fix broken anchor tag

    Change-Id: I5aeaa212d65bb5a0088dae7d9979256535284b95

commit f2b7397fb6396f07e5a9f9c5cdce4015565d65a7
Merge: 2840cc6 472253c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 5 21:46:55 2014 +0000

    Merge "Ensure swift.conf created in all scenarios"

commit 2840cc60e695752e993c8f12ee3ee97135261132
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Tue Mar 4 11:08:30 2014 -0500

    Unpin puppetlabs-apache fixture to use latest version

    puppetlabs-apache >= 0.11.0 is required by horizon module.

    Change-Id: Ic7990161b80cad9a72bb641d7b221433b1445d50
    Closes-bug: #1287752

commit 472253cbe29b1375b33d91ae13b561dcdc7fa2d6
Author: Chris Ricker <chricker@cisco.com>
Date:   Mon Mar 3 12:34:43 2014 -0800

    Ensure swift.conf created in all scenarios

    Change I60fb78e5d40605ab47f349d154737ef9bab641f4 introduced a bug
    wherein /etc/swift/swift.conf is getting created in consolidated
    installs in which openstack::swift::proxy and
    openstack::swift::storage-node classes are both applied to the same
    server, but is not getting created on storage nodes in distributed
    installs in which the proxy and storage-node classes are applied to
    different servers.

    Use ensure_resource wrappers around the swift class call to correct.

    Change-Id: I692ddf5f344577705fc6a8652349f480ad21542d
    Closes-Bug: 1287349

commit d4b5fae753a0f7d1b5d68d3286f400de160d5501
Author: Min Pae <sputnik13@gmail.com>
Date:   Fri Feb 28 03:37:05 2014 -0800

    Add configuration for glance-api used by cinder.

    Adding configuration for glance-api used by cinder.  This is necessary
    in multi-node installations to allow nova boot from an image based
    volume to work properly.  Glance-api for cinder is currently being set
    to 127.0.0.1 by default.

    Closes-Bug: #1286088
    Change-Id: I35f789e07ad317e7c8952beb4192c1f4159383d4

commit 0cbddbcea0f3c9932863695d731f079fdd2b1be2
Author: Michael Chapman <woppin@gmail.com>
Date:   Sat Mar 1 00:48:56 2014 +1100

    Fix ubuntu issues that broke tests.

    Puppetlabs apt introduced a change that required a debian
    specific fact that wasn't being set in the spec tests. This
    patch adds it.

    Change-Id: Ia8fb3a5d0b01bf58eea583f2f129b48b4ce9564d

commit d3928e578daae530d88bf219f57b2449cb6419b9
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Thu Jan 23 16:42:00 2014 -0800

    Remove param validation if enable_ovs_agent=false

    Currently the controller module assumes that the
    OVS agent is always configured when the neutron
    service is configured. This patch ensures that
    when OVS agent is not enabled, we do not require
    OVS agent specific params to be set.

    Change-Id: Id3e601841f2c962dbe9a142c4bdfe80b1a9fd4a7

commit 1bd3442a946f81101ff60dc45ba996fa3d5bb4e2
Author: Jeffrey Cox <jefcox@indiana.edu>
Date:   Tue Feb 4 11:21:37 2014 -0500

    Remove deprecated address from keystone spec

    When I57b8469fb816c37c9d6a285c07796f685b121a90 (Remove deprecated
    parameter 'address') was merged openstack_keystone_spec.rb broke.
    This change removes the use of the deprecated 'address'.

    Change-Id: Ib6d74bfc0d13f5c13f523d5d98b4aea60cc4adaf

commit eec8af5a745a28db1bcccb51f5cff22ef88dee42
Author: Chris Ricker <chricker@cisco.com>
Date:   Mon Feb 3 05:58:52 2014 -0800

    test_nova.sh uses old cirros images

    Update test_nova.sh to download Cirros 0.3.1 for config_drive support,
    and for consistency with the other Cirros image downloads within this
    module.

    Change-Id: Ic022c0199d254c3cadb08ccda1ef588fd3f09c35
    Closes-Bug: #1275746

commit c20039004cb39e78c93cd00f154c3b9ba6404951
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Jan 9 14:14:50 2014 -0800

    Release 3.0.0

    Updated Modulefile for release 3.0.0.

    Change-Id: I18ddb80fb97176a2b6614fd8d7c482eef0f59116

commit 66ff261dffdd666431ef77d1f1601594a372edf3
Merge: 388d47b 0a8f231
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 30 17:49:26 2013 +0000

    Merge "Change facter variable format"

commit 0a8f231156fe14c2e70114aef6d3f39d117c3d3d
Author: Rongze Zhu <rongze@unitedstack.com>
Date:   Mon Dec 30 10:59:00 2013 +0800

    Change facter variable format

    since facter variables are set at top scope, we can prefer "$::" to make
    it explicit:
      * $operatingsystem => $::operatingsystem

    Change-Id: I30a08e72182feae6f416cda96555d45d43dcc933

commit 388d47bd9b58bc2259de86dfc9c23f6f3bf60583
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Wed Dec 25 21:16:13 2013 -0500

    Remove duplicated parameters for keystone

    Following parameters where duplicated by mistake:
    nova, glance, cinder, neutron, ceilometer, swift, enabled.

    Change-Id: I4587ac21a3328a34971428629185bd919cfddb2b
    Closes-bug: #1263886

commit fa37fc06562ec3299f54c72ce3120ae9d79b2abe
Merge: 800d01c ba0c921
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 23 20:06:19 2013 +0000

    Merge "Add missing mysql_root_password to tests/site.pp"

commit 800d01c6f9ae20357bafbe33666f24905b5d7bf9
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Mon Dec 23 02:43:51 2013 -0500

    Remove use of deprecated include_class matcher

    include_class is deprecated since rspec-puppet 1.0.0.
    contain_class should be used instead.

    Closes-bug: #1263617
    Change-Id: I63fed009811684de1441a7b9d43325415d1860f9

commit ba0c921368609f4716d40b632b9d945ff1aca7f3
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Sun Dec 22 01:12:54 2013 -0500

    Add missing mysql_root_password to tests/site.pp

    Example was missing required parameter mysql_root_password.

    Change-Id: I6a6b6e712ccab0057a668f2a3ee007f4483b9d76
    Closes-bug: #1263292

commit 0ab9b6030e7d938c2c0ad3a0ee1af89a805df3a5
Merge: 06adf02 dfaad20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 20 22:21:53 2013 +0000

    Merge "Update for 3.0.0-rc2" into stable/havana

commit dfaad20a350b8f69e525e6ea8b1c3e2e40c5ccec
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Dec 20 14:04:08 2013 -0800

    Update for 3.0.0-rc2

    Updated .gitreview to use stable/havana branch. Updated Modulefile
    with current version and dependencies for new Heat and
    Ceilometer releases.

    Change-Id: Ied48ec68ace77fbdfa47216d8d32e531c320bcd3

commit 06adf0246a9ead74eb788f529468620de2d11deb
Author: cbaesema <cbaeseman@gmail.com>
Date:   Tue Dec 17 13:47:25 2013 -0600

    Allow running of proxy and storage on the same node.

    This adds a if defined check to avoid class conflicts
    when running swift proxy and storage on the same node.

    Change-Id: I60fb78e5d40605ab47f349d154737ef9bab641f4
    (cherry picked from commit 4b9e74a7a275f32217d86487f975c8ded85317b2)

commit 4b9e74a7a275f32217d86487f975c8ded85317b2
Author: cbaesema <cbaeseman@gmail.com>
Date:   Tue Dec 17 13:47:25 2013 -0600

    Allow running of proxy and storage on the same node.

    This adds a if defined check to avoid class conflicts
    when running swift proxy and storage on the same node.

    Change-Id: I60fb78e5d40605ab47f349d154737ef9bab641f4

commit a936e2b7b7d200816bbeebd5be471d02e91d0af0
Merge: dec4538 cd25ea3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 17 00:36:31 2013 +0000

    Merge "Set Horizon default role to _member_"

commit cd25ea33a746725fff83ccb9d0d331fa430db382
Author: Ian Wienand <iwienand@redhat.com>
Date:   Fri Dec 6 21:06:51 2013 +1100

    Set Horizon default role to _member_

    Keystone puppet module creates "Member" and "_member_" roles, which
    creates confusion as to why both exist.  In a parallel change [1] we
    modify keystone to only create the _member_ role.  Here we switch
    Horizon to use that as the default role.

    See also rhbz#984294 [2]

    [1] https://review.openstack.org/#/c/60463/
    [2] https://bugzilla.redhat.com/show_bug.cgi?id=984294

    Change-Id: I329db398d0ec33eb3997167806717c45df7cec09

commit dec453819088730248f52982191e6ee2c4b38873
Author: Zeb Palmer <zeb@zebpalmer.com>
Date:   Sun Dec 8 17:53:12 2013 -0700

    Typo fix and slight rewording

    Change-Id: I0b2688e6302cf25e333bcaa936985660e9dd0fa7

commit f4c3d01cd2edb1dbaa5328a81c1995304a9f671f
Merge: c7b4ef2 d001af0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 26 15:05:15 2013 +0000

    Merge "Add syslog support to openstack::compute"

commit c7b4ef2e82a3b3a2e147bd68875d858aaafaa407
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Thu Nov 21 12:23:27 2013 +0100

    Puppetfile: Update remote url for puppet-vswitch

      * Migrated on stackforge now

    Change-Id: I7c5b51612816bc9ebb1394c1ae69677910bd1f44

commit d3accf21a5490820cd5627f67b1613e8e2a4d0f4
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Nov 14 12:04:12 2013 -0800

    Preparing for 3.0.0 Havana release

    Updated Modulefile with current release version.
    Updated README.md with deprecation warning and release notes.
    Updated fixtures to point to stable/havana branch

    Change-Id: I1e1f70d6ddaa41c0ac71b4d4b44c91d745ee3e8f

commit d001af09108649d5fd44d41a76fea9d9333ebe41
Author: Francois Deppierraz <francois@ctrlaltdel.ch>
Date:   Tue Oct 29 16:13:36 2013 +0100

    Add syslog support to openstack::compute

    Change-Id: I20072f2e5cb06422b68347cc9d96cb6ee0d5532a