Skip to content

Commit

Permalink
Rebase for 8.0.0 (mitaka) release for openstack modules.
Browse files Browse the repository at this point in the history
Update aodh to 3f0e8910b2703ed7f23ec22a8ec86e575c5f922c

3f0e8910b2703ed7f23ec22a8ec86e575c5f922c Updates for stable/mitaka

Change-Id: Ic746d3f67b443889eb4793e126063409d1c29695

Update ceilometer to e174e213fb6df65477229acb43740edda2958285

e174e213fb6df65477229acb43740edda2958285 Add 'ceilometer-service' tag to collector and agent/notification
495b3aa4af49a7d02471b9b5cc7ba57b34dc893a Updates for stable/mitaka
c7a16c237f331c2370e9c8a36566d3d1fd8750b7 Release 8.0.0

Change-Id: I277f60233a11a5f0df5a21c272318bbabe417a56

Update cinder to 564d8eb5ee224a4dcce3305abeaaf3d815de6f40

564d8eb5ee224a4dcce3305abeaaf3d815de6f40 Add osapi_max_limit parameter
1378c1af328eba5cb8c2391ee9f0290bfb468c90 Updates for stable/mitaka
02bacaef5bba7713c50b0c13cb8f1e3ddd60ef23 Merge "Update Cinder BDD backend configuration"
3e5ee1fa296a1dee12c88d8f97b709f5f411e42f Release 8.0.0
9c11b47dc492000012ac2767401764ac18f47017 Update Cinder BDD backend configuration

Change-Id: Id8c59092789d5e332e58b42442878c0e40a73f4c

Update glance to 71f426fcd8840e4d9cc82f1e62ad8dec72dccf0b

71f426fcd8840e4d9cc82f1e62ad8dec72dccf0b Add posibility to configure Glance backend settings for Glare service
bbed76ec7f072d80f4d70d1bf2225b71f9b3b30b Merge "Updates for stable/mitaka" into stable/mitaka
29f52976a3de7c203eba975aeb336fd8b0c4c3c4 Add missed glare_config options for glance::config class
ccf2b55593bc3cccefbe42abffb9542e34e5e858 Updates for stable/mitaka
9407ebd6532207e0363ccbe6d48235a39b2a40eb Merge "Configure endpoint for Glance Glare"
6a748cee54b34fbf5ced9ef7ce60f060c7cf6575 Release 8.0.0
e0b34f450d197ea8fc9616ebe9664c3223228bfb Configure endpoint for Glance Glare

Change-Id: Ie6c7de26a3c81950ee8537df52827f2ccfebf7a7

Update gnocchi to c9ea0cedd79513f94d0e9744ceead599cc7bdbb7

c9ea0cedd79513f94d0e9744ceead599cc7bdbb7 Updates for stable/mitaka
2a85caeac6c86ad45a85b8ef016ebe21986b2b7d Release 8.0.0

Change-Id: I0cc0d2aa7dcdda4c56c26fd5551920069da0ab13

Update heat to f3b819fab0d45559c9aac9c0ad162114cbdedc24

f3b819fab0d45559c9aac9c0ad162114cbdedc24 Updates for stable/mitaka
31c12cedc9edad740352f09edecfe248ce6996b1 Merge "Support preferred Keystone auth methods"
48b80077e83203c2dc40894e3adc6f3bd1ac170d Support preferred Keystone auth methods
a2fe53e6d971444a922ca35570d4516af4c26c6a Release 8.0.0

Change-Id: Ia0291f7eba01ae46ae327109a6972f1eb98312ab

Update horizon to 07de7af9ef72dd762eb6e4a44797b4955e38b831

07de7af9ef72dd762eb6e4a44797b4955e38b831 Updates for stable/mitaka
aaca4327660f40e01f275935c9ea854790527847 Release 8.0.0

Change-Id: I08ecdd478d9d601f10a7ba78d5f4046e1279b374

Update ironic to 63d2c6d4d8c1be36b59e5c33900c7f1fbdf33092

63d2c6d4d8c1be36b59e5c33900c7f1fbdf33092 Updates for stable/mitaka
16dc996694df42ce244c232180d99c9e2a80d67a Release 8.0.0

Change-Id: I2e1e2da830caa620bd35e0ebd62f190d550f110e

Update keystone to a2bca8a8d2095f1760e5d68c18bdd83a11e333e2

a2bca8a8d2095f1760e5d68c18bdd83a11e333e2 Fix for pki_setup
90b2be328e77d6607f7d5af2d3682f208638b7e8 Release 8.0.0

Change-Id: I6c0a4921f65b4b8940cc682c449c99844eb53efb

Update manila to 6a56d8db75f8229b820c30782283fb4bb9fcd328

6a56d8db75f8229b820c30782283fb4bb9fcd328 Gemfile: rely on puppet-openstack_spec_helper for dependencies
b5a70961e1f97c03dc228d4103ccc464f13c84fd Updates for stable/mitaka
e1452ff4495cb9b9b5eacd7475f14dbe1969ea57 Release 8.0.0

Change-Id: I9244fbe53e1716ed5cc4901f16718e0a25ace14e

Update neutron to fdc01297cd0b4e4220e24705a01aea1c27a2d10d

fdc01297cd0b4e4220e24705a01aea1c27a2d10d Updates for stable/mitaka
b2ff9e29fc3aea0d0714530bb732918cced9ef9e Release 8.0.0

Change-Id: I2ff7b6bc955c7b60b970492b6b96d04999cde394

Update nova to 162b8f324bcf15db23252f5c0cc86ac2167d1f40

162b8f324bcf15db23252f5c0cc86ac2167d1f40 Updates for stable/mitaka
3852f733c70bd21cb96f135af0b2997cf5a2f069 Release 8.0.0

Change-Id: I418f60c8d810baf2ebe13f9e79292a33501490bb

Update sahara to 38c3394528d626300ac7ff9f1c523b98611eac60

38c3394528d626300ac7ff9f1c523b98611eac60 Release 8.0.0

Change-Id: I747182eadded6d585be0f4bf1b28043854a65994

Update swift to d8020196738fa911d553c414dbf3c93158d6158f

d8020196738fa911d553c414dbf3c93158d6158f Add rmq credentials to each host in proxy
7f8469a6c8a0dd600c81a5a4697b3e0dc873744d Updates for stable/mitaka
76e1be165778f471060f07078621b4df70741e60 Release 8.0.0

Change-Id: I243e9e56e897eed21c9ec3c119c1cb018d0ed356

Update tempest to 2c17a0e31b599560f011b6e30f1149767aaadcdb

2c17a0e31b599560f011b6e30f1149767aaadcdb Updates for stable/mitaka
6788f85f37d95cce408470d2814903f83d0ac9a1 Release 8.0.0

Change-Id: I94a676efc2e2e1a60f1606d7a38b0899d37b17e1

Update tripleo to d876a555e25bb3f33a1b4121ba23d0ee400dabea

Change-Id: Idcd1b42eed9f58ba68105a51e2dbe3ad814941bd

Update trove to b7981c33d7d6115457416c35bc41a42c3c567cfc

b7981c33d7d6115457416c35bc41a42c3c567cfc Updates for stable/mitaka
9fa99515da64f533e64f6613a6b7456a6566bf15 guestagent.conf template should use rabbit_hosts
2ccdb978fffe990e28512069a4c4f69465ace942 Release 8.0.0

Change-Id: Idde9ab44238ef4932f180c19dddb3f463520cc64

Update openstacklib to b6feabc0e37b5f9d965b76b4c0dba471ea6d4761

b6feabc0e37b5f9d965b76b4c0dba471ea6d4761 Updates for stable/mitaka
104f2d3e5836dd4c39e4b954cd93e4c86798fae4 Release 8.0.0

Change-Id: I136458884985c70ce3f745286fc1b96911ec364c

Update openstack_extras to 2c170d1b26bb18b3d5120b715e3b04963105fa03

2c170d1b26bb18b3d5120b715e3b04963105fa03 Updates for stable/mitaka
d9f7d2217849009c43ab688fb8a04879bcd9c0ee Release 8.0.0

Change-Id: Ib24ec65ce807c564ce0cc56204cc04ec60b01fcc

Update vswitch to 2059a77127590d13b88de051827efbb18307f995

2059a77127590d13b88de051827efbb18307f995 Release 4.0.0

Change-Id: Icd08fecfdf8cf8031ec4236cb912e8c0242bd389

Update zaqar to 2fbfc6b11f49da57af4b3852fc666fb36c5af584

2fbfc6b11f49da57af4b3852fc666fb36c5af584 Updates for stable/mitaka
b2b1be1de814e5244febcaa0ee37d686c6df1f5e Release 8.0.0

Change-Id: I943f861e91b086c139a8bc3a5cb97687014011d3
  • Loading branch information
jguiditta committed Mar 31, 2016
1 parent 020fdf5 commit 8371f86
Show file tree
Hide file tree
Showing 191 changed files with 1,966 additions and 377 deletions.
42 changes: 21 additions & 21 deletions Puppetfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod 'aodh',
:commit => '8fb675a73302243140c268aeba9ce2b24d3abc2c',
:commit => '3f0e8910b2703ed7f23ec22a8ec86e575c5f922c',
:git => 'https://github.com/openstack/puppet-aodh.git'

mod 'apache',
Expand All @@ -11,7 +11,7 @@ mod 'cassandra',
:git => 'https://github.com/locp/cassandra.git'

mod 'ceilometer',
:commit => '3bd3f99e640eae867bba93b53f811d3cfa0a51d6',
:commit => 'e174e213fb6df65477229acb43740edda2958285',
:git => 'https://github.com/openstack/puppet-ceilometer.git'

mod 'ceph',
Expand All @@ -23,7 +23,7 @@ mod 'certmonger',
:git => 'https://github.com/rcritten/puppet-certmonger.git'

mod 'cinder',
:commit => 'a9912c88a5af2ba417c250e201d0f81c5a0ffb1f',
:commit => '564d8eb5ee224a4dcce3305abeaaf3d815de6f40',
:git => 'https://github.com/openstack/puppet-cinder.git'

mod 'concat',
Expand Down Expand Up @@ -59,31 +59,31 @@ mod 'git',
:git => 'https://github.com/puppetlabs/puppetlabs-git.git'

mod 'glance',
:commit => 'da8a3aa022b5f44783589b3b1762dccba2610d87',
:commit => '71f426fcd8840e4d9cc82f1e62ad8dec72dccf0b',
:git => 'https://github.com/openstack/puppet-glance.git'

mod 'gnocchi',
:commit => 'a47c4fdda465ee48d3a1ca9532f28e03529eb171',
:commit => 'c9ea0cedd79513f94d0e9744ceead599cc7bdbb7',
:git => 'https://github.com/openstack/puppet-gnocchi.git'

mod 'haproxy',
:commit => '8b7f2765f18222821d6ec2967e088522e4d64197',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'

mod 'heat',
:commit => 'bd2cd8997cde4dea9d2e5e66890b8a939b02430f',
:commit => 'f3b819fab0d45559c9aac9c0ad162114cbdedc24',
:git => 'https://github.com/openstack/puppet-heat.git'

mod 'horizon',
:commit => '3d92d5099a019880215e14281c26b2c5122b42d2',
:commit => '07de7af9ef72dd762eb6e4a44797b4955e38b831',
:git => 'https://github.com/openstack/puppet-horizon.git'

mod 'inifile',
:commit => 'd31803cce628b1a7994b61158b627c88cab83ee4',
:git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'

mod 'ironic',
:commit => 'e76ff289fe6e99498d4fa20de2ba219e7fc43a68',
:commit => '63d2c6d4d8c1be36b59e5c33900c7f1fbdf33092',
:git => 'https://github.com/openstack/puppet-ironic.git'

mod 'java',
Expand All @@ -99,7 +99,7 @@ mod 'keepalived',
:git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'

mod 'keystone',
:commit => '46c8657bb07020dec65bdd2349e28605590c50a7',
:commit => 'a2bca8a8d2095f1760e5d68c18bdd83a11e333e2',
:git => 'https://github.com/openstack/puppet-keystone.git'

mod 'kibana3',
Expand All @@ -111,7 +111,7 @@ mod 'kmod',
:git => 'https://github.com/camptocamp/puppet-kmod.git'

mod 'manila',
:commit => 'ad6d3257894013a88638d518ea2cce0337b4138e',
:commit => '6a56d8db75f8229b820c30782283fb4bb9fcd328',
:git => 'https://github.com/openstack/puppet-manila.git'

mod 'memcached',
Expand Down Expand Up @@ -151,11 +151,11 @@ mod 'nagios',
:git => 'https://github.com/gildub/puppet-nagios-openstack.git'

mod 'neutron',
:commit => '7e55cac0248a8f8b349243cd718a84550dd7146f',
:commit => 'fdc01297cd0b4e4220e24705a01aea1c27a2d10d',
:git => 'https://github.com/openstack/puppet-neutron.git'

mod 'nova',
:commit => '8f0a3af97e318799d9979fcf73ebfe1f72c556c5',
:commit => '162b8f324bcf15db23252f5c0cc86ac2167d1f40',
:git => 'https://github.com/openstack/puppet-nova.git'

mod 'nssdb',
Expand All @@ -171,11 +171,11 @@ mod 'opendaylight',
:git => 'https://github.com/dfarrell07/puppet-opendaylight.git'

mod 'openstack_extras',
:commit => 'fb1492ca64e9b42ffa7a35d7159c003c3a4d3f06',
:commit => '2c170d1b26bb18b3d5120b715e3b04963105fa03',
:git => 'https://github.com/openstack/puppet-openstack_extras.git'

mod 'openstacklib',
:commit => '1c2e64fc43c70afd3a25e837a9d1a9a66d01f442',
:commit => 'b6feabc0e37b5f9d965b76b4c0dba471ea6d4761',
:git => 'https://github.com/openstack/puppet-openstacklib.git'

mod 'pacemaker',
Expand Down Expand Up @@ -203,7 +203,7 @@ mod 'rsync',
:git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'

mod 'sahara',
:commit => '918ad4d87e116ac8d019a95ecd340d9ed8c1dd94',
:commit => '38c3394528d626300ac7ff9f1c523b98611eac60',
:git => 'https://github.com/openstack/puppet-sahara.git'

mod 'sensu',
Expand All @@ -227,15 +227,15 @@ mod 'stdlib',
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'

mod 'swift',
:commit => 'ed6c23afc074d119027c73ceddf6090ccd02f4be',
:commit => 'd8020196738fa911d553c414dbf3c93158d6158f',
:git => 'https://github.com/openstack/puppet-swift.git'

mod 'sysctl',
:commit => '65ffe839a4ce785bc3901452488197a0ef158cd8',
:git => 'https://github.com/duritong/puppet-sysctl.git'

mod 'tempest',
:commit => '55bd0910ca83f529e1e537b2f795a11bb1927bea',
:commit => '2c17a0e31b599560f011b6e30f1149767aaadcdb',
:git => 'https://github.com/openstack/puppet-tempest.git'

mod 'timezone',
Expand All @@ -247,11 +247,11 @@ mod 'tomcat',
:git => 'https://github.com/puppetlabs/puppetlabs-tomcat.git'

mod 'tripleo',
:commit => '85e3c3e979be3dbfe98ce8a72b5a8cbf411102ed',
:commit => 'd876a555e25bb3f33a1b4121ba23d0ee400dabea',
:git => 'https://github.com/openstack/puppet-tripleo.git'

mod 'trove',
:commit => '35737af627966da7ffed9247fabbfe789acdec73',
:commit => 'b7981c33d7d6115457416c35bc41a42c3c567cfc',
:git => 'https://github.com/openstack/puppet-trove'

mod 'tuskar',
Expand All @@ -271,15 +271,15 @@ mod 'vlan',
:git => 'https://github.com/derekhiggins/puppet-vlan.git'

mod 'vswitch',
:commit => 'b988c7684a97f7dd14862f089c5cb4e5e565e4a4',
:commit => '2059a77127590d13b88de051827efbb18307f995',
:git => 'https://github.com/openstack/puppet-vswitch.git'

mod 'xinetd',
:commit => '749651ed7d4e8924bb701153f184a13af0a669a3',
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd.git'

mod 'zaqar',
:commit => '004138833b723fcf1404e764e7d8ff61dcb27960',
:commit => '2fbfc6b11f49da57af4b3852fc666fb36c5af584',
:git => 'https://github.com/openstack/puppet-zaqar.git'

mod 'zookeeper',
Expand Down
1 change: 1 addition & 0 deletions aodh/.gitreview
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/puppet-aodh.git
defaultbranch=stable/mitaka
3 changes: 2 additions & 1 deletion aodh/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ group :development, :test do
gem 'puppet-lint-numericvariable', :require => 'false'
gem 'json', :require => 'false'
gem 'puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:branch => 'stable/mitaka',
:require => false
end

Expand Down
1 change: 1 addition & 0 deletions ceilometer/.gitreview
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/puppet-ceilometer.git
defaultbranch=stable/mitaka
5 changes: 5 additions & 0 deletions ceilometer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 8.0.0 and beyond

From 8.0.0 release and beyond, release notes are published on
[docs.openstack.org](http://docs.openstack.org/releasenotes/puppet-ceilometer/).

##2015-11-25 - 7.0.0
###Summary

Expand Down
3 changes: 2 additions & 1 deletion ceilometer/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ group :development, :test do
gem 'puppet-lint-numericvariable', :require => 'false'
gem 'json', :require => 'false'
gem 'puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:branch => 'stable/mitaka',
:require => false
end

Expand Down
3 changes: 2 additions & 1 deletion ceilometer/manifests/agent/notification.pp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
name => $::ceilometer::params::agent_notification_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true
hasrestart => true,
tag => 'ceilometer-service'
}

ceilometer_config {
Expand Down
3 changes: 2 additions & 1 deletion ceilometer/manifests/collector.pp
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
name => $::ceilometer::params::collector_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true
hasrestart => true,
tag => 'ceilometer-service'
}
}
6 changes: 3 additions & 3 deletions ceilometer/metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openstack-ceilometer",
"version": "7.0.0",
"version": "8.0.0",
"author": "eNovance and OpenStack Contributors",
"summary": "Puppet module for OpenStack Ceilometer",
"license": "Apache-2.0",
Expand Down Expand Up @@ -33,8 +33,8 @@
"dependencies": [
{ "name": "puppetlabs/apache", "version_requirement": ">=1.0.0 <2.0.0" },
{ "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
{ "name": "openstack/keystone", "version_requirement": ">=7.0.0 <8.0.0" },
{ "name": "openstack/keystone", "version_requirement": ">=8.0.0 <9.0.0" },
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
{ "name": "openstack/openstacklib", "version_requirement": ">=7.0.0 <8.0.0" }
{ "name": "openstack/openstacklib", "version_requirement": ">=8.0.0 <9.0.0" }
]
}
3 changes: 3 additions & 0 deletions ceilometer/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
prelude: >
This is the first Mitaka release for puppet-ceilometer module.
2 changes: 0 additions & 2 deletions ceilometer/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
prelude: >
Release notes are generated by Reno.
features:
- Release notes are no longer maintained by hand, we now use the reno tool to
manage them.
19 changes: 15 additions & 4 deletions ceilometer/releasenotes/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
===============================
puppet-ceilometer Release Notes
===============================
===========================================
Welcome to puppet-ceilometer Release Notes!
===========================================

Contents
========

.. toctree::
:maxdepth: 1
:maxdepth: 2

mitaka
unreleased


Indices and tables
==================

* :ref:`genindex`
* :ref:`search`
6 changes: 6 additions & 0 deletions ceilometer/releasenotes/source/mitaka.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
============================
Mitaka Series Release Notes
============================

.. release-notes::
:branch: origin/stable/mitaka
6 changes: 4 additions & 2 deletions ceilometer/spec/classes/ceilometer_agent_notification_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
:name => platform_params[:agent_notification_service_name],
:enable => params[:enabled],
:hasstatus => true,
:hasrestart => true
:hasrestart => true,
:tag => 'ceilometer-service'
)
end
end
Expand All @@ -91,7 +92,8 @@
:name => platform_params[:agent_notification_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true
:hasrestart => true,
:tag => 'ceilometer-service'
)
end
end
Expand Down
9 changes: 6 additions & 3 deletions ceilometer/spec/classes/ceilometer_collector_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
:name => platform_params[:collector_service_name],
:enable => true,
:hasstatus => true,
:hasrestart => true
:hasrestart => true,
:tag => 'ceilometer-service'
)
end

Expand All @@ -87,7 +88,8 @@
:name => platform_params[:collector_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true
:hasrestart => true,
:tag => 'ceilometer-service'
)
end
end
Expand All @@ -104,7 +106,8 @@
:name => platform_params[:collector_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true
:hasrestart => true,
:tag => 'ceilometer-service'
)
end
end
Expand Down
1 change: 1 addition & 0 deletions cinder/.gitreview
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/puppet-cinder.git
defaultbranch=stable/mitaka
5 changes: 5 additions & 0 deletions cinder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 8.0.0 and beyond

From 8.0.0 release and beyond, release notes are published on
[docs.openstack.org](http://docs.openstack.org/releasenotes/puppet-cinder/).

##2015-11-25 - 7.0.0
###Summary

Expand Down
3 changes: 2 additions & 1 deletion cinder/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ group :development, :test do
gem 'puppet-lint-numericvariable', :require => 'false'
gem 'json', :require => 'false'
gem 'puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:branch => 'stable/mitaka',
:require => false
end

Expand Down
7 changes: 7 additions & 0 deletions cinder/manifests/api.pp
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@
# (Optional) Base URL that will be presented to users in links to the OpenStack Volume API.
# Defaults to $::os_service_default
#
# [*osapi_max_limit*]
# (Optional) The maximum number of items that a collection resource
# returns in a single response (integer value)
# Defaults to $::os_service_default
#
class cinder::api (
$keystone_password,
$keystone_enabled = true,
Expand Down Expand Up @@ -165,6 +170,7 @@
$sync_db = true,
$public_endpoint = $::os_service_default,
$osapi_volume_base_url = $::os_service_default,
$osapi_max_limit = $::os_service_default,
# DEPRECATED PARAMETERS
$validation_options = {},
) {
Expand Down Expand Up @@ -217,6 +223,7 @@
'DEFAULT/default_volume_type': value => $default_volume_type;
'DEFAULT/public_endpoint': value => $public_endpoint;
'DEFAULT/osapi_volume_base_URL': value => $osapi_volume_base_url;
'DEFAULT/osapi_max_limit': value => $osapi_max_limit;
}

cinder_config {
Expand Down
Loading

0 comments on commit 8371f86

Please sign in to comment.