Update puppet-keytone to most recent stable/havana

Fixes: rhbz#1113148
Fixed concat source for havana branch too
Merge pull request #72 from paramite/keystone-update-havana

Update puppet-keytone to most recent stable/havana
Update ceilometer to stable/icehouse

commit a7d368dc4d2e85103fc058149d45140431b53743
Author: Clayton O'Neill <clayton@oneill.net>
Date:   Fri Jun 20 07:51:19 2014 -0400

    Normalize Gemfile & pin tests to rspec < 2.99

    Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
    This is to avoid warnings due to deprecated matchers in the
    rspec-puppet gem.

    This change is also intended to normalize the Gemfile for all stackforge
    puppet modules.  This should facilitate pinning gem versions when
    releasing new stable branches, since the same diff can be used for all
    repos.

    Change-Id: Ia1286824cebca09e20bf6d11a3435982b93442b9
    Partial-Bug: #1326034
    (cherry picked from commit bea7794633943e454fe3e99ee119298c3d0000ff)

commit d505b7cda751b4fb912a42491a399101586714a0
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Mar 26 10:51:21 2014 -0700

    Release 3.1.1

    Updated Modulefile and README.md for 3.1.1 release.

    Change-Id: I3afd0df190e6e8a44fe3b3e9c2ab379eef5b955e

commit f571054496c18a022e5c4a5490175a36f2927f18
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 14:43:32 2014 -0700

    Updated README with copright/license

    Change-Id: Ibbb4dbca30e03e88bbd3d47d73df2ad4d0cfb1fc

commit f71f935a3e41dcd11f8f5986a1fe0708b124e589
Merge: 3e3c021 7e4f4dc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 6 19:17:14 2014 +0000

    Merge "fix alarm_package_name for Debian/Ubuntu (only havana)" into stable/havana

commit 3e3c021a81b015323c2fe0243f138f90c2cd2eb7
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Tue Mar 4 16:57:42 2014 -0500

    Move service polling credentials to service_credentials

    Change-Id: I74a523bcc1acd18532bb9353b70da63c70e8e325
    Closes-bug: #1287939
    (cherry picked from commit 160b5ed239e996e6c18de3f6158c8b0a4e66c175)

commit 7e4f4dc896c1277cc9f9f8fc34486fdd5a69401b
Author: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date:   Fri Feb 28 15:23:18 2014 +0100

    fix alarm_package_name for Debian/Ubuntu (only havana)

      - Debian uses separate packages in havana
      - Ubuntu uses ceilometer-common which conflicts with init.pp
      - separate tests for Ubuntu/Debian (for alarm*)
      - Change-Id: I91098bd3f13ee4391dcf1b870705c0a0c5566acc
        introduced this troubles.

    Change-Id: I8d396131386e5469eb6d7d43d7c6a7354abed31a

commit fa5a6ee45f973bc73e8a7e662b4b31a41f81ce5a
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Tue Jan 28 18:18:00 2014 -0500

    Do not enforce glance_control_exchange

    The default glance_control_exchange in Ceilometer has been changed
    from 'glance_notifications' to 'glance' in grizzly-2. Glance always
    had 'glance' for its control_exchange.

    This was a bug in Ceilometer and puppet-ceilometer patched it.
    It shouldn't anymore.

    Change-Id: I217515c91f092fb3e8039dde2d14a7ab4cbb7245
    Closes-bug: #1273878
    (cherry picked from commit 85d46894cca6ba80e8cb57243dde57e44cffa443)

commit 951050814aafd28bd3b16f3bd46eb2371e79684d
Author: Yanis Guenane <yanis.guenane@enovance.com>
Date:   Thu Feb 20 09:55:13 2014 -0500

    Define $user referenced in db.pp

    In db.pp, in the exec 'ceilometer dbsync' ressource the user
    is supposed to be $::ceilometer::params::user, but it was
    not defined.

    (cherry picked from commit e6c191194312935ea01c97ae667bf3ea1a912f81)

    Conflicts:
    	spec/classes/ceilometer_db_spec.rb

    Change-Id: I888be405f418932c0e46ce8e82486755d36fc7bf

commit a5bd498e7f56e9c8cb3c7d552693205cacbbca43
Author: Yanis Guenane <yanis.guenane@enovance.com>
Date:   Wed Feb 19 13:50:34 2014 -0500

    Allow db fields configuration without doing the dbsync

    This commit allows one to configure the db fields without running the actual
    dbsync command. It remains compliant with the current implementation, leaving
    exec {'ceilometer-dbsync': in the catalog. One, now, can decide if it wants
    the dbsync to take place or not.

    This is useful when one picks mongodb as a backend and wants to use replicaset
    This way it can scale horizontally and painlessly using the initSync feature
    of mongodb. With this pattern one can add new member of the replica set
    easily.

    Change-Id: I8618bb385147176512fbda1540ba75ac95fccbf1
    (cherry picked from commit 1aa1d795f0c06bb5266886b8599814e61fbef3f3)

commit b6b51d4d8b0ea165b7bb2730c3f58b899717a939
Merge: 36b8268 9772fb2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 19 16:08:54 2014 +0000

    Merge "Havana: Fixtures: fix keystone branch name" into stable/havana

commit 36b8268b2b914c679f798e8cc436c0b581629a3c
Merge: 0ad0d4d f3f9199
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 19 15:03:30 2014 +0000

    Merge "Allow log_dir to be set to false in order to disable file logging" into stable/havana

commit 9772fb26e62cc0663f6323a6ab5f5bdc5c364af7
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Tue Feb 18 13:57:11 2014 +0100

    Havana: Fixtures: fix keystone branch name

    Solve issue: « fatal: ambiguous argument 'stable/havana': unknown
    revision or path not in the working tree. »

    Change-Id: If4a484010e4f8a3fd8aa6f0f5434943194637331

commit 0ad0d4d245dcebe3b6e0c504f5d1ff5e16e6d42d
Merge: 0c044cb 619a827
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 18 07:00:14 2014 +0000

    Merge "Fix alarm package params for ubuntu havana" into stable/havana

commit 619a8271563c37351f7c08fa6bf0304888d0a667
Author: Pradeep Kilambi <pkilambi@cisco.com>
Date:   Thu Feb 6 17:47:51 2014 -0500

    Fix alarm package params for ubuntu havana

    The alarm-notifier and alarm-evaluator are
    still part of ceilometer-common for havana ubuntu
    packaging. The new packaging split is only available
    for icehouse

    Change-Id: I91098bd3f13ee4391dcf1b870705c0a0c5566acc

commit 0c044cbbcd0204eba9a84cb28a9072c26ececa52
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Feb 14 15:24:36 2014 -0800

    Release 3.1.0

    Minor verson release for API changes related to glance and logging.
    Bux fix to fix package installation on Ubuntu.

    Change-Id: I27c6066558af8e2432703423ff312635113e8ca2

commit f3f919993a928c877fb243ae415604d7ace5fb6e
Author: David Moreau Simard <dmsimard@iweb.com>
Date:   Fri Feb 14 11:42:16 2014 -0500

    Allow log_dir to be set to false in order to disable file logging

    This backward compatible commit allows a user to disable logging to
    a directory for example if using syslog logging.

    Change-Id: I8b496c311b9f26cab64c38d1cfd545784dfc7cab
    Related-bug: #1269482
    (cherry picked from commit 2b35c1a04ce6f28f700971c31d18af88b65a089e)

commit 0a6d87ce6b9c23cb827029f3d97c44f3a0756015
Merge: 91045b3 6bc791f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 14 11:20:52 2014 +0000

    Merge "Remove glance_notifications from notification_topic" into stable/havana

commit 6bc791fd06eae9d9c0ac7904710e008a23aefdd3
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Tue Jan 28 18:13:01 2014 -0500

    Remove glance_notifications from notification_topic

    The default notification_topic in Glance has been changed from
    'glance_notifications' to 'notifications' in grizzly-2.

    Ceilometer was configured to also listen on the
    'glance_notifications' notification_topic in addition to
    'notifications' to patch this bug. It shouldn't anymore.

    Change-Id: I3d797c7e849319a1e20ef3ecbf158e8b8579d450
    Closes-bug: #1273876
    (cherry picked from commit 924f18ffae174847d4c3d5ec5d5ae4241c9dd897)

commit 91045b3be907b074cb1e0165b269d439aee43a26
Author: Martin Magr <mmagr@redhat.com>
Date:   Mon Feb 3 14:31:26 2014 +0100

    Don't match commented [DEFAULT]

    Class ceilometer::agent::compute fails when there are [DEFAULT] sections
    commented. This patch is fixing this issue. For more info check
    https://bugzilla.redhat.com/show_bug.cgi?id=1060712

    Change-Id: I6d13f780f63af8798d94b49246576d1e144a4540
    (cherry picked from commit a46bbc4c5179d4988f4beec0fc548c91300008a2)

commit 3933601ec14cbf814cab23e383ac82bac05886c1
Merge: 3acae1f 1246733
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 27 12:36:00 2014 +0000

    Merge "Remove log_dir from params and make logs configurable in init" into stable/havana

commit 124673341a166c9450f7b0562e80f92df882308b
Author: David Moreau Simard <dmsimard@iweb.com>
Date:   Tue Jan 21 13:30:02 2014 -0500

    Remove log_dir from params and make logs configurable in init

    log_dir does not seem to be used in other classes. In the use case where
    it can be necessary to specify the location of ceilometer logs, this
    patch makes it possible to do so while maintaining the default for
    backwards compatibility. This patch also adds the possibility of
    sending logs to syslog/rsyslog in the same way as implemented in
    puppet-nova.

    Change-Id: I1f970d5e3cc947308221fb2b2cdfb34f89c64314
    Partial-Bug: #1269482
    (cherry picked from commit 3685997f0ed4a88d0ccacd0415b210a948c66910)

commit 3acae1fd2a3ac641a09c8ce0b62bb152696923ae
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Sat Jan 4 11:32:35 2014 +0100

    Fix package ceilometer-alarm type error on Debian

    This commit:
      - Fix type error about ceilometer-alarm package name
        - See bug #1263946
      - Fix indentation on Debian params.pp
      - Fix spec warnings (partition_rpc_topic,record_history)

    Closes-bug: #1263946

    Change-Id: I1ad19af429f2787d58837e51da95e981bdd66b40
    (cherry-pick from 5bc33119dfc2adb8abdd0c475422d0e8559513c1)

commit e5c3f3b9629f199db30e9a1bf5456477cb43624b
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Jan 17 17:28:34 2014 -0800

    Release 3.0.0

    Updated Modulefile for release 3.0.0.

    Change-Id: I2d16cbf9d792d396c815adc131786830c32aade5

commit 7e4c10400192ce390a3f2bcb882d2d73bd606dd8
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Jan 17 10:12:51 2014 -0800

    Release candidate 3.0.0-rc3

    Updated Modulefile for release candidate 3.

    Change-Id: I3b45063afd080100287b0544be5d71d849048d89

commit 781b455de41da8691699ff5f421986f601fffa10
Merge: dc47463 a338d48
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 05:56:26 2014 +0000

    Merge "Remove use of deprecated include_class matcher" into stable/havana

commit dc47463e162ef929592e5a324df029130b6ea9a4
Merge: 9590d78 7901dff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 15 05:55:59 2014 +0000

    Merge "Only add ceilometer user to nova group if using compute agent" into stable/havana

commit 7901dffe27b2aa52c495c93ca09c7af2332ab0b3
Author: David Moreau Simard <dmsimard@iweb.com>
Date:   Tue Jan 7 16:41:14 2014 -0500

    Only add ceilometer user to nova group if using compute agent

    When using ceilometer outside of the compute context (ex: with the
    swift middleware), puppet-ceilometer attempts to add the user to
    the nova group which does not (and probably should not) exist on
    the swift nodes.

    Change-Id: I6cc68152325a967c024ce611f92a90ce0afba8cc
    (cherry picked from commit d064997cd4c50d9b5365fe2ffca60e14a86b08e1)

commit 9590d78769c8dc960c84795647e57e4ee2569bb2
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Thu Jan 2 15:50:34 2014 +0100

    Add API binding options

    Ceilometer is able to bind API server to both an IP address and a port.
    This patch aims to add support for both configuration flags.

    Change-Id: I83164a925cf115d091cb04d14922ee7bbdd0ac63
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
    (cherry picked from commit f8eea90cd9f1652ba927bfcc9bf8234af8983c11)

commit a338d481691c53ff80db7233a1094bf366089036
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Mon Dec 23 02:27:17 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: If2e5a2c467a5d1c4eb130dc6b2643d05c748abe0
    (cherry picked from commit f745cf634fa2cf9889a2ef03ee9de3a3d0d1045b)

commit 2f4ac2e4af45a025a1fc9b668c8feb4e0274c53e
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Jan 8 16:20:19 2014 -0800

    Fixed mysql dependency to match other modules

    Fixed the mysql dependency to match the other puppet-openstack modules.

    Change-Id: I8ad1011f892e2cadfbfa3fa4ca932fae9ded5cf0
    (cherry picked from commit 49f814a58cc7594584673564ce56996e34cc09ac)

    Conflicts:
    	.fixtures.yml
    	Modulefile

    Change-Id: I8ad1011f892e2cadfbfa3fa4ca932fae9ded5cf0

commit f1727b23a53242dd498d2676b1560fb48bc5f067
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Dec 18 16:59:39 2013 -0800

    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

commit da5ab8f32bd88163973821bb8165507c67fefa66
Merge: dcc75e8 ff80c78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 12 06:47:29 2013 +0000

    Merge "TTL mechanism support with expirer service" into stable/havana

commit ff80c78e654ff1698669129648759c302d4ed54d
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Wed Dec 4 01:04:42 2013 +0100

    TTL mechanism support with expirer service

    Aims to support a TTL mechanism for data entering Ceilometer
    collector database.
    TTL is very useful to configure when getting a lot of meters.

    implement blueprint ttl-support
    Change-Id: I9d98e8b833ad94fd79722dee7226e7f4f03aaa2e
    (cherry picked from commit 0af224916f085166d5ccd104e90cbc680039063d)
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

commit dcc75e8831652a8a213a765801fd3fa51672e87c
Merge: 5b46cd2 c9c9ad5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 16:14:01 2013 +0000

    Merge "Updates to params.pp for mongo and postgres packages" into stable/havana

commit 5b46cd2f6eef43b63f56036bfa43dbe3173d34d7
Merge: 313cf8c dd60a1f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 9 16:13:47 2013 +0000

    Merge "Alarm: record history support" into stable/havana

commit 313cf8c64134c2518ef32ff638eba06667511de0
Author: Benedikt von St. Vieth <b.von.st.vieth@fz-juelich.de>
Date:   Wed Nov 6 09:26:41 2013 +0100

    changed rabbit_virtualhost(wrong) to rabbit_virtual_host

    the puppet module configures a rabbit_virtualhost, there is a missing underscore (rabbit_virtual_host). changed this for manifest and tests.

    Change-Id: I02b34eb6531cfa0071a7e52f5a97f0e952f8ea85
    (cherry picked from commit bfece45c001de44b727b0b2441db25fc9b45024c)

commit dd60a1fc5e5344bf9b6af8bf5fafa3a9aab6ef11
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Sat Nov 2 00:50:54 2013 +0100

    Alarm: record history support

    Ceilometer Alarm is able to record alarm change events.
    This patch add this support in manifest.

    Change-Id: Id8ece03dfd3491cd2886a345771df9622d702190
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
    (cherry picked from commit 24a712516bb721bd62ead06cabadc631b8b7f060)

commit c9c9ad5a763c13ece0b00c8cb4c23c23e9cd271d
Author: Francesco Vollero <fvollero@redhat.com>
Date:   Thu Oct 31 19:11:58 2013 +0100

    Updates to params.pp for mongo and postgres packages

    *) Removed the hardcoded postgres package from db.pp
    *) Changed the mongo package to python-pymongo for RHEL

    Change-Id: Ib975f9ce03ee8ffa423e75b62b595bcdefdd1eed
    Signed-off-by: Francesco Vollero <fvollero@redhat.com>
    (cherry picked from commit 0fb3b8f693ba4cc24bdcfb1f61de843343a13e75)

commit 0fb3b8f693ba4cc24bdcfb1f61de843343a13e75
Author: Francesco Vollero <fvollero@redhat.com>
Date:   Thu Oct 31 19:11:58 2013 +0100

    Updates to params.pp for mongo and postgres packages

    *) Removed the hardcoded postgres package from db.pp
    *) Changed the mongo package to python-pymongo for RHEL

    Change-Id: Ib975f9ce03ee8ffa423e75b62b595bcdefdd1eed
    Signed-off-by: Francesco Vollero <fvollero@redhat.com>

commit 7ac2d80c4e5cec07a54670c4165337ce58a32bf8
Merge: 7f32025 bfece45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 13 10:49:16 2013 +0000

    Merge "changed rabbit_virtualhost(wrong) to rabbit_virtual_host"

commit 7f320253bf65cc39c8bd743a5d38654655935c8b
Merge: 0bd24d0 24a7125
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 13 10:35:42 2013 +0000

    Merge "Alarm: record history support"

commit bfece45c001de44b727b0b2441db25fc9b45024c
Author: Benedikt von St. Vieth <b.von.st.vieth@fz-juelich.de>
Date:   Wed Nov 6 09:26:41 2013 +0100

    changed rabbit_virtualhost(wrong) to rabbit_virtual_host

    the puppet module configures a rabbit_virtualhost, there is a missing underscore (rabbit_virtual_host). changed this for manifest and tests.

    Change-Id: I02b34eb6531cfa0071a7e52f5a97f0e952f8ea85

commit 24a712516bb721bd62ead06cabadc631b8b7f060
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Sat Nov 2 00:50:54 2013 +0100

    Alarm: record history support

    Ceilometer Alarm is able to record alarm change events.
    This patch add this support in manifest.

    Change-Id: Id8ece03dfd3491cd2886a345771df9622d702190
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
Update cinder to stable/icehouse

commit f3e4aeeb92d300b3c05b07d3c79a812c129a95e7
Author: Xingchao Yu <xingchao@unitedstack.com>
Date:   Thu Apr 3 18:26:21 2014 +0800

    Introduce cinder:config to manage custom options

    This cinder::config is aim to use cinder config resources
    to manage custom configurations in cinder config files.

    This will make end user easy to add their own custom options
    in Hiera data.

    Fully implements blueprint cinder-custom-config

    (cherry-picked from 9b40aa5692c82ce25c0127bea4567d9e62b51a52)
    Change-Id: I58faf3f4c76b2eb2077552036a239b60103ee965

commit f65e9e72efa981e8cbb71476aafa98f947899945
Author: Clayton O'Neill <clayton@oneill.net>
Date:   Fri Jun 20 07:55:17 2014 -0400

    Normalize Gemfile & pin tests to rspec < 2.99

    Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
    This is to avoid warnings due to deprecated matchers in the
    rspec-puppet gem.

    This change is also intended to normalize the Gemfile for all stackforge
    puppet modules.  This should facilitate pinning gem versions when
    releasing new stable branches, since the same diff can be used for all
    repos.

    Conflicts:
      Gemfile

    Change-Id: I8870d6cb3a1a895aac53ec3c096c413a52d02d19
    Partial-Bug: #1326034
    (cherry picked from commit 2553e6d1b26b137abdb979350257991fe93b3b24)

commit 224a85b7d1909daa823de5979d2364df0949f9c6
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Tue Apr 15 14:13:45 2014 -0700

    Release 3.1.1

    Updated Modulefile and README.md for bugfix release.

    Change-Id: I1592d0b09587fd27a054bbbf32f9b1d30cbb8715

commit bd1536626f2b5d66f9ea77bcd69ba7d1f5f33961
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Tue Mar 18 15:43:18 2014 +0100

    RBD backend: use ensure_resource

    In the case we want to declare more than one backend using RBD driver,
    we have a resource dupplication which could be fixed by using stlib
    functions.

    Closes-bug #1294138
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

    Change-Id: I1783540cd8218e8bafb4d0b860ca4c5992f35a19
    (cherry picked from commit 6dba575af6f119385614b390c92dc258032a480e)

commit d92b38a8c7bb484e935ed21510843ef6be8e31d3
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Mar 26 11:01:10 2014 -0700

    Release 3.1.0

    Updated Modulefile and README.md for 3.1.0 release.

    Change-Id: I8ea0fb820f679b9868b696738605c003362a45b1

commit b393b606193752f8d80afdec35392fb7d64eb849
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 16:05:46 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: I618eccbd209a90e5868367c4d962df7700a555f9

commit 0bb7b8f42a56ca878749b5e766722909730509ab
Author: Marc Koderer <m.koderer@telekom.de>
Date:   Mon Feb 3 15:50:00 2014 +0100

    Add default_volume_type as cinder api parameter

    Adds a parameter to set the default_volume_type for the cinder api.
    Cinder-api uses this value if in CLI the parameter '--volume-type' is not
    given.

    Change-Id: I6cdad0a90d249bdaa2729d201cf10d3b16dd96a1
    (cherry picked from commit cd7391c5e2567a081d5a214a80cb773caa1ae2c6)

commit adba1f15c6ec8f66bc8a08b3f5c4e66284e824b1
Merge: 3a0f099 04cc148
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 18 15:04:58 2014 +0000

    Merge "add parameter for endpoint protocols" into stable/havana

commit 3a0f09995625b1c2f6ec446cc2a2571348a7af0b
Merge: 81f8430 fb390ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 18 12:35:22 2014 +0000

    Merge "volume/rbd: Re-enable conditional for string parameters" into stable/havana

commit 81f8430ff4a54d4afe49bcd6595120dd6a723042
Merge: 83e6b6c 478cffd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 18 12:34:36 2014 +0000

    Merge "multi rbd: add opts, deprecate glance_api_version" into stable/havana

commit 83e6b6c9ef339be04a27ce758e9756bf8afab25b
Merge: 65af092 e1bfb88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 18 12:33:06 2014 +0000

    Merge "Add support for VMDK driver" into stable/havana

commit fb390ff8275aef7aa6fa528f3fef55879be9ebc5
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Tue Feb 18 14:34:00 2014 +0100

    volume/rbd: Re-enable conditional for string parameters

    - According the Michael comments on review¹, the conditional statements
      was re-added (in order to not pass « False » in ini config file).
    - Fix spec/defines/* warnings (Space interpreted as grouped expression)

    ¹https://review.openstack.org/#/c/73892/2/manifests/backend/rbd.pp

    (cherry picked from commit 94940882f542c701ab6de27ddd0e51857707fc2b)

    Conflicts:
    	manifests/volume/rbd.pp

    Change-Id: I036ea1bf9dd0c6941d7f02038b39a7f293d68ffe

commit 478cffda8fa02e8dacfb06a133e7d867fbc323d1
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Mon Feb 17 02:11:35 2014 +0100

    multi rbd: add opts, deprecate glance_api_version

    - Add all cinder rbd params (multi-backends)
    - Update documentation/tests
    - Deprecate glance_api_version to avoid duplicate definition
      with cinder::glance class.
      (use glance_api_version of cinder::glance class instead.)

    (cherry picked from commit dda201af2aa9f4fdca1b46bbeeeea6821ba6b637)

    Change-Id: I237ea1ae7a9a1a67272b4ec705d832daef1bc5c7

commit e1bfb88a2a9aaa6e2fea56447a9b26e2d3a5e3ea
Author: Sabari Kumar Murugesan <smurugesan@vmware.com>
Date:   Wed Dec 4 12:29:02 2013 -0800

    Add support for VMDK driver

    The patch adds support for VMware vmdk cinder driver. It also
    supports configuring the driver for multi-backend scenarios.

    implements blueprint support-vmdk-driver

    (cherry picked from commit 14be6892554ab1c4df6144a0c782bad6b8c9cfec)

    Conflicts:
    	manifests/volume/vmdk.pp
    	spec/classes/cinder_volume_vmdk_spec.rb

    Change-Id: Ida0303ac55ab2af5cff9db8fcfcc36d46440c2e2

commit 65af092a930884f6c5dad6a188505e889a3c1eac
Merge: a4d9d1d 66f0b69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 17 17:07:36 2014 +0000

    Merge "[bp] Add support for Cinder multi-backend" into stable/havana

commit 66f0b69fa06b6c1c899d1ae02d0f54acb977f6a1
Author: Andrew Woodward <awoodward@mirantis.com>
Date:   Tue Oct 29 17:07:49 2013 -0700

    [bp] Add support for Cinder multi-backend

    * Create class cinder::backend.
       Sets DEFAULT/enabled_backends

    * Create define cinder::type.
       multip-purpose function to create type and optionally set extened
       information.

    * Create define cinder::type_set.
       multi-purpose set function to set extended information.

    * Copy rbd, iscsi, and nfs volume providers to support multi-backend
       Now provided as cinder::backend::<driver> to ensure that multi-backend
       aware resource is|[ not] used.

    * Add rspec for new parts to ensure expected function.

    Blueprint: cinder-volume-multi-backend

    (cherry picked from commit 209a5bd36af085cf306cf084ed1af1bf0fc9f41d)

    Conflicts:
    	README.md

    Change-Id: Ia2a92a067be6e785d7ca92c4029372ecf6e02ba7

commit 04cc14873fad0ba5722f8843c31d5990fd58acff
Author: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date:   Fri Mar 7 08:11:14 2014 +0100

    add parameter for endpoint protocols

    This gives the ability to specify https endpoint for
    internal and/or admin endpoints.

    Change-Id: I9cc1525449ffd9b1439e6e5fcbf6731b8a7ee260
    backport: havana
    (cherry picked from commit 414c7ecec660103f6bcb29c8e99752ce7952a3b2)

commit a4d9d1d2d885bbd97cff5fc69619b06e2e703eeb
Author: Bob Callaway <bob.callaway@netapp.com>
Date:   Fri Feb 28 10:56:53 2014 -0500

    Add support for multiple NetApp backends

    This change adds a new define for cinder::backend::netapp, allowing
    users to create multiple NetApp backend definitions within their puppet
    manifests for use with Cinder.

    Implements: blueprint cinder-multi-backend-netapp
    (cherry picked from commit 21640609c11df1b5c0447a98b99295dc631a7600)

    Change-Id: I0a94dbefc21d254369bfb4a0b9562bf5348cc70b
Update glance to stable/icehouse

commit 951a66d5351b5bb5effe90cfddc5cad85eb7f383
Merge: 5d7ec93 1578088
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 15 22:24:49 2014 +0000

    Merge "Fixes wrong values in get_glance_image_attrs" into stable/havana

commit 15780880b0476e5a80eff0b85268ccd139ac5d46
Author: Ivan Chavero <ichavero@redhat.com>
Date:   Sun May 4 10:14:17 2014 -0600

    Fixes wrong values in get_glance_image_attrs

    The output of the glance show command in get_glance_image_attrs
    does not get properly converted while being added to the
    attrs array.

    Change-Id: Ibe503b24ae3bfa10944537d5deaa068a01eaa5f3
    Closes-Bug: #1199513
    (cherry picked from commit 0adbbcf9f44367cb840c8786b05c35c63d7d2f41)

commit 5d7ec93d00fad01bc12f65d6b69d5ad57ae08583
Author: Xingchao Yu <xingchao@unitedstack.com>
Date:   Thu Apr 3 18:11:55 2014 +0800

    Introduce glance:config to manage custom options

    This glance::config is aim to use glance_config resources
    to manage custom configurations in glance config files.

    This will make end user easy to add their own custom options
    in Hiera data.

    Fully implements blueprint glance-custom-config

    (cherry-picked from 11f5e87a0fe9f9adefcc2b814c4d26950f7dd760)
    Change-Id: Idc47b6bda3ea38e582501278f82c9c6841b8cdf0

commit c8cd5e40f545eb7f3844cc85ca9952ab57a1f8bf
Author: Clayton O'Neill <clayton@oneill.net>
Date:   Fri Jun 20 07:56:01 2014 -0400

    Normalize Gemfile & pin tests to rspec < 2.99

    Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
    This is to avoid warnings due to deprecated matchers in the
    rspec-puppet gem.

    This change is also intended to normalize the Gemfile for all stackforge
    puppet modules.  This should facilitate pinning gem versions when
    releasing new stable branches, since the same diff can be used for all
    repos.

    Conflicts:
      Gemfile

    Change-Id: I08dfd8e6a07d60e2421045a0f9d729cc9c26899c
    Partial-Bug: #1326034
    (cherry picked from commit 6e38374e16276619161f7bddd185155493c5d908)

commit e45a35b6272266f2f7454947660f7dded1b55118
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Mar 26 11:08:15 2014 -0700

    Release 3.1.0

    Updated Modulefile and README.md for 3.1.0 release.

    Change-Id: I4bcdc495adc27dc683cc1025a36fc4483108117a

commit f76359f1b9b6ac606639e50db3f165bfa2c4f25e
Merge: 8c02b2a 4914bac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 26 15:07:09 2014 +0000

    Merge "Explicitly set default notifier strategy" into stable/havana

commit 8c02b2adcc4b93f125e35bcb71a1388b6e43ed80
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 16:06:52 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: Ib36f65ae8ef03329d407929973dba2db1156cf74

commit 4914bacb63747ced4268ad16e0b1175371c34489
Author: uberj <jaxbr503@gmail.com>
Date:   Thu Mar 20 15:24:40 2014 -0700

    Explicitly set default notifier strategy

    Havana claims to set this to the default, but in reality it does not.
    The default is actually set to qpid because oslo.config automatically
    looks for default options in /usr/share/glance/glance-api-dist.conf,
    which in turn sets `notifier_strategy = qpid`.

    Later version of oslo.config seem to have fixed this behavior and do not
    load *-dist* config files.

    Though this patch exposes a $notifier_strategy parameter to the
    glance::api class, including glance::notify::{rabbit,qpid} to set the
    correct notifier strategy should still be the prescribed way to override
    the 'noop' behavior.

    Change-Id: Ic2c67da463e7053a98042d9cba099aa857913ee7

commit 32b9729b60bebf8cdd298848c8e405c8c9f3db27
Merge: cfd310c 2aa8b83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 20 22:27:31 2014 +0000

    Merge "set ssl options for glance-api" into stable/havana

commit cfd310c509a3febb2d7481d9392868ad3860602a
Author: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date:   Fri Mar 7 10:33:41 2014 +0100

    set ssl options for glance-registry

    lets you set the ssl cert, key, ca for secure registry
    connection.

    Conflicts in manifests/registry.pp solved

    Change-Id: Ic0ab88ef14ea61fd42b2bc1811ca1b5a4180b4a4
    backport: havana
    (cherry picked from commit 5182c5cd782e408192932a30ac03a21676ba7ba2)

commit 2aa8b83841285d34671ba130d1dd7aea52658ff8
Author: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date:   Fri Mar 7 10:09:41 2014 +0100

    set ssl options for glance-api

    lets you set the ssl cert, key, ca for secure api
    connection.

    Conflicts in manifests/api.pp solved.

    Change-Id: Ie82a46eeca27897363273aab5e58fcf6f6fe1ae0
    backport: havana
    (cherry picked from commit e866507782dfc8c279f230a0b5223dd121a76277)

commit 91f0286fe9361b04094646884182610ef0922c70
Author: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date:   Thu Mar 6 16:12:51 2014 +0100

    add parameter for endpoint protocols

    This gives the ability to specify https endpoint for
    internal and/or admin endpoints.

    Change-Id: I1f7d96693a5bc2140041658e77cc7920f9577eac
    backport: havana
    (cherry picked from commit 833c3845a28a169399bafe0c8dd4c492da993b7d)

commit 001f1b6a8ef6bd0fde8fbe0a4b3362f31e6bbcda
Merge: 11c2c91 819704f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 28 10:14:02 2014 +0000

    Merge "Use remove_warnings from puppet-keystone" into stable/havana

commit 11c2c91fb192ce0811f8fffa5219f0d104b172f2
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Thu Feb 20 13:31:58 2014 +0100

    Add log_dir param. by default and allow users to disable it

      * add log_dir param (and configure it to /var/log/glance) by default.
      * fix log_file missing setting on glance::registry
      * allow users to disable log_dir and log_file with « false » argument.

    Closes-bug: #1282296
    (cherry picked from commit 1d5a298f4110842d71860c8f9fda722914dbba73)
    Change-Id: I0689fa15199e69cf16ff306050776d150365a09c

commit ba2a8242d714aa43d55af4ec42c4c2418a4971e9
Merge: 85c2ed2 a01b962
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 21 01:10:05 2014 +0000

    Merge "Add availability to configure show_image_direct_url" into stable/havana

commit 819704f7680dc05a9fc92c33b575ae6c2d64e095
Author: Martin Magr <mmagr@redhat.com>
Date:   Thu Jan 23 16:37:40 2014 +0100

    Use remove_warnings from puppet-keystone

    Glance client is getting the same warnings as Keystone client,
    hence puppet-glance should use the same hack as puppet-keystone
    until providers will be refactored to use API calls instead.

    See https://bugzilla.redhat.com/show_bug.cgi?id=1043725 for more details

    Change-Id: I99e4308d0731307c019ad6cab8db5feee1b0ed73
    (cherry picked from commit 9bc8d08681d6fdf1bbe682625ea9500118f21e3b)

commit 85c2ed2b11a776edf4c07ba0b77d462a7a86e373
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Tue Feb 18 13:59:25 2014 +0100

    Havana: Fixtures: fix keystone branch name

    Solve issue: « fatal: ambiguous argument 'stable/havana': unknown
    revision or path not in the working tree. »

    Change-Id: I10c7442fa8b322b5f78cdf7b8033205df95089ca

commit a01b96292e2a3255669687fd28abd6eea483288c
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Tue Jan 28 19:28:46 2014 +0100

    Add availability to configure show_image_direct_url

    This commit:
      - Add the show_image_direct_url parameter (default to false)
      - Fix spelling errors in documentation
      - Fix documentation format (use puppetdoc)
      - Add missing documentation about params

    (cherry picked from commit 715216c3dc313243ff566e380758cd495950988f)
    Change-Id: I8e5cb36c19ffa4ae726642a55d8fab5c6cea07b5
    Co-Authored-By: Emilien Macchi <emilien.macchi@enovance.com>

commit 6d244896ec23efee70e06ad9cc6ef11ad94b38fc
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Jan 9 13:59:34 2014 -0800

    Release 3.0.0

    Updated Modulefile for release 3.0.0

    Change-Id: I2a432aa0d7e5db32eece0a97d6a29985df64cb32

commit c722bb3d39fe6c3bcf0bd7d42d5fb7e95af487a3
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Dec 20 10:53:25 2013 -0800

    Update for 3.0.0-rc2

    Updated Modulefile changelog for release candidate 2.

    Change-Id: I9258936199f923bee6d42420bb65fee837d9e8d9

commit fa19dfb6b65125a6ded01d3eaecab7394dfdf2c8
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Thu Nov 28 18:21:05 2013 +0100

    Add Cinder backend to image store

    Cinder is an potiential backend in Glance.
    This patchs aims to:
    - create glance::backend::cinder
    - improve spec_helper using shared_examples

    Change-Id: I15e5de8281ff2e60465fedda97d9c9ccf808386c
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
    (cherry picked from commit eb7c33bb1f04acde5e55cfee37fa900af0f3bf5f)

commit 5557c224f37c22b058c951d7494448981cb484a2
Author: Flavio Percoco <flaper87@gmail.com>
Date:   Wed Nov 13 14:02:14 2013 +0100

    Replace qpid_host with qpid_hostname

    This patch replaces `qpid_host` with `qpid_hostname` in both the
    qpid manifest and the spec file class. `qpid_host` has been shipped
    as the parameter to specify qpid's hostname, although the correct one is
    `qpid_hostname`.

    Closes-bug 1242715

    Change-Id: I92b8da5a204180316f8117634a45154023551abd

commit 4bbaca5db97c9c5a3b3053112ad01a92d2a8d598
Author: Flavio Percoco <flaper87@gmail.com>
Date:   Wed Nov 13 14:02:14 2013 +0100

    Replace qpid_host with qpid_hostname

    This patch replaces `qpid_host` with `qpid_hostname` in both the
    qpid manifest and the spec file class. `qpid_host` has been shipped
    as the parameter to specify qpid's hostname, although the correct one is
    `qpid_hostname`.

    Closes-bug 1242715

    (cherry picked from commit 8eee78c69d6e29aa1151bf80e69d420bf9fbb838)

    Conflicts:
    	manifests/notify/qpid.pp

    Change-Id: I6fe9f97b60cb155eca8a35ea65f8eac6a6c08f4d

commit 36c31f52f60a9259912e916ab8fddada22efdbc4
Author: Flavio Percoco <flaper87@gmail.com>
Date:   Tue Nov 19 11:25:52 2013 +0100

    Set default to stable/havana in .gitreview

    Change-Id: I76e723d95d08a81f190505495889d07b251ebbef

commit 3c0558188a0673018f5856d1aec4e88b1cc0a2e9
Author: Rob Crittenden <rcritten@redhat.com>
Date:   Thu Nov 14 15:03:20 2013 -0500

    Add parameter qpid_protocol to notify::qpid so ssl can be enabled.

    Bug: #1251050
    Change-Id: Ibc3b5e19b2543ff33366f305e7b9cef61dddf2f1

commit e500d20ce818f139f321dec6472e657e62925907
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Nov 14 11:25:51 2013 -0800

    Preparing for 3.0.0 Havana release

    Updated version and dependencies in Modulefile.
    Updated fixtures to use stable/havana branch.
    Updated release notes in README.md

    Change-Id: I47c40017ea7db9f75ff7780fb1f82aedd03a74f6
Update horizon to stable/icehouse

commit 3f8cb83207c398b9870d74693b825573bccffa20
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Mar 26 11:21:00 2014 -0700

    Release 3.1.0

    Updated Modulefile and README.md for 3.1.0 release.

    Change-Id: I6732d73b88c10e782db1d982b46dbf18e55563a2

commit 6c719fdf44a4bba5552fb9a1dcf6f93ac41cfc68
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 16:09:33 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: I55f10d8dbb946183f8350980ca8be134f245fcab

commit 2d97fbda832c483800d413298929e9a1f73d32b7
Author: Mark T. Voelker <mvoelker@cisco.com>
Date:   Thu Feb 13 23:38:05 2014 -0500

    Parameterize OPENSTACK_NEUTRON_NETWORK settings

    Horizon can provide GUI support for Neutron's LBaaS, FWaaS, VPNaas,
    and other services. However the settings to enable these is currently
    hardcoded in the local_settings.py.erb template rather than being
    parameterized, making it impossible for users to enable support for
    these functions.  This patch adds a parameter hash to enable users to
    select how they want to configure Neutron services and sets default
    values to match the old hardcoded settings to maintain backward
    compatibility.

    Conflicts:
    	manifests/init.pp
    	spec/classes/horizon_init_spec.rb

    Change-Id: Ibfa75a83a88d9bb26d65c026c7f913e000bce13f
    Closes-Bug: #1274382
    (cherry picked from commit e2c0e7543a3e73013101fc34567a1850367538b1)

commit 7da46cc6b0a1eff40350cded9f1351f04d40c963
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Feb 14 16:12:11 2014 -0800

    Release 3.0.1

    Bugfix release for Ubuntu

    Change-Id: Id3e9199e2566d53264eae4f34c90d90ff0d55a99

commit 460e8c3680cc5c367323090d5ed457f651a02f6b
Author: Kevin Benton <blak111@gmail.com>
Date:   Fri Jan 24 09:41:42 2014 -0800

    Adds COMPRESS_OFFLINE option to local_settings

    The Ubuntu Havana packages includes pre-compressed
    assets and does not install a package that provides
    lesscpy.

    This re-adds COMPRESS_OFFLINE=True to utilize this
    and avoid a broken Horizon install on Ubuntu.

    Change-Id: I6671938a87744a4dd0b84021ca87cd49aea10741
    Closes-Bug: #1272441

commit dce9fdf10ad4883e8f7dd5d4fafdd56df71db98c
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Jan 16 15:02:19 2014 -0800

    Release 3.0.0

    Updated modulefile for release 3.0.0

    Change-Id: I13615881d12378d766dfb7726f4004ba18cbdd3f

commit 1383af3e837e76e3f23107ec30ce7603eb1709fe
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Jan 9 14:04:55 2014 -0800

    Release 3.0.0-rc3

    Updated Modulefile for release 3.0.0-rc3

    Change-Id: I880424118e845491db6af2d068970addbd65706a

commit 39dc4df51df2c8b13494505481811f28ff903cd9
Merge: 47ad268 b8a0564
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 8 08:40:31 2014 +0000

    Merge "Introduce keystone_url parameter" into stable/havana

commit 47ad2683cf7bebe98a8d19b42bb4b852355d8859
Merge: 6f5f602 65e43be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 8 08:40:00 2014 +0000

    Merge "horizon replaced nodejs by a python alternative" into stable/havana

commit 6f5f60220eae15bc537fd73a896eaf57920e07bd
Merge: ad9117d 934a987
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 7 23:45:02 2014 +0000

    Merge "Fix user/group for debian operating system" into stable/havana

commit b8a0564356be03aa74cf7b2b0bac9be9e3ecdb24
Author: François Charlier <francois.charlier@enovance.com>
Date:   Tue Dec 10 18:02:48 2013 +0100

    Introduce keystone_url parameter

    This parameter deprecates keystone_host, keystone_port & keystone_scheme
    and allows to pass a complete url.

    Implements blueprint serve-keystone-from-wsgi

    Change-Id: Ia8aa6e6377abf0e84427174fb946f4efa5defa12
    (cherry picked from commit 314df2136eb54ac95d0716d00f20265c5c439494)

commit ad9117d55d2818c26ba40b4f94c9eeb4e0c8d973
Merge: 4684099 72e3088
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 7 16:47:32 2014 +0000

    Merge "Added support for parametrized help_url path." into stable/havana

commit 46840997e9774f90819287a24821e9c0e076be2a
Merge: 07a2a0b 9090be0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 7 16:46:55 2014 +0000

    Merge "Adding endpoint type parameters" into stable/havana

commit 65e43bef539b25ece4e920af5466e68101dff870
Author: Gonéri Le Bouder <goneri.lebouder@enovance.com>
Date:   Thu Dec 19 16:15:00 2013 +0100

    horizon replaced nodejs by a python alternative

    since commit a0739c9423a4c559b45af96fa4cdb30539dcdbd7 and the Havana
    release, horizon uses a pure Python alternative to nodejs.

    Horizon changed the way to use the compress utility, the option
    offline_compress is no longer available.
    Thanks to Maxime Vidori for the information.

    Change-Id: Ie290701b00c97352838e13182b940a6de46a591f
    (cherry picked from commit fae0d04b82867dab3c355e5f1d5a9b2d0054f949)

commit 934a987751e32045b866f3df8a5e3c0bcd216df2
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Mon Dec 23 18:34:49 2013 +0100

    Fix user/group for debian operating system

    The commit 46c48eda06c4ac3e3b303c5099f49e59da5006a8 fixes the problem
    on ubuntu but it introduces a regression on debian.
    Please see #1224770/comments/5

    Change-Id: Id2764a840c04035443fef06719d31125ba34165c
    Closes-bug: #1224770
    (cherry picked from commit e6c0c9aa4b396655e2aa1663c07be7b00b652d57)

commit 07a2a0b0ef1f5cc3c2a50e7bd29da84a7e963ef2
Author: François Charlier <francois.charlier@enovance.com>
Date:   Fri Dec 13 12:16:44 2013 +0100

    Change keystone_default_role to _member_

    Previously both Member & _member_ roles were created, which lead to
    confision.
    Member role is not created anymore as of [1].

    [1] https://review.openstack.org/#q,If4ed1c2c72ca67acad7b70651e68ff7ce68157dd,n,z

    Change-Id: I933236c2c257b65a1027da07a760c8b4d10618cc
    (cherry picked from commit 45a60830d80172814d3b44c26d26566d922f0b2d)

commit 9090be09954f9d9aa73fcca94e862cce7421d71f
Author: Doug Schaapveld <djschaap@gmail.com>
Date:   Mon Nov 25 14:21:46 2013 -0600

    Adding endpoint type parameters

    Creating openstack_endpoint_type and secondary_endpoint_type.

    Change-Id: Ibba15ece974bd668c7d3bdb2b6e427a27fc39965
    (cherry picked from commit d88624eb902ad27aef177e197522ac1c395b8c2f)

commit 72e308872ad5e1b77cf6bae0cb1b9ebcacf56477
Author: Francesco Vollero <fvollero@redhat.com>
Date:   Wed Dec 4 16:47:25 2013 +0100

    Added support for parametrized help_url path.

    This should close: bz#1030398

    Change-Id: I3522c446f9a3c2981db0f03b8080fdfa68ea958b
    (cherry picked from commit 17ba6a73cec7f386922e6a914a120a829e225efc)

commit 54b6ac778efec1966b5b6193e377ef8dbba81397
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Fri Dec 20 11:11:52 2013 -0800

    Update for 3.0.0-rc2

    Updated .gitreview to point to stable/havana. Updated Modulefile
    for release candidate.

    Change-Id: Ia844a891da63775e958223b15c8453c80a0b3d3d

commit 17ba6a73cec7f386922e6a914a120a829e225efc
Author: Francesco Vollero <fvollero@redhat.com>
Date:   Wed Dec 4 16:47:25 2013 +0100

    Added support for parametrized help_url path.

    This should close: bz#1030398

    Change-Id: I3522c446f9a3c2981db0f03b8080fdfa68ea958b

commit aea8538c370b4bacc6d117f572fd6af74d05d48d
Author: Ben Nemec <bnemec@redhat.com>
Date:   Fri Nov 8 18:17:21 2013 +0000

    Fix readme typos

    A couple of the links in the readme are broken.  This fixes the
    ones that I noticed.  Also fixes a typo in the release notes.

    Change-Id: I244a187593dff11d554c2c8d86b0a531259a433f
    (cherry picked from commit 36f942e8bfb69e59165e7a5ed03b16183add80b8)

commit 34219610f8050e934e5f50b90a5b3047a9cb503a
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Nov 14 11:34:07 2013 -0800

    Preparing for 3.0.0 Havana release

    Updated Modulefile version.
    Updated README.md release notes.

    Change-Id: I7779538be1db2391c62903fada27128af17fd908

commit 36f942e8bfb69e59165e7a5ed03b16183add80b8
Author: Ben Nemec <bnemec@redhat.com>
Date:   Fri Nov 8 18:17:21 2013 +0000

    Fix readme typos

    A couple of the links in the readme are broken.  This fixes the
    ones that I noticed.  Also fixes a typo in the release notes.

    Change-Id: I244a187593dff11d554c2c8d86b0a531259a433f
Update neutron to stable/icehouse

commit 16682d963580397fa526be4ba296f9e1a62c08eb
Author: Clayton O'Neill <clayton@oneill.net>
Date:   Fri Jun 20 07:57:18 2014 -0400

    Normalize Gemfile & pin tests to rspec < 2.99

    Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
    This is to avoid warnings due to deprecated matchers in the
    rspec-puppet gem.

    This change is also intended to normalize the Gemfile for all stackforge
    puppet modules.  This should facilitate pinning gem versions when
    releasing new stable branches, since the same diff can be used for all
    repos.

    Conflicts:
      Gemfile

    Change-Id: Id8595fc2fd8b4e4bec4ba60d85696983fb632a18
    Partial-Bug: #1326034
    (cherry picked from commit 33798065544f3e23508c12d8a3bda1db09980ba3)

commit c21db12f579ace1cea5727b37af64f4534f48064
Author: Lukas Bezdicka <lbezdick@redhat.com>
Date:   Thu Apr 17 15:48:40 2014 +0200

    Fix neutron subnets with empty values.

    Subnet was expended with ability to set and update parameters like
    specifing dns servers, allocation pools and also specific host routes.
    Sadly it introduced issue when calling neutron_subnet without specifying
    values for these parameters.
    Closes-Bug: #1312628

    Change-Id: Id1207ab793fc65c43c10afcfe2271e2c02a912d3
    (cherry picked from commit 78428c844f73bf585a8f8a3bdf615ba2a0e8983b)

commit 9957ca10282e40a0584a3c12f02d5b41a54c6929
Merge: 209ee42 f33cef4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 16 22:58:31 2014 +0000

    Merge "Introduce neutron:config to manage neutron configuration" into stable/havana

commit 209ee420e305f9484705ae4332b76117f1a77bee
Merge: d842908 688fbb1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 18 18:17:12 2014 +0000

    Merge "Isolated network support" into stable/havana

commit 688fbb13581c9d3fd24a6d34082ab812449777de
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Tue Dec 24 18:32:06 2013 +0100

    Isolated network support

    This patch aims to enable support for both:
    - isolated metadata which enable metadata support on isolated networks.
    - metadata networks which allows for serving metadata requests coming
      from a dedicated metadata access network

    Conflicts:
    	manifests/agents/dhcp.pp
    	spec/classes/neutron_agents_dhcp_spec.rb

    Change-Id: I0e892c4183bd2bf1910b9b6758c1759475053529
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
    (cherry picked from commit 8654569fb4c53f8648578f8485fad80e3fe69e52)

commit d8429080f2523679628ba4df9e01448000587573
Author: Clayton O'Neill <clayton@oneill.net>
Date:   Wed Jun 11 22:28:08 2014 -0400

    Pin neutron gem versions for stable branch

    This intends to pin all the major gems to the version they were during
    development cycle.  This should isolate the existing tests from changes in
    rspec, etc.

    Partial-Bug: 1326034
    Change-Id: I17ffd9255de6e04d0b036fa9466bf59171b1a762

commit f33cef4f074daaaf37f7494e45a2017ab6e1a4c3
Author: Xingchao Yu <xingchao@unitedstack.com>
Date:   Thu Apr 3 09:56:18 2014 +0800

    Introduce neutron:config to manage neutron configuration

    This neutron::config is aim to use all types of neutron
    config resources to manage custom configurations in all
    neutron config files.
    This will make end user easy to add their own custom options
    in Hiera data.

    Fully implements blueprint neutron-custom-config

    (cherry-picked from e420021699f5fd0b5b13cbf8b070070ba8e03b9b)
    Change-Id: I2a6b79a48f011c84a8b73467c9bf813741f6e898

commit 2162d951b2db19945a590a8af0e01625f6e7c012
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Tue Apr 15 14:21:27 2014 -0700

    Release 3.3.0

    Feature and bug fix release.

    Change-Id: Ibb710bf312e1fbb114e182b92690118628b0571f

commit 307aa01779020f930057aea23f810f8a2ca87f85
Merge: 7ec1575 8009169
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 11 22:39:55 2014 +0000

    Merge "Fixed vpnaas agent for RedHat systems" into stable/havana

commit 7ec15752fd1b45c5520da3e2cde900210a324dfc
Merge: 14b90d5 5fa0f5b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 10 22:46:04 2014 +0000

    Merge "Add neutron_port resource" into stable/havana

commit 8009169827a6ea520208359bd4a96def616f3833
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Thu Apr 10 10:30:59 2014 -0700

    Fixed vpnaas agent for RedHat systems

    The package vpnaas package was not installed by default for RedHat
    systems, and the service had the incorrect name. This patch
    installs the package and sets the correct service name.

    Backport to stable/havana

    Change-Id: Id54dfbcb918d7d9ba110eb238858162c5cc0380e
    (cherry picked from commit f3f723277d5c73d46890ce6872fbeeb11a5c2797)

commit 14b90d5b6108c69c53922bd39fc1cc76870ee7cc
Author: Pradeep Kilambi <pkilambi@cisco.com>
Date:   Fri Apr 4 13:34:47 2014 -0400

    Include external network bridge for vpn agent

    fix to make external network bridge configurable
    in the vpn_agent.ini config file. Defaults to
    nil.

    Change-Id: Iddb6ff6296b8f2d42d97fdcb36a9819a4a995034
    (cherry-picked from 3356503ea42ca9929ae53cf5a2874f0341724236)

commit 5fa0f5b9f45bb5702a4da8199c089ef4f7a6d7a5
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Tue Mar 25 01:07:48 2014 -0700

    Add neutron_port resource

    This resource is required to add more than a single router interface to
    a neutron network or subnet. By default, using
    `neutron_router_interface` to add a second router to a subnet without
    first creating a port for it will cause IP conflicts.

    This resource can be used to first retreive a non-conflicting ip on a
    target network or subnet, then create a `neutron_router_interface` with
    the port.

    Eg:
    ```
    neutron_router { $tenant:
      tenant_name          => $tenant,
      gateway_network_name => 'public',
      require              => [
        Neutron_network['private'],
        Neutron_subnet[$private_subnet],
      ],
    } ->
    neutron_port { "${tenant}_private":
      ensure       => present,
      network_name => 'private',
      subnet_name  => $private_subnet,
    } ->
    neutron_router_interface  { "${tenant}:${private_subnet}":
      ensure => present,
      port   => ${tenant}_private",
    }
    ```

    (cherry picked from commit 58d07a78c8d30f207c582e42a84a0a3660f738ac)

    Change-Id: Ifdec5dce4576d51c6c95261469a4565807a34040

commit cb95f9401ca5647dff673733b19c7b041730e25f
Author: Pradeep Kilambi <pkilambi@cisco.com>
Date:   Thu Apr 3 15:18:48 2014 -0400

    Include interface driver for vpn agent

    Fix to include interface driver in the vpn_agent.ini
    config file. Defaults to ovs interface driver.

    Change-Id: I1b57817b79627878eac6fcb4cedaad835bdf98c1
    Closes-Bug: #1301418
Update nova to stable/icehouse

commit 6b6445e0e7c3f717150bfd5a8c0a1314fbbaf289
Author: Michael Chapman <woppin@gmail.com>
Date:   Fri Feb 28 22:35:35 2014 +1100

    Fix file location for nova compute rbd secret

    The rbd secret location was mixed between /etc/nova
    and /etc/ceph. This patch changes the secret to
    be in /etc/nova for both the file and exec
    resources so that virsh secrets are set correctly

    Change-Id: I50f0324d911f20d5a072c769edcf289ae59f817a
    (cherry picked from commit aad7a0a7cbb2770d4d1f668c1b8fe871cd7d7205)

commit b50779cf607e9012da55f5f7c098083a8f2a3358
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Mon Mar 10 21:46:17 2014 -0400

    Introduce nova::config + Update nova::config example description.

    Add a new class nova::config which allows the creation and
    management of arbitrary nova_config and nova_api_paste_ini resources.

    This will add the ability for the end user to use Hiera to manage
    those resources.

    The original example in nova::config is syntax invalid.
    Besides fixing that, this patch also gives an example in yaml format.

    (cherry-picked from 40188356 and 133d5da1 in master)
    Change-Id: Iad7a2b764884887a75f5f6db3e1660644e07c5c0
    Closes-bug: #1290634

commit a9b47b07c076fccc35d847bcb39a7f4321c77de1
Author: Clayton O'Neill <clayton@oneill.net>
Date:   Fri Jun 20 07:57:42 2014 -0400

    Normalize Gemfile & pin tests to rspec < 2.99

    Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
    This is to avoid warnings due to deprecated matchers in the
    rspec-puppet gem.

    This change is also intended to normalize the Gemfile for all stackforge
    puppet modules.  This should facilitate pinning gem versions when
    releasing new stable branches, since the same diff can be used for all
    repos.

    Conflicts:
      Gemfile

    Change-Id: I65bade1443395ce99e69c4704d3e1d85e851b9bb
    Partial-Bug: #1326034
    (cherry picked from commit d691bf7e65bb34ef8eb10d1c636f0d6d221aa9dd)

commit 9f098b6f542d085e8f585202ce87d488587c0ecb
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Tue Apr 15 14:24:38 2014 -0700

    Release 3.2.1

    Bug fix release 3.2.1

    Change-Id: I481c4c9bcfa7edd5b4650d624dc58e9a1deb602f

commit b7811392062b649572f470f5f3ddca1882997210
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Mon Feb 10 19:47:37 2014 +0100

    Fix consoleauth/spice duplicates on RH (#1278452)

    On RedHat, consoleauth and spicehtml5proxy packages has the same name
    (« openstack-nova-console »), so we have a duplicate resource (see: #1278452).
    In this context we can't use ensure_package of stdlib because we loose
    notify/names attributes.)

    Closes-bug: #1278452

    Change-Id: I0141ca0233aead072a06796759d211cf1b6dc657
    (cherry picked from commit 31a282a883ca8d2450195829d4e995ece699a6a7)

commit b903cedfaf3f42c7f2f7ec564807d76b44b1332e
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Wed Mar 26 11:54:42 2014 -0700

    Release 3.2.0

    Updated Modulefile and README.md for 3.2.0 release.

    Change-Id: Ic1be6d1227236ece62adc148b7a1cd83a1b14bac

commit 59a8a7ec325d81075a702cb18db1d8a25d295b08
Merge: 6026d11 d0ae14c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 25 00:28:27 2014 +0000

    Merge "Add ability to disable installation of nova utilities" into stable/havana

commit 6026d1137734da3787fa5907d0d3c5a38e8fb040
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 16:11:09 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: I841864dc1c84249f2989d81a7f5fd909a3dab6b6

commit d0ae14cf8ca7db98482be90328b88d89c232329b
Author: Mathieu Gagné <mgagne@iweb.com>
Date:   Mon Feb 17 22:37:22 2014 -0500

    Add ability to disable installation of nova utilities

    Install them by default, preserving previous behavior.

    Conflicts:
    	manifests/init.pp
    	spec/classes/nova_init_spec.rb

    Change-Id: I01ab67330b4a66f0af44a0c83c81dc9601cf57b5
    Closes-bug: #1281392
    (cherry picked from commit d39d4c42f17958e7973ebf9c757a4553799d9795)

commit 90dde44bada00784fdd5d4897aeebfa63957603b
Author: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date:   Thu Mar 6 17:12:52 2014 +0100

    add parameter for endpoint protocols

    This gives the ability to specify https endpoint for
    internal and/or admin endpoints.

    Minor changes to solve conflicts in manifests/keystone/auth.pp

    (cherry picked from commit 50f0716b67635aa658f4a3b2ef3b720b0ef9c9ab)

    Change-Id: I5f936593f83ce8f00338709e5864f7d00f9d0d8c

commit 7f92da6e5897f7facc8d0b6505f129d77353439e
Merge: 18f55e7 49d1694
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 6 03:10:47 2014 +0000

    Merge "compute: RBD backend support" into stable/havana

commit 18f55e73e12e40368df2f793d2f99359a0d63cea
Author: Mark T. Voelker <mvoelker@cisco.com>
Date:   Tue Feb 25 01:05:29 2014 -0500

    Parameterize disk_cachemodes

    The current manifests don't expose a way for end users to set
    the disk_cachemodes directive in nova.conf, which can be useful
    for improving disk performance.  This patch adds a parameter
    allowing users to specify a list of values to be written in
    to the disk_cachemodes setting.  The default value is an empty
    list, which will cause the disk_cachemodes setting to be removed
    entirely from nova.conf (thus matching the Nova default and
    current behavior).

    This patch is based on 0a5d6568f070d193b604513f194c966cc224a86b
    but is slightly modified to account for a change in how the
    nova.conf file is organized between Havana and Icehouse
    (some libvirt params were moved from the [DEFAULT] section
    to the new [libvirt] section in Icehouse).

    Change-Id: I9173ef79e4e573515f290734535907794dda7dbf
    (cherry picked from commit 0a5d6568f070d193b604513f194c966cc224a86b)

commit c1f246cfee7bb1fb89b3890891e5c54111f8833b
Author: Mark T. Voelker <mvoelker@cisco.com>
Date:   Sun Feb 23 22:38:41 2014 -0500

    Parameterize cpu_mode

    The libvirt cpu_mode setting in nova.conf currently isn't exposed
    via the compute::libvirt class, but can be very useful in nested
    virtualization situations (as are common in development labs).
    The nova default value for the cpu_type parameter if left unspecified
    is dependent on the value of the virt_type setting, and both
    the virt_type and cpu_mode settings exist within the [libvirt]
    section of nova.conf.  This patch adds a parameter allowing users
    to set cpu_type with appropriate defaults based on the value
    of the libvirt_virt_type parameter.

    Based on Change-Id: I0136f15621f616787aba1bbcbf68208bc8f9a1b1 but
    not a clean cherry-pick due to a change in the way nova.conf
    is organized between Havana and Icehouse.

    Change-Id: I0136f15621f616787aba1bbcbf68208bc8f9a1b1

commit 49d16945dd01ba5fea8b2ca72d3e2df552ecdc78
Author: Emilien Macchi <emilien.macchi@enovance.com>
Date:   Mon Feb 10 19:14:31 2014 +0100

    compute: RBD backend support

    Since Havana, Nova is able to store VMs on RBD backend (ceph).

    Change-Id: I17890a3e9e49572d989ad01383417b7256ef7e14
    Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
    (cherry picked from commit 076d415ba560206ef1299b090c4eb474ffc2bdc4)
Update openstack to stable/icehouse

commit 8a3e0d5696bcd7c68d5bf321ff2c9e62c0a6e534
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 16:13:38 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: Ib73f7921171871d37e7753f87ba5bc7dcbed5b8b

commit e6bd33949f13e9199ab413c4b8b0ba0bbffe516c
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
    (cherry picked from commit 472253cbe29b1375b33d91ae13b561dcdc7fa2d6)

commit 8cacc3bdab3fc54c0abe65699d018fac36ff8048
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
    (cherry picked from commit 0cbddbcea0f3c9932863695d731f079fdd2b1be2)

commit 4f65842f95ece8d0dd354bcf014b84a17aad2050
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Tue Feb 18 14:13:47 2014 +0100

    Havana: Fixtures: fix keystone branch name

    Solve issue: « fatal: ambiguous argument 'stable/havana': unknown
    revision or path not in the working tree. »

    Change-Id: Ic5dd26dd3f41a0a022561eb95a3fbaf7ec03f0d8

commit 8130d66e957bf50b2eca276d8eafbb06e426190a
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
    (cherry picked from commit 388d47bd9b58bc2259de86dfc9c23f6f3bf60583)

commit 2739f251fe0f7987a415c8890a29c07d8915fb8e
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
    (cherry picked from commit 1bd3442a946f81101ff60dc45ba996fa3d5bb4e2)

commit f61fd7337fcfecccb51d8a54010743a46d91637b
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.

    Closes-Bug: #1275746
    (cherry picked from commit eec8af5a745a28db1bcccb51f5cff22ef88dee42)

    Change-Id: I2bd462c03d81caa493410e8c7ae583aa71416993

commit 65e776e97f0dda743d9d4b1ec45511ab25e05c27
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Thu Jan 23 11:41:36 2014 -0800

    Pointing openstack modules to stable/havana.

    Puppetfile was referencing master as opposed to
    stable/havana.

    Change-Id: I127072ebfcfdcdecd094ac29845e6b0b50a48d07

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 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 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 b78839e7183ee2b3e7b1bde876ac52e001e82847
Merge: 0f053d6 4d1d56e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 30 00:53:37 2013 +0000

    Merge "Prevent dollar signs and single quotes in variables from being removed by shell"

commit 0f053d68bc39f828837d49c490a38248a277cad5
Author: Michael Chapman <michchap@cisco.com>
Date:   Fri Oct 25 12:18:01 2013 +1100

    Add support for alternate images

    Tempest runs can utilise two distinct images in glance.
    This patch adds the option for a user to specify
    a second name to be used with the current image_source, or
    a second name in addition to a second image_source_alt.

    Change-Id: I8b7d3b77f07d39ee5944e00b47e7ab1af67f7be7

commit 4d1d56e7bbaca893308e25aa7179bf3fc646b5ee
Author: Konrad Scherer <kmscherer@gmail.com>
Date:   Fri Oct 11 18:48:18 2013 -0400

    Prevent dollar signs and single quotes in variables from being removed by shell

    Change-Id: I88782bd60755f96816bf9d06cd57298cb46f8e40
Update swift to stable/icehouse

commit 033a8bedf60f4e4942ece42bb71679f2ffcb3f95
Author: David Moreau Simard <dmsimard@iweb.com>
Date:   Wed May 28 17:28:27 2014 -0400

    Include swift::params in swift::client

    Otherwise swift::client can't fetch the name of the package by itself
    if swift::params doesn't happen to be in the catalog.

    Change-Id: I3d15d0ce68ca084eb4573764b05e8723befbd7e7
    (cherry picked from commit 2c6261251cd8e94aa26c0e91003878c25ba90726)

commit c09b978c89b150f21ffec5dfc743216be8896d37
Author: Sebastien Badia <sebastien.badia@enovance.com>
Date:   Wed Mar 5 23:57:26 2014 +0100

    Add client_package_ensure parameter and swift::client class

    In the actual state of the manifest we can only setup package_ensure to
    absent|present|latest. This commit allow end users to pin swift* and
    swift-client to a specific version. (note that swift* and
    python-swiftclient version are not the same).

    A new class (swift::client) manage now client packages, and we keep the
    retro-compatibility of commit 020b7723cbbe75fbcae89514a1e1882ae807fb27.

    Change-Id: I9bcc5a0f9d0a93a812fb574c4571fb9584077e4a
    (cherry picked from commit 21f9eff35c91b987803a9241f867b4443def6979)

commit 98fe9219e35c65cf3db75bf79b9d12cead61f475
Author: Mark T. Voelker <mvoelker@cisco.com>
Date:   Fri Mar 7 02:49:30 2014 -0500

    Fix spurious warning in pipeline check

    The storage::server class includes a bit of logic that checks
    the pipeline and warns if ${type}-server isn't included.
    However, the check has a logic flaw such that if $pipeline is an
    array and contains ${type}-server, the warning is triggered
    anyway.  This patch corrects the bad logic so that the warning
    isn't triggered spuriously.

    Change-Id: I7f81598f2f7910a2175fe772c9d82b2a1067826c
    Closes-Bug: #1289187
    (cherry picked from commit 01a3a40bcc43ffd492bea87e9b7b143bedccec37)

commit 61c46b82dba0cbd9b7ccd730b6c87dc6041cf743
Author: Chris Hoge <chris.hoge@puppetlabs.com>
Date:   Mon Mar 24 16:14:26 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: I657d0ca1bc9cf9edfaaf9d1393eecc54ac4e196e

commit 9b60581a1c8fd2c1a98adafc1bcdc53796859e23
Author: Chris Ricker <chricker@cisco.com>
Date:   Wed Mar 5 08:55:57 2014 -0800

    swift classes need to include swift::params

    Some of the swift classes use parameterized settings defined in
    swift::params but do not include the swift::params class.

    Change-Id: I7704bf42db4554566d27b510bbbedb8afe0fe7b3
    Closes-Bug: #1288252
    (cherry picked from commit 2cce66ef44b011ba695dbc3e1586b2e0b8570666)

commit 3ea08e8c2d958b629d1b2a6f1a2e35e4eab6a2c1
Merge: 8a7c88d 03fc456
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 28 15:56:17 2014 +0000

    Merge "Fix deprecation warnings in inline templates" into stable/havana

commit 03fc456acc35f9ff5598ee97e3ee49ded785451d
Author: Mark T. Voelker <mvoelker@cisco.com>
Date:   Thu Feb 20 13:27:56 2014 -0500

    Fix deprecation warnings in inline templates

    The puppet-swift modules emit deprecation warnings of the form:

    Warning: Variable access via 'pipeline' is deprecated. Use
      '@pipeline' instead. template[inline]:2
       (at (erb):2:in `result')

    These are due to missing @ signs in inline ERB templates in
    storage/server.pp and proxy.pp.  This patch fixes them.

    Change-Id: I3745cfd86c4332f00bc10a0999088691b3833147
    Closes-Bug: #1282717
    (cherry picked from commit edd25ce6b30304705f9168e5c091fb2611d9cc7b)
Update tempest to stable/icehouse

commit 2cfece45a39cfea162111bea15f597e38ca04e98
Merge: d4c2567 48caa54
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 1 18:55:15 2014 +0000

    Merge "Allow passing image_ref, image_ref_alt, and network_gateway_id" into stable/havana

commit d4c2567e4e7142212ce413f1c6d448a008ef2101
Merge: af8eae2 9124543
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 1 18:54:50 2014 +0000

    Merge "Fix tempest_*_id_setter to query the RAL and cache" into stable/havana

commit 912454314659ecf595b9c64367443d772d4d8082
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Thu Apr 10 16:06:09 2014 -0700

    Fix tempest_*_id_setter to query the RAL and cache

    The tempest_glance_id_setter previously would query the catalog for the
    id of a glance_image resource with a given name. This doesn't work on a
    split-node openstack where tempest is not on the glance host. It would
    also fail horribly if glance-api.conf didn't exist.

    The tempest_neutron_id_setter previously would query the instances of
    neutron network IDs from the RAL once for every line in the tempest.conf
    file if the network did not exist (because the cache would be nil).

    Now they both query the RAL directly from the system, similar to how
    tempest_neutron_id_setter did it but using Puppet::Resource.indirection,
    but don't continue requerying for every line in the tempest.conf when
    the given resource title doesn't yet exist, and tempest_glance_id_setter
    raises a helpful error if the glance-api.conf file does not exist.

    Change-Id: Icdca2c1a5f449b3fcda68d43a34452cd119303cb
    (cherry picked from commit 5ef9dc94b4a395b6f60997aeed55f210acb25223)

commit af8eae2d813d9bee72df3bb02f1e2cb5ad5b891c
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Mon Apr 7 13:50:58 2014 -0700

    Allow configuring compute tenant isolation

    This configuration setting may be required for running tempest against
    an existing openstack cloud.

    Conflicts:
    	spec/classes/tempest_spec.rb

    Change-Id: I852ae3d3ab54714205c9a78fcee1506654b66efe
    (cherry picked from commit 0bdf6b88e157d86012f75059bd1f6fabf8a36a73)

commit 48caa54dce98fe21a88d2a1f5e26edca5b69190c
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Fri Mar 28 16:20:07 2014 -0700

    Allow passing image_ref, image_ref_alt, and network_gateway_id

    Incorrect logic prevented the passing of these values.

    Tests added for passing one, the other, and both pairs of each
    parameter.

    Conflicts:
    	spec/classes/tempest_spec.rb

    Change-Id: I7fe1e71f437a032f9a98c07214a1261a8001f7d8
    (cherry picked from commit 735278d40804bfcf71481df54c1d3bac04b0a7a4)

commit 8cc639c4a108e30bdf4c0ed81053bc3666d2de23
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Tue Apr 1 12:28:11 2014 -0700

    System need libffi-dev

    The system need libffi-devel to allow pip to install all dependencies on
    RedHat systems.

    Additionally, a requirement is required for development packages to be
    installed before creating the virtual env.

    Change-Id: I8597b4438f0ce9830a63337a4a8073765eb9615a
    Closes-Bug: 1286167
    (cherry picked from commit 62598ca7ee8a223ee9e68b10f43b0095503276b4)

commit 4f87b315f844d0663f61de1cca3c2a70a6aaf313
Merge: a44353b f6564b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 1 01:23:55 2014 +0000

    Merge "Allow configuring cli/cli_dir" into stable/havana

commit a44353bbabb7c8bfc72809c8fbcecc0896695949
Merge: 3351b2c a903254
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 1 01:22:12 2014 +0000

    Merge "System need libffi-dev" into stable/havana

commit 3351b2c39b326b7e6d8925ef9ae09c2fc83b2c3b
Merge: 3d2e8b2 d0525dc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 1 01:20:27 2014 +0000

    Merge "Add gitignore file" into stable/havana

commit f6564b85b16447ffdeb1cd0e293e70276f51479e
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Fri Mar 28 16:50:38 2014 -0700

    Allow configuring cli/cli_dir

    The default cli_dir is /usr/local/bin, but sometimes package install to
    /usr/bin. This patch allows it to be customized

    Change-Id: I0f6ec8e46224d039846bdd0b487d6fea0e819508
    (cherry picked from commit fc79e2fb091eefddca57986d0510a59a911ff316)

commit a90325470e102b4eaab5afde08905a4b9cce4884
Author: Pierre RAMBAUD <pierre.rambaud@numergy.com>
Date:   Fri Feb 28 16:21:23 2014 +0100

    System need libffi-dev

    The system need libffi-dev to allow pip to install
    all dependencies.

    Change-Id: Idc1a9cff79289b0ae391c4ab1ba4c3c483fb854a
    Closes-Bug: 1286167
    (cherry picked from commit 3b9066c54c14b59daca624fdb89f22a62fd1d8e8)

commit d0525dc318ff7bb2181d868ae5d7ce84d4c504e8
Author: Sebastien Badia <seb@sebian.fr>
Date:   Mon Dec 23 19:15:09 2013 +0100

    Add gitignore file

    Change-Id: I5dc7929ae6f402ae985889b1e0d134f834ad71ef
    (cherry picked from commit 9984f002eff47c425a48026f82d96d913d325027)

commit 3d2e8b216f86e985053c6f470182fd25e91e82bc
Author: Hunter Haugen <hunter@puppetlabs.com>
Date:   Mon Mar 31 17:28:27 2014 -0700

    Configure defaultbranch so reviews go to the correct branch

    Change-Id: Ibee3dabf5d60f727c6d8fa5ff4c80d055ee79110