Sync openstack puppet modules with their masters

Update apache to 84219d8

84219d8 Merge pull request #1137 from puppetlabs/revert-1126-concat-2
1507ed2 Revert "Support puppetlabs-concat 2.x"
71ccd39 Merge pull request #1136 from justinstoller/maint/master/set_puppet_version
e58cf45 (maint) allow specifying PUPPET_VERSION in acceptance
4de97c3 Merge pull request #1135 from puppetlabs/travisci_update
3a5894e Updated travisci file to remove allow_failures for Puppet 4
e46cdc1 Merge pull request #1132 from hunner/prep_1.5.0
409ddd2 Add changelog for 1.5.0 relesase
6e33255 Merge pull request #1126 from domcleal/concat-2
1919eb3 Support puppetlabs-concat 2.x

Change-Id: I881d060a7b8b80c08f84b3a3780623f51de3fa0b

Update ceilometer to 2bb88c9

2bb88c9 Update .gitreview file for project rename
430f4f4 Merge "Unpin beaker-rspec"
ff99138 Unpin beaker-rspec
208cee7 Move rabbit/kombu settings to oslo_messaging_rabbit section

Change-Id: I15ea00df560f54aa62a6741888d14055f1db03be

Update cinder to cddc87e4012c7b8851dc274e28c7a32422c47720

cddc87e4012c7b8851dc274e28c7a32422c47720 Update .gitreview file for project rename
4d0d175128a7ce17284bda85cb85cd441e129be3 Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section"
8bf7756ee1da1e12d3032d0afbd01d3a337b5cc7 Unpin beaker-rspec
c23b2c9abb654133337e3d988815b12a6c539714 Move rabbit/kombu settings to oslo_messaging_rabbit section
4cbfb42ac6cff20a7c8f1e0d6fae5df951ffc3b5 Merge "NetApp: use $name for configuration group name"
95a3a9ad18efcc58bc410908b9cec5ad1a291988 NetApp: use $name for configuration group name

Change-Id: Iffff8fac41c6812534b56825f869880c5bd31a7a

Update firewall to 1ceff19

1ceff19 Merge pull request #538 from justinstoller/maint/master/set-puppet-version
ecf7bbd (maint) allow setting PUPPET_VERSION in acceptance
2a1a56a Merge pull request #536 from jonnytpuppet/travis_update
8436827 Updated travisci file to fail on Puppet 4 failures
11213dc Merge pull request #537 from tphoney/puppet4_unittest
04d23f5 add environmentpath
962ce15 Merge pull request #535 from ekohl/patch-1
e3e10c2 Fix puppet lint errors in examples

Change-Id: I4c1c61097a7fb3adeb388cbda7161b76b7681a11

Update glance to 7fc2ba21a7ee8cc81826f2bcc74f0a7fa5b6687e

7fc2ba21a7ee8cc81826f2bcc74f0a7fa5b6687e Update .gitreview file for project rename

Change-Id: I6dfad14e6e5d7fba5769ccff605f70a2d93c119b

Update gnocchi to 8bb2319e56cab193b43ac0f93e0b76d8c4826d8c

8bb2319e56cab193b43ac0f93e0b76d8c4826d8c Update .gitreview file for project rename

Change-Id: Ie8fc9276d6f3510943c73c10e45c6997b5068930

Update haproxy to 6bca1f0bc31bfeb397635c9867d51a847caddbcd

6bca1f0bc31bfeb397635c9867d51a847caddbcd Merge pull request redhat-openstack#187 from justinstoller/maint/master/set-puppet-version
6512813f38733e5ece696d41145a6ba2273fe59f (maint) allow setting PUPPET_VERSION in acceptance
8b25a7b950825c9e5430b7fc3b68ad257de27711 Merge pull request redhat-openstack#184 from puppetlabs/travisci_update
b7c253984e6bc5169d4df2fbb83f3510174d5dbb Updated travisci file to remove allow_failures on Puppet 4
611cecbec7bea98a359d3afa82952b258d2ca5b6 Merge pull request redhat-openstack#186 from tphoney/puppet27_relax_unittest
c1bf471eb1a0bf7f88a1efd47d8633ed1e185381 relax unit test for puppet 2.7
346c213d815ec2ed13bb839970c4db4025c5c5b1 Merge pull request redhat-openstack#185 from tphoney/puppet4_unittest
cf2fc938cd40916b83bc595a296257c6016ebdac changes to fix puppet4 unit tests

Change-Id: Idf3db5e27589e49f28a9b2df37fe139f1e211442

Update heat to 1e77c010b95bd8f27d6547dfaf7f5748f80519bc

1e77c010b95bd8f27d6547dfaf7f5748f80519bc Update .gitreview file for project rename
9f8e0b6f5ced6cf172196b1ed43f70dcdd31f21a Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section"
989ffa65f4339bfd9612cff3b5ddcc4fd301f695 Merge "Allow setting default config/signal transport"
2aaab3d4d5b0bb2fa4146b62b66c217120f10913 Unpin beaker-rspec
456355e4709bfe4147b25449f2dab72d39decdfd Move rabbit/kombu settings to oslo_messaging_rabbit section
bfa9f0aa3e9dfc6dd50a000bf59c06feb07144e8 Run db_sync when heat-common is upgraded
8e97bd8438c0045b7f4ff7615b1e738d5bff44f1 Allow setting default config/signal transport

Change-Id: I9c43883ecae53bb6c9705a2cf05509a05cedc91d

Update horizon to d45c1e69b83dd082e9b969787f3af461f9b32193

d45c1e69b83dd082e9b969787f3af461f9b32193 Update .gitreview file for project rename
d3d9a29df1e21de2747e065022748500ff29d56b Unpin beaker-rspec
1b66610b74902d091c8950eb800cefa086d55cb5 rather use the alias and keep references consistent

Change-Id: Ia75d7f2a3bf6c43cb49fe5867a59f8229facfc5a

Update inifile to e132445

e132445 Merge pull request redhat-openstack#168 from hunner/fix_helper_name
3c92a35 Correct the name of the require
e89bf76 Merge pull request redhat-openstack#167 from puppetlabs/update_gemfile
034233f Update the gemfile for puppet install helper
62a31ba Merge pull request redhat-openstack#166 from hunner/add_helper
6acf750 Add helper to install puppet/pe/puppet-agent
485c839 Merge pull request redhat-openstack#165 from mhaskel/merge_1.3.x_to_master
30ee205 Correct the date and metadata ordering
bb67906 Merge pull request redhat-openstack#164 from justinstoller/maint/master/set-puppet-version
9a7c0f3 (maint) allow setting PUPPET_VERSION in acceptance
9858f5b Merge pull request redhat-openstack#161 from tphoney/1.3.0_prep
461174d prep 1.3.0

Change-Id: Ibb4d9be613877c77152e0e53e783be9737b5fcae

Update ironic to 1e4c59f22a423aabb5608e18ba9cf3299c07a46f

1e4c59f22a423aabb5608e18ba9cf3299c07a46f Update .gitreview file for project rename
7dde9ec4777746038c60012f8121b04a9246009b Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section"
ff63db99996b052e57aff648adbbdd13ac459a08 Merge "db: Add postgresql support"
34ffde4902a010c20ac2d2db22aa3645a69990ea Unpin beaker-rspec
af76d786f6ed87ce17b768b5f7d47e9bfa7eb4a4 Move rabbit/kombu settings to oslo_messaging_rabbit section
4a81b07a062dbf7a7a9ba9b4f1c72ae61421b1e2 db: Add postgresql support

Change-Id: I90d33accc6240f2896f9442cbb2a50924126ac3c

Update keystone to 380d9addc3ad7552aa1c21002de12a7b349a0675

380d9addc3ad7552aa1c21002de12a7b349a0675 Update .gitreview file for project rename
bca04a399e6de63bd6d3d3d985aeaf3134802ac1 Add support for Fernet Tokens
58cdeac78a1bbeb98bc2450a1baf2edb6af150e1 Merge "Restructures authentication for resource providers"
4f5eba30d56eade6d517b1ff66b721a894aaff7d Restructures authentication for resource providers
deaff0106014f042af835c279a05fa615e0a3d5d Revert "remove POSIX users, groups and file modes"
85ad9cbf58f8c8dc791feb7e8f4143c2339b2556 Merge "remove POSIX users, groups and file modes"
2abad789290be9f9b5f06e7eac40b438748de84e remove POSIX users, groups and file modes
4c7318308e41f00c2da330a77c3660ac9da7c9a5 Unpin beaker-rspec

Change-Id: I8a31298292b3af77d165b65f77747bc0f2fdff59

Update manila to 04c9643e0e7bf7659ae063977788b4ca4504b861

04c9643e0e7bf7659ae063977788b4ca4504b861 Update .gitreview file for project rename
fefdc52578767ecac0102cc181648bf722a1f2c5 Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section"
5b3d0e9cf0edc6ec0eec83e67f86e5290596c0e3 Merge "Add notification_driver and state_path option"
c5d1adde8b0052b1e8d469d6485ee3aa2578a139 Unpin beaker-rspec
6cc30e79f21635349804e966a9d7bbd250cb3ff3 Move rabbit/kombu settings to oslo_messaging_rabbit section
ec38853e15c24814c72c46463b214f7936c228ff Add notification_driver and state_path option

Change-Id: Ib08e1ac2f065b0b2bfbecccb000a473d973ff2c9

Update memcached to 8e6fdfd

8e6fdfd add summary, new release v2.8.1
7f913e5 ignore vendor dir

Change-Id: Ie6ded5230d0cd203b2392b9d98a874d2f27aa71d

Update mongodb to 030100a176a72a32e265b77790d8d15407a13729

030100a176a72a32e265b77790d8d15407a13729 Merge pull request redhat-openstack#205 from puppetlabs/travisci_update
1e6836103b5bbb5d737ee66677b6ad2ad04a791b Updated travisci file for Puppet 4
c50bdb74bed827d023ba885af2daa1082a96150e Merge pull request redhat-openstack#179 from atrepca/MODULES-1712
ab566b666bf02ff61bedc2fb83ab2715429f5053 Add $restart param to control service restarts

Change-Id: I5795cac3a658a7ce28d25ae1f98bd61b32a254d4

Update mysql to 2a9ff96

2a9ff96 Merge pull request #724 from justinstoller/maint/master/set-puppet-version
5185d3d (maint) allow setting PUPPET_VERSION in acceptance

Change-Id: Ie16fc5cef82a54343ff7276a37fafd8a43b99898

Update n1k_vsm to ed391d3d9bdcccef3e2de3b0da98e654237d99a5

ed391d3d9bdcccef3e2de3b0da98e654237d99a5 Duplicate Declaration errors when adding n1k-vsm puppet module to controller host group

Change-Id: I35aa638916f2a9ed4cf960c6bf4a5ea33add631f

Update neutron to 910afc6d768a32f36462c3cdc77fe8cd43166b81

910afc6d768a32f36462c3cdc77fe8cd43166b81 Merge "Update .gitreview file for project rename"
6270ace20db38d7ae67de819d6fe9877864fe64d Update .gitreview file for project rename
048212b1b104d05832531dfce17e6d7e85f6951a Merge "Don't specify a nova region by default"
b7ca195139e44b23b9c534ba49231b579b7bab27 Don't specify a nova region by default
62a0fc3e2d8d74d6eaccc06e4b70b13c2ef2f277 Merge "LBaaS: update device_driver for Kilo"
b90e0efc511dc107159a83074aa3f3fac1ef0fd5 Merge "Fix support for auth_uri setting in neutron provider"
cc9bc3169908ef170417cf94bb57d43ceaa9fe6d LBaaS: update device_driver for Kilo
1b4762642767cda3dced6a884cd14764fd4404a3 Merge "Fix fwaas package name for Ubuntu and Debian"
28e53c9e9fc5ced9d8b7d1d938c991505c5a9eea Fix fwaas package name for Ubuntu and Debian
679bfdc7cf0cccd689a4a5bcfc91e1abd1cb65a0 Merge "Revert "Revert "Move rabbit/kombu settings to oslo_messaging_rabbit section"""
0d31b8f804ac9d9a46f0a66f44d09ff4ea2e3d03 Unpin beaker-rspec
37b2dc57de4e717ea811e083b485786badd84a1c Merge "Bring Redhat support to acceptance tests"
e74a84f4eb6c021c34babe7689d1d4fbe6196889 Bring Redhat support to acceptance tests
6fb01efe21669a1a2408ca7aba0efc421cb51bd9 Fix support for auth_uri setting in neutron provider
f20c34a922ca0bda7d71c8c14a736b435e31fce2 Revert "Revert "Move rabbit/kombu settings to oslo_messaging_rabbit section""

Change-Id: Ia129e68f6564f6bac0787ef1ffe9eef6a0555368

Update nova to 273728b88d8dd17cbb42485ec6fe06ce3d854fc8

273728b88d8dd17cbb42485ec6fe06ce3d854fc8 Update .gitreview file for project rename
68c0cfe93572d4a7cdfa7bd68c4abd7904bba9fd Merge "Revert "Revert "Move rabbit/kombu settings to oslo_messaging_rabbit section"""
81525edb5d7aa9e3e6af9cc053742e5c5ae0d421 Merge "Unpin beaker-rspec"
524d9a2f21383ffe8d10708d2b70b4a854fc1089 Merge "Run db-sync if nova packages are upgraded"
96d342f59f35f143699877bcaf74f10ea0922589 Merge "Fix spec tests for RSpec 3.x and Puppet 4.x"
2b2480e1e355b4beeabde482598d2bbd10dc4764 Fix spec tests for RSpec 3.x and Puppet 4.x
6f66d2f1841bbe9072a3a289d7dd3b152ce66ebe Remove comment for non-existant variable
084e3f122d9ba5d9eae15c4501bc84f79b06374d Merge "spec: convert remaining deprecated keywords"
37fef3ee00580e82cb755f02728ad4a07c8a9f17 Merge "templates: Fix variable prepending"
7e457c48dfb264d00171122e563f9fca4ffc4c4c Run db-sync if nova packages are upgraded
df40ad7c8dcffb3394fac0d9a7e2e1bb388ed90d Unpin beaker-rspec
fea50ad29281649e6b3bb396e5dd377d2faf054a spec: convert remaining deprecated keywords
7d43cf050ce82895240e7675410c5d0af6f0c2aa templates: Fix variable prepending
3a247427855ab128100b15d48d60730c561a26ef Revert "Revert "Move rabbit/kombu settings to oslo_messaging_rabbit section""

Change-Id: I4ea6cba271db14f4555073ee327f9f3e11268cbe

Update ntp to 413a705

413a705 Merge pull request redhat-openstack#270 from puppetlabs/maint/master/set-puppet-version
61f7811 (maint) allow setting PUPPET_VERSION in acceptance
8cf93ec Merge pull request redhat-openstack#269 from puppetlabs/travisci_update
4d07297 Updated travisci file for Puppet 4
10b30e6 Merge pull request redhat-openstack#268 from DavidS/modules-2087-fix-debian-default-config
2492fc2 (MODULES-2087) fix default configuration for Debian

Change-Id: Id7fc663cfa93138b749e827fcbef8906b26a8d2d

Update openstack_extras to 7ab1f4544ac71d2158459a85438eddc35e6fd0d6

7ab1f4544ac71d2158459a85438eddc35e6fd0d6 Update .gitreview file for project rename
14d95d461e75ce269b59c4aa499e785555f18188 metadata: Synchronize metadata file with module requirements

Change-Id: I9f6cbd4303cd9e8e9c27ecda6a0ed4f99d706616

Update openstacklib to 15f9db96c2f77a5e78a8fc098c07a72f66bdde4e

15f9db96c2f77a5e78a8fc098c07a72f66bdde4e Update .gitreview file for project rename
96422c95884e22ab4b7047439fb79d0d664eecd4 Merge "support for Keystone v3 authentication"
115318f7c4ac0e10d7ccae6ff6c709e1ab3885da acceptance: update serverspec syntax
8441feb39d9daf9642304af71e3287ec76601de5 support for Keystone v3 authentication
46c6b127ee91c8951f346305a29457efa4b26c81 Merge "Restructures authentication for resource providers"
2f76f651b2999cdd66f057171aa4e6bb7e2c6511 Unpin beaker-rspec
67d1c38703d36b6cadea7b9f8838d750109782b0 Restructures authentication for resource providers

Change-Id: Ie6a2daf2847a1319b41f3320801787a5c72b19a8

Update pacemaker to 337f9c139b705135b4f65e72748b4c706323b695

337f9c139b705135b4f65e72748b4c706323b695 Merge pull request redhat-openstack#52 from jistr/fence-agents
f62e67f3b48857822ab214bbf2bb704b18ce34af Add retry logic into fence agent manifests
021c273357da3cab541f13b2938c6097174b3582 Merge pull request redhat-openstack#50 from jistr/fence-agents
8f40e62acf78e4df54321f875eb86289288c7d9b Wrap fence_xvm boolean checks in str2bool
7311e5f3a7faa4c7eecdac6e74f94111cd40d37a Avoid using colons in stonith resource names
38fe2f724fe5b9f9b036d1ec33bb2b3c005f5dcc Change fence agents from classes to defined types
37fe18a1e5e17d31bd31100c0c780ecf320b324f Add features from stonith::xvm to stonith::fence_xvm
07ad3712de4601bd0724c1681e58b033bcb7872d Generate the new fence_xvm manifest
46507aa22b10479b65fd8e8fc5a7b6967b51ec78 Fix and reformat the fence agent generator

Change-Id: If303f871b836a13362273799e48549b32f60e62b

Update rabbitmq to 3acf530

3acf530 Merge pull request #365 from hunner/release_5.2.2
eba3354 Changelog & metadata for 5.2.2
f96a744 Merge pull request #364 from puppetlabs/travisci_update
13fa446 Updated travisci file for Puppet 4
d60d5c3 Merge pull request #363 from jonnytpuppet/tcp_listen_options_fix
e8e3f55 MODULES-1871 - Added default values to tcp_listen_options
067d25e Merge pull request #362 from jonnytpuppet/fixes
12a1652 Merge pull request #360 from cmurphy/fix_acceptance_tests
48d379f Swap order of rabbitmqadmin tests
d019865 Fix rabbitmq_exchange create command
cc4956d Fix 2.8.1 acceptance tests
87def92 Made some properties have default values

Change-Id: If497c2d1cd9f7b6a58766156874575b771e6f73b

Update redis to 439fb69

439fb69 Bump version to 1.0.7
09f52cf Adjust default value $config_owner
963fc0c Fixed duplicate declaration of package
2a1d8de add ppa_repo param and set to undef when osfamily is RedHat, FreeBSD, or Suse

Change-Id: Idec3d0fc61a28af62a225f5a77089afcdac6db96

Update sahara to aca5d45cfc8cbc0ec961a2aad7cc06d0e23144e5

aca5d45cfc8cbc0ec961a2aad7cc06d0e23144e5 Update .gitreview file for project rename
6fecc8376858574843ec969b25534fabee1126bd Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section"
1a7ab09b421f3aa15415675902fc5e604dc826a3 Unpin beaker-rspec
e19c54a6522b7beecf6009e4714fb78ea64c7402 Move rabbit/kombu settings to oslo_messaging_rabbit section

Change-Id: Ic2da99549f4ef1d0e1615ffdd7614de3aab86e3a

Update ssh to 3216cd87ae97ee74f06edd0e4868cedbc90e86d9

3216cd87ae97ee74f06edd0e4868cedbc90e86d9 add summary, new release v2.8.1
10d5e39904498e64422450801779392085ca7baf new release v2.8.0
e7670e1640ed8569fce2461bcc1e804eb101383f Merge branch 'ccin2p3-feature/per_user_config'
b296ee7d6f6ce2d4dc5fd3939c13364b6eddaaa1 fix users_client_options if no hiera values found
e7a0ba390bbb3eb5a6f754ca513230a2f8dfaf53 Merge branch 'feature/per_user_config' of https://github.com/ccin2p3/puppet-ssh into ccin2p3-feature/per_user_config
0020bd68c6257db48092e131b233b1bf417bc3ba new release v2.7.0
adcce9563ad83d52b5979b08db696aa4af5488a0 cast port value to string before striping, fixes redhat-openstack#112
da7c691f0931dc61ca368d51445ffaddc6b2aba3 ignore Gemfile.lock and vendor dir
d1f515e6065a811286e9ebfce2afe07843858e3d Merge pull request redhat-openstack#122 from stjeanp/master
28d63dbde9c4d214d826ecb6f4644df820e3e6f8 Merge pull request redhat-openstack#115 from cisco87/patch-1
d316ce453117849eb10833e8c9d6a84284b14912 Merge pull request redhat-openstack#114 from tedivm/concat_bug
828e7cf6d032d573b63bac47e272aecae348446d Merge pull request redhat-openstack#113 from tedivm/client_server_bug
5526b90bcbb1862acf86677ad214f98c7bd62d4f Fixes to make puppet-lint happy
10192afbc62ef8de13ff0522daf6531f9ff91e01 New type for managing users ssh configuration file
34e3e6977c5661ea269ccd5b80b74a9f097c576b Fixed parameter alignment
cb626fd50fd039f51ffa4912182ad139f7203a93 It's needed since due for a bug in puppet hiera_hash might return an empty string instead of the default value.
6629299da7d788384a71ce30e5c57ac90c668a49 Deleted superfluous relationship
3e5821025f819822fd3df0b1f25c1589500959d0 Corrected dependency direction
ced449b51874d5d408c1ff59faddc42c3eedcbfb Made config class compatible with new concat module
fc6aa145e42fdaf801f22e422e43f40e8e151fb0 Corrected bug which applied server settings to the client

Change-Id: Ib1870e392fba3bdec9494ba22f4be324f1127d68

Update stdlib to 8267dbc

8267dbc Merge pull request #470 from Yelp/getvar_future_parser
0191a3f Merge pull request #472 from justinstoller/maint/master/set_puppet_version
a41cfbd (maint) update PUPPET_VERSION default to be 3.8.1
237c4b5 Merge pull request #471 from puppetlabs/travisci_update
212c498 Also catch :undefined_variable as thrown by future parser
c69b75f Merge pull request #469 from hunner/fix_time
ad4ca4c Fix time() on 1.8.7
650216e Updated travisci file to remove allow_failures on Puppet4
0dd4f69 Merge pull request #468 from kylog/camels-all-the-way-down
09b427b Merge pull request #466 from elyscape/fix/improve_fqdn_acceptance_tests
84f49d3 (doc) Fix spelling of camelcase in CHANGELOG.md
98c2f28 fqdn_rand_string: Add acceptance tests for custom charsets
84279e9 fqdn_rotate: Add acceptance tests for custom seeds
f5f72f4 Merge pull request #467 from DavidS/document-rspec-puppet-version-reqs
1d6da96 Gemfile: specify minimum rspec-puppet version
07e8b39 Merge pull request #462 from elyscape/fix/fqdn_rotate_seeds_with_argument
b436216 fqdn_rotate: Add tests for custom seeds
d7c8460 fqdn_rotate: Improve documentation
601f681 fqdn_rotate: Don't use the value itself as part of the random seed
a383705 Merge pull request #464 from DavidS/modules-1882-convert-to-rspec
18d4c21 Remove unused puppet_spec code
f3e79dd Convert tests to use plain rspec-puppet
b62dff0 spec_helper: implement an easy way for specs to confine to puppet version
78bd9c8 Add the missing symlinks to get puppet 4 pickup the functions from the environmentpath
1fcce90 root all the gitignore patterns to avoid unintentional matches
ad7d12e Remove duplicate rake task and enable metadata.json linting
65b56c7 Workaround the broken rspec-mocks support in rspec-puppet
080d163 Enable bundler caching on travis
1ae9058 Merge pull request #465 from igalic/patch-1
687600c simplify mac address regex

Change-Id: Ia97cf7e99b0fabfd66c323548b765e836c4376c7

Update swift to 1c655eb5bdeb90f97cd157b846a7202f79216e15

1c655eb5bdeb90f97cd157b846a7202f79216e15 Update .gitreview file for project rename
4a6e4cbb3371a7e7ecd1a699b5c89c1a68a8e8e5 Fix spec tests for RSpec 3.x and Puppet 4.x
5e814f1b5ff7ef6a8b678cec6c2fb7d29562c7a7 Merge "Unpin beaker-rspec"
0d8892425ccb6f0ded9da2e46f5a15ee4f92b43a Unpin beaker-rspec
3c28a4bbc13ce707d152eb75790e6d5070941002 Beaker: fix tests on Ubuntu

Change-Id: Ib2a5929b3f4b09dae6d2f6712cc7b9049f278fa0

Update tempest to 21ccff381996a39cec387d6020aeb015c6e3e244

21ccff381996a39cec387d6020aeb015c6e3e244 Update .gitreview file for project rename
0546f050947314fa057b2d44a972cad9612a92eb Unpin beaker-rspec

Change-Id: I0e4cfe9782fca8b6a939ee24078ee870de8d1c25

Update tripleo to 8bfbcb1074caf16e44e79b68d385a19d7cac4537

8bfbcb1074caf16e44e79b68d385a19d7cac4537 Update .gitreview file for project rename
a077eaf307998b3a9996fc5c0846f6604139a3e7 Configure virtual IPs for split out networks
10ac6980f93ca33e279359c29c3cc19151b79f32 Add interface_for_ip function
8b945b5e0ff93af2ec1c6540d6177739ab846c99 Use node IP lists for HA Proxy ipaddresses
f4dab984c0dc6d2f0a9f587222396987cff3ad9d Drop nova_meta and glance_registry on public vip
36cdbecea314fcf4977383b14356637515232123 Allow use of ssl for public api endpoints

Change-Id: Ife35f7e57f2284e6b04de65c2ad38a8743f1d4e7

Update trove to ec563fbaf5545939efe8376c3382912562eca1df

ec563fbaf5545939efe8376c3382912562eca1df Update .gitreview file for project rename
8063a02c8f33a00f3fcbf40136aeedf5f40a57a4 Unpin beaker-rspec

Change-Id: Id4c6158da43b11e83d9b85b990ce54c7d2649450

Update vcsrepo to 69c9fc6c5c794f829b9c68b546277ae0081c8329

69c9fc6c5c794f829b9c68b546277ae0081c8329 Merge pull request redhat-openstack#253 from justinstoller/maint/master/set-puppet-version
a37c388f1b4c7b2d3db12fefe35261d067486f9f (maint) allow setting PUPPET_VERSION in acceptance

Change-Id: Ia48e1a088772ce1499d4f8e3fb63a971deb727de

Update vswitch to 70239fb8414f4322b22bdc9fb36accfeacf49795

70239fb8414f4322b22bdc9fb36accfeacf49795 Update .gitreview file for project rename
c40dc3aa2148eba0ddde188f8b802e6d265ffbe8 Unpin beaker-rspec
58fa67b42da40e9cadc8f6c49ab046ff86ebe3c4 Merge "Bring Redhat support to acceptance tests"
f9be6156e75ae6000b6266be9d99210161494ec9 Bring Redhat support to acceptance tests

Change-Id: I34df245be5461937ada16e591341d79424e790fc

Puppetfile

@@ -1,13 +1,13 @@
 mod 'apache',
-  :commit => 'bf061e66d10ff595799e13945832948e0a538cea',
+  :commit => '84219d81079b901a1400660757e399c365dacbda',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
   :commit => '9a3b74b0dbb655a3afcbc8bdee442f2143420b72',
   :git => 'https://github.com/aimonb/puppet_aviator.git'
 
 mod 'ceilometer',
-  :commit => '264ea1b19155bb2f34a95858b18442c14504ddf2',
+  :commit => '2bb88c9e504df19d61c6d272e3658cc47532e686',
   :git => 'https://github.com/stackforge/puppet-ceilometer.git'
 
 mod 'ceph',
@@ -19,7 +19,7 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => '4785c1c739f19c4874d0ba24f14e34b6f0d06375',
+  :commit => 'cddc87e4012c7b8851dc274e28c7a32422c47720',
   :git => 'https://github.com/stackforge/puppet-cinder.git'
 
 mod 'common',
@@ -35,63 +35,63 @@ mod 'corosync',
   :git => 'https://github.com/puppetlabs/puppetlabs-corosync.git'
 
 mod 'firewall',
-  :commit => 'cbfca920444c5da5bddd3990f89ca61e5bcc0006',
+  :commit => '1ceff193347867be5b5d3a0f1757e929173d394c',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
 
 mod 'galera',
   :commit => '26016bc260b6d1101201dd1ca791deb1a5fcf2cf',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => '88b74f869aed0c3fd2fb4b27e0f3956991399414',
+  :commit => '7fc2ba21a7ee8cc81826f2bcc74f0a7fa5b6687e',
   :git => 'https://github.com/stackforge/puppet-glance.git'
 
 mod 'gluster',
   :commit => '3cefb34593f37c9c2c2e93fcb88bee07e335045e',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
-  :commit => '4ebe8a6b83a5c3a55f7ea9f61991917054c6b013',
+  :commit => '8bb2319e56cab193b43ac0f93e0b76d8c4826d8c',
   :git => 'https://github.com/stackforge/puppet-gnocchi.git'
 
 mod 'haproxy',
-  :commit => '3007560fc47da48d576890b1823e0ccfac3d9207',
+  :commit => '6bca1f0bc31bfeb397635c9867d51a847caddbcd',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '01004884a1a4d3e2e5fac779975ddc18fec034cd',
+  :commit => '1e77c010b95bd8f27d6547dfaf7f5748f80519bc',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
-  :commit => 'b975b22d97f5b794160bfdd5c4190990e8496331',
+  :commit => 'd45c1e69b83dd082e9b969787f3af461f9b32193',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',
-  :commit => 'c72bfbb9b1df49ec66a4899e84ea869a1c18426c',
+  :commit => 'e132445690c21cef314d926bbc5975843c14951e',
   :git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'
 
 mod 'ipa',
   :commit => '4e634b31633bc956341e20980233107a6d5dc1f9',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '78e0dc117ee77275f40dcda8dd060f1d6ca06499',
+  :commit => '1e4c59f22a423aabb5608e18ba9cf3299c07a46f',
   :git => 'https://github.com/stackforge/puppet-ironic.git'
 
 mod 'keepalived',
   :commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => 'eb240c5aa120d428567fb7c239167def96b6b75f',
+  :commit => '380d9addc3ad7552aa1c21002de12a7b349a0675',
   :git => 'https://github.com/stackforge/puppet-keystone.git'
 
 mod 'manila',
-  :commit => 'ce1fa24cfdbb1073a1fedbb373b690b92b35c43f',
+  :commit => '04c9643e0e7bf7659ae063977788b4ca4504b861',
   :git => 'https://github.com/stackforge/puppet-manila.git'
 
 mod 'memcached',
-  :commit => 'f6dd071b94a934fcb66d06228ca234502f4ebb8f',
+  :commit => '8e6fdfda7400c40176baa5063e05ff716cc5fd73',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
@@ -103,47 +103,47 @@ mod 'module-data',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
-  :commit => '14117ae3391862021555df8139c66fd04c13c0c3',
+  :commit => '030100a176a72a32e265b77790d8d15407a13729',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',
-  :commit => '5f76233b7f44bb5d11521d78e60f0545da19e60e',
+  :commit => '2a9ff96e023e306e026455fa87ee5c415b74426e',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',
-  :commit => '2a42723f5a9d7dbfa00edf944ac5dec2bff6d9ea',
+  :commit => 'ed391d3d9bdcccef3e2de3b0da98e654237d99a5',
   :git => 'https://github.com/stackforge/puppet-n1k-vsm.git'
 
 mod 'nagios',
   :commit => '56a1eee350c4600bb12e017d64238fb3f876abd4',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => 'dea7f4719fea5529d916ef4cae56020e8ee4efea',
+  :commit => '910afc6d768a32f36462c3cdc77fe8cd43166b81',
   :git => 'https://github.com/stackforge/puppet-neutron.git'
 
 mod 'nova',
-  :commit => 'f4330488dd503562ba936c2f14d23e6af3ee9fca',
+  :commit => '273728b88d8dd17cbb42485ec6fe06ce3d854fc8',
   :git => 'https://github.com/stackforge/puppet-nova.git'
 
 mod 'nssdb',
   :commit => '2e163a21fb80d828afede2d4be6214f1171c4887',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',
-  :commit => 'c0613256dfcec3fb0ec20ef42c9d9e47f0412648',
+  :commit => '413a705d3b61eda9fb3651affb8cf79251c11d98',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
-  :commit => '610313ca08ffc50c44b6d41000d25bd0274d57f0',
+  :commit => '7ab1f4544ac71d2158459a85438eddc35e6fd0d6',
   :git => 'https://github.com/stackforge/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => 'd0de990f92a9a9cb7f705ecd39dd8aa02d02bf48',
+  :commit => '15f9db96c2f77a5e78a8fc098c07a72f66bdde4e',
   :git => 'https://github.com/stackforge/puppet-openstacklib.git'
 
 mod 'pacemaker',
-  :commit => '47c85172fedcf452acd004cc880a565e4a326c73',
+  :commit => '337f9c139b705135b4f65e72748b4c706323b695',
   :git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'
 
 mod 'puppet',
@@ -155,11 +155,11 @@ mod 'qpid',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => 'd3c6971a3e97b7079a6076a43a8891000757797b',
+  :commit => '3acf530fe70b9d4bf15fe048643a635977a68d13',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',
-  :commit => 'aa13ac935693204972b7255233f13402634f256e',
+  :commit => '439fb695ed582b99430352cd7b15fefa6bb56989',
   :git => 'https://github.com/arioch/puppet-redis.git'
 
 mod 'remote',
@@ -171,63 +171,63 @@ mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
-  :commit => '326860e6244927474f458e5df220abcb59049576',
+  :commit => 'aca5d45cfc8cbc0ec961a2aad7cc06d0e23144e5',
   :git => 'https://github.com/stackforge/puppet-sahara.git'
 
 mod 'snmp',
   :commit => '64f1a6976830bb4e96176a7296e8d14f65df0cac',
   :git => 'https://github.com/razorsedge/puppet-snmp.git'
 
 mod 'ssh',
-  :commit => '5afa7d6cc30c129af66612928f3ab51f89ad7a26',
+  :commit => '3216cd87ae97ee74f06edd0e4868cedbc90e86d9',
   :git => 'https://github.com/saz/puppet-ssh.git'
 
 mod 'staging',
   :commit => 'a71e7d6261616fdba9f5c9109c4ad41c120d91be',
   :git => 'https://github.com/nanliu/puppet-staging.git'
 
 mod 'stdlib',
-  :commit => '4a8c0a57f2c4df4e2e3fa37466f02a7f6fccd517',
+  :commit => '8267dbc149584afa4824dde7a3b95380556e2cea',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => 'ef9f9a4194237b3cd00446f42d1b407d203cbfd5',
+  :commit => '1c655eb5bdeb90f97cd157b846a7202f79216e15',
   :git => 'https://github.com/stackforge/puppet-swift.git'
 
 mod 'sysctl',
   :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
   :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
 
 mod 'tempest',
-  :commit => 'd46a0c403ee9adcdc2a694c609d9bb6fe3b5a05f',
+  :commit => '21ccff381996a39cec387d6020aeb015c6e3e244',
   :git => 'https://github.com/stackforge/puppet-tempest.git'
 
 mod 'timezone',
   :commit => '734918982a512f51a3f1855396d2d7da3f37f53c',
   :git => 'https://github.com/saz/puppet-timezone.git'
 
 mod 'tripleo',
-  :commit => '98cbe976ff26ad0db7d9ad6d4766c1d0114fed5b',
+  :commit => '8bfbcb1074caf16e44e79b68d385a19d7cac4537',
   :git => 'https://github.com/stackforge/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '16e82e68ea62efec3ec7e11d7b9887e16b773372',
+  :commit => 'ec563fbaf5545939efe8376c3382912562eca1df',
   :git => 'https://github.com/stackforge/puppet-trove'
 
 mod 'tuskar',
   :commit => '8c28b3a40f2dba6f70dfa1cad13f2709173bc213',
   :git => 'https://github.com/stackforge/puppet-tuskar.git'
 
 mod 'vcsrepo',
-  :commit => '18b91b2f51a1cd8cd6911bd981e4629dd0d407e8',
+  :commit => '69c9fc6c5c794f829b9c68b546277ae0081c8329',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
 
 mod 'vlan',
   :commit => 'c937de75c28e63fba8d8738ad6a5f2ede517e53d',
   :git => 'https://github.com/derekhiggins/puppet-vlan.git'
 
 mod 'vswitch',
-  :commit => '8bdf36261b7f25ac0f0af84804d102db0ba51007',
+  :commit => '70239fb8414f4322b22bdc9fb36accfeacf49795',
   :git => 'https://github.com/stackforge/puppet-vswitch.git'
 
 mod 'xinetd',

apache/.travis.yml

@@ -16,8 +16,5 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-  allow_failures:
-    - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false

apache/CHANGELOG.md

@@ -1,3 +1,35 @@
+##2015-06-16 - Supported Release 1.5.0
+### Summary
+This release primarily adds Suse compatibility. It also adds a handful of other
+parameters for greater configuration control.
+
+### Features
+- Now compatible with concat 1.x and 2.x
+- Add `apache::lib_path` parameter
+- Add `apache::service_restart` parameter
+- Add `apache::vhost::geoip_enable` parameter
+- Add `apache::mod::geoip` class
+- Add `apache::mod::remoteip` class
+- Add parameters to `apache::mod::expires` class
+- Add `index_style_sheet` handling to `apache::vhost::directories`
+- Add some compatibility for SLES 11
+- Add `apache::mod::ssl::ssl_sessioncachetimeout` parameter
+- Add `apache::mod::ssl::ssl_cryptodevice` parameter
+- Add `apache::mod::ssl::ssl_honorcipherorder` parameter
+- Add `apache::mod::userdir::options` parameter
+
+### Bugfixes
+- Document `apache::user` parameter
+- Document `apache::group` parameter
+- Fix apache::dev on FreeBSD
+- Fix proxy\_connect on apache >= 2.2
+- Validate log levels better
+- Fix `apache::apache_name` for package and vhost
+- Fix Debian Jessie mod\_prefork package name
+- Fix alias module being declared even when vhost is absent
+- Fix proxy\_pass\_match handling in vhost's proxy template
+- Fix userdir access permissions
+
 ##2015-04-28 - Supported Release 1.4.1
 
 This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module.

apache/metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apache",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
@@ -46,6 +46,12 @@
         "7"
       ]
     },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "11 SP1"
+      ]
+    },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [

apache/spec/spec_helper_acceptance.rb

@@ -5,7 +5,10 @@
 unless ENV['RS_PROVISION'] == 'no'
   # This will install the latest available package on el and deb based
   # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = { :default_action => 'gem_install' }
+  foss_opts = {
+    :default_action => 'gem_install',
+    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
+  }
 
   if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
 

ceilometer/.gitreview

@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/puppet-ceilometer.git
+project=openstack/puppet-ceilometer.git

ceilometer/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'rspec-puppet', '~> 2.1.0', :require => false
-  gem 'minitest', '~> 4.7', :require => 'minitest/unit'
 
   gem 'metadata-json-lint'
   gem 'puppet-lint-param-docs'
@@ -17,7 +16,7 @@ group :development, :test do
   gem 'puppet-lint-variable_contains_upcase'
   gem 'puppet-lint-numericvariable'
 
-  gem 'beaker-rspec', '~> 2.2.4', :require => false
+  gem 'beaker-rspec', :require => false
   gem 'json'
   gem 'webmock'
 end