Skip to content

Conversation

@frozencemetery
Copy link
Contributor

This update has been requested in conjunction with packstack sahara support. This change is needed for rabbit ssl support.

This module update commit was generated by Bade.
For more info please check https://github.com/paramite/bade

This commit is setting modules to following state:
sahara
 - old commit: 6630109
 - new commit: 11ab1d0
strider added a commit to strider/openstack-puppet-modules that referenced this pull request Feb 19, 2015
1830403 Merge pull request redhat-openstack#233 from pdxcat/release_320
0c4930e Release 3.2.0
c3d912b Merge pull request redhat-openstack#226 from 3dna/jmx-plugin
d36948e Merge pull request redhat-openstack#232 from vchepkov/fix-pe-support
5f9b23a metadata update
fcd63aa adding README.md docs for java and genericjmx
868d65a Merge pull request redhat-openstack#230 from michakrause/target_v5upgrade
ac4cd27 Merge pull request redhat-openstack#229 from michakrause/rrdcached-statistics
3b3245d Merge pull request redhat-openstack#224 from 3dna/snmp-define-data-host
ad60c64 Merge pull request redhat-openstack#216 from michakrause/master
05a9f02 Added v5_upgrade Plugin: https://collectd.org/wiki/index.php/Target:v5_upgrade
88fb530 added CollectStatistics option to rrdcached plugin
7822ba6 Perl Plugin: changed exec in provider 'false' case:
6064813 remove the ensure parameter
880baad Merge pull request redhat-openstack#228 from x-way/mymaster
bb978ee add id and path facts to test context
c605da8 set java path to undef on unsupported platforms
acb5074 plugin/ntpd: IncludeUnitID option only available in collectd > 5.2
e785050 collectd doesn't auto-include its java dir in class path :(
f68c147 genericjmx connection stanza
6737a8d use appropriate regex modifier
43ee029 MBean stanzas
faf3c6c genericjmx plugin base
d0379e7 consistency!
55054bd test the interface not the result
9276be2 collectd doesn't like having an empty <Plugin java> stanza
8031829 java plugin
64c4020 these values need to be quoted
ba762bd default these to empty hashes since they can now be empty
22a1662 split out the snmp data and hosts into defines
1990227 Merge pull request redhat-openstack#223 from sijis/add_packages
06ad3cd arrayify the values and collects
15f9ec5 plugin/varnish: package should also adhere to the ensure param passed
a101e47 plugin/postgresql: add package for redhat systems
1c463e3 plugin/write_riemann: add package for redhat systems
a334b6e plugin/write_http: add package for redhat systems
ec761d3 plugin/snmp: add package for redhat systems
e9f8110 plugin/sensors: add package for redhat systems
7ffa8db plugin/python: add package for redhat systems
78e4908 plugin/ping: add package for redhat systems
4e926bc plugin/perl: add package for redhat systems
a5340e5 plugin/nginx: add package for redhat systems
e17fd8a plugin/mysql: add package for redhat systems
094fe12 plugin/iptables: add package for redhat systems
97e126d plugin/curl_json: add package for redhat systems
ca26ce8 plugin/curl: add package for redhat systems
b8fb2bc plugin/amqp: add package for redhat systems
a68885e plugin/bind: add package for redhat systems
a3202b0 Merge pull request redhat-openstack#222 from 3dna/snmp-template-array
e900a09 arrayify the values and collects
f270d16 Add puppet forge badge to the README
6dac254 Merge pull request redhat-openstack#221 from sijis/plugin_lvm
fe726cb README: added lvm plugin example
7a8009b plugin/lvm: should also adhere to the ensure param passed
97cc610 added lvm plugin
71c281f Merge pull request redhat-openstack#219 from pdxcat/3.1.0
4a3179d Merge pull request redhat-openstack#220 from pdxcat/enable_docker_travisci
00ec0ed Disable sudo in .travis.yml to enable container builds
0e8a019 Release 3.1.0
9944bf1 Merge pull request redhat-openstack#202 from arioch/master
cc315de Merge pull request redhat-openstack#217 from bogus-py/filecount
68ca262 Merge pull request redhat-openstack#218 from cloudevelops/update-exec-plugin
1ac0d48 exec plugin refresh
5c3779e filecount: support all options
d13b812 Lintian fixes
1dff045 Merge pull request redhat-openstack#213 from petems/update_readme_with_conntrack
af4eab2 Merge pull request redhat-openstack#214 from bogus-py/python
e606526 plugin::python introduce ensure parameter
84fcbce Merge pull request redhat-openstack#207 from petems/add_beaker_tests
08f8528 Merge pull request redhat-openstack#211 from txaj/pass-interval-parameter
385e9e7 Merge pull request redhat-openstack#210 from txaj/fix-booleans-pulled-from-hiera
6b88f84 Add conntrack to README.md
b677d5d Basic acceptance test with beaker
c3a8aaa Merge branch 'master' of https://github.com/pdxcat/puppet-module-collectd
2190a9e Make plugins passing the $interval parameter
8ef18e6 Ensure variable using 'false' will be interpreted.
3fae4b2 Merge pull request redhat-openstack#200 from txaj/loadplugin-options2
3f33f0d Add rspec test to ensure the bracket syntax is using when available
2e515ea Merge pull request redhat-openstack#209 from txaj/add-conntrack
3bbfe77 Add conntrack module
5ef3917 Cleaning the now redundant LoadPlugin declaration
b671d00 Uses the LoadPlugin syntax with bracket when supported
1b75c78 Merge pull request redhat-openstack#201 from bogus-py/curl
c16a8d6 Merge pull request redhat-openstack#206 from muling-tt/master
3e13ce6 Merge pull request redhat-openstack#208 from pdxcat/fix_travis2
bd830de Fix travis by using plabs gemfile
1c481f7 Basic acceptance test with beaker
5802325 Add cpufreq plugin
ca2f400 Add cpufreq plugin doc
3abf175 Merge pull request redhat-openstack#205 from petems/patch-1
02ca5d8 Fix Puppet deprecation warning
4d01659 curl: fix handling of some parameters
8889605 Merge pull request redhat-openstack#198 from ByteInternet/zfs_arc
0899e82 Merge pull request redhat-openstack#199 from ByteInternet/write_graphite_logsenderrors
86962bb Support LogSendErrors on the write_graphite plugin
8d457c9 Add collectd::plugin::zfs_arc
4fa9f16 Merge pull request redhat-openstack#197 from guerremdq/patch-1
520c382 Add "" to Hostname
724e215 Merge pull request redhat-openstack#196 from jpds/entropy-example-fix
e9e16b7 README.md: Fixed example entropy snippet.
3b694bc Merge pull request redhat-openstack#195 from quiffman/master
e58fb05 Double quote the csv plugin DataDir.
bff587b Merge pull request redhat-openstack#193 from radford/curl-json-sock
e606d73 Merge pull request redhat-openstack#191 from bdossantos/fix/curl_MeasureResponseTime
ff1831d Merge pull request redhat-openstack#178 from joshgarnett/master
822ac69 Merge pull request redhat-openstack#192 from radford/write-http-storerates-bool
44766fb curl_json: Support reading from a unix socket
b1d0f1c write_http: StoreRates is a bool, not a string
9a092b4 Use '@plugininstance' to avoid warning message about deprecation
68b7b13 Merge pull request redhat-openstack#190 from dedded/apache-fix
7489cc8 curl : 'MeasureResponseTime' needs exactly one boolean argument
2181dc4 Add collectd-apache package needed on RedHat
f08d58c Merge pull request redhat-openstack#188 from cloudevelops/consolidate-python-plugin-2
a5aa0ae Merge pull request redhat-openstack#189 from cloudevelops/consolidate-curl-json-plugin
7cf838f New style naming and permissions for curl_json plugin
27ad95b Ensured deprecated file removed
462b312 Merge pull request redhat-openstack#186 from czhujer/master
ebf9ae7 Merge pull request redhat-openstack#187 from rjw1/patch-1
c6abe0a add a missing p
dd7f921 add missing package
6d92f5d Merge pull request redhat-openstack#185 from smoeding/fix-network-plugin
29a9837 Variables in templates should use @-notation
3b691fd Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4

Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Feb 27, 2015
1830403 Merge pull request redhat-openstack#233 from pdxcat/release_320
0c4930e Release 3.2.0
c3d912b Merge pull request redhat-openstack#226 from 3dna/jmx-plugin
d36948e Merge pull request redhat-openstack#232 from vchepkov/fix-pe-support
5f9b23a metadata update
fcd63aa adding README.md docs for java and genericjmx
868d65a Merge pull request redhat-openstack#230 from michakrause/target_v5upgrade
ac4cd27 Merge pull request redhat-openstack#229 from michakrause/rrdcached-statistics
3b3245d Merge pull request redhat-openstack#224 from 3dna/snmp-define-data-host
ad60c64 Merge pull request redhat-openstack#216 from michakrause/master
05a9f02 Added v5_upgrade Plugin: https://collectd.org/wiki/index.php/Target:v5_upgrade
88fb530 added CollectStatistics option to rrdcached plugin
7822ba6 Perl Plugin: changed exec in provider 'false' case:
6064813 remove the ensure parameter
880baad Merge pull request redhat-openstack#228 from x-way/mymaster
bb978ee add id and path facts to test context
c605da8 set java path to undef on unsupported platforms
acb5074 plugin/ntpd: IncludeUnitID option only available in collectd > 5.2
e785050 collectd doesn't auto-include its java dir in class path :(
f68c147 genericjmx connection stanza
6737a8d use appropriate regex modifier
43ee029 MBean stanzas
faf3c6c genericjmx plugin base
d0379e7 consistency!
55054bd test the interface not the result
9276be2 collectd doesn't like having an empty <Plugin java> stanza
8031829 java plugin
64c4020 these values need to be quoted
ba762bd default these to empty hashes since they can now be empty
22a1662 split out the snmp data and hosts into defines
1990227 Merge pull request redhat-openstack#223 from sijis/add_packages
06ad3cd arrayify the values and collects
15f9ec5 plugin/varnish: package should also adhere to the ensure param passed
a101e47 plugin/postgresql: add package for redhat systems
1c463e3 plugin/write_riemann: add package for redhat systems
a334b6e plugin/write_http: add package for redhat systems
ec761d3 plugin/snmp: add package for redhat systems
e9f8110 plugin/sensors: add package for redhat systems
7ffa8db plugin/python: add package for redhat systems
78e4908 plugin/ping: add package for redhat systems
4e926bc plugin/perl: add package for redhat systems
a5340e5 plugin/nginx: add package for redhat systems
e17fd8a plugin/mysql: add package for redhat systems
094fe12 plugin/iptables: add package for redhat systems
97e126d plugin/curl_json: add package for redhat systems
ca26ce8 plugin/curl: add package for redhat systems
b8fb2bc plugin/amqp: add package for redhat systems
a68885e plugin/bind: add package for redhat systems
a3202b0 Merge pull request redhat-openstack#222 from 3dna/snmp-template-array
e900a09 arrayify the values and collects
f270d16 Add puppet forge badge to the README
6dac254 Merge pull request redhat-openstack#221 from sijis/plugin_lvm
fe726cb README: added lvm plugin example
7a8009b plugin/lvm: should also adhere to the ensure param passed
97cc610 added lvm plugin
71c281f Merge pull request redhat-openstack#219 from pdxcat/3.1.0
4a3179d Merge pull request redhat-openstack#220 from pdxcat/enable_docker_travisci
00ec0ed Disable sudo in .travis.yml to enable container builds
0e8a019 Release 3.1.0
9944bf1 Merge pull request redhat-openstack#202 from arioch/master
cc315de Merge pull request redhat-openstack#217 from bogus-py/filecount
68ca262 Merge pull request redhat-openstack#218 from cloudevelops/update-exec-plugin
1ac0d48 exec plugin refresh
5c3779e filecount: support all options
d13b812 Lintian fixes
1dff045 Merge pull request redhat-openstack#213 from petems/update_readme_with_conntrack
af4eab2 Merge pull request redhat-openstack#214 from bogus-py/python
e606526 plugin::python introduce ensure parameter
84fcbce Merge pull request redhat-openstack#207 from petems/add_beaker_tests
08f8528 Merge pull request redhat-openstack#211 from txaj/pass-interval-parameter
385e9e7 Merge pull request redhat-openstack#210 from txaj/fix-booleans-pulled-from-hiera
6b88f84 Add conntrack to README.md
b677d5d Basic acceptance test with beaker
c3a8aaa Merge branch 'master' of https://github.com/pdxcat/puppet-module-collectd
2190a9e Make plugins passing the $interval parameter
8ef18e6 Ensure variable using 'false' will be interpreted.
3fae4b2 Merge pull request redhat-openstack#200 from txaj/loadplugin-options2
3f33f0d Add rspec test to ensure the bracket syntax is using when available
2e515ea Merge pull request redhat-openstack#209 from txaj/add-conntrack
3bbfe77 Add conntrack module
5ef3917 Cleaning the now redundant LoadPlugin declaration
b671d00 Uses the LoadPlugin syntax with bracket when supported
1b75c78 Merge pull request redhat-openstack#201 from bogus-py/curl
c16a8d6 Merge pull request redhat-openstack#206 from muling-tt/master
3e13ce6 Merge pull request redhat-openstack#208 from pdxcat/fix_travis2
bd830de Fix travis by using plabs gemfile
1c481f7 Basic acceptance test with beaker
5802325 Add cpufreq plugin
ca2f400 Add cpufreq plugin doc
3abf175 Merge pull request redhat-openstack#205 from petems/patch-1
02ca5d8 Fix Puppet deprecation warning
4d01659 curl: fix handling of some parameters
8889605 Merge pull request redhat-openstack#198 from ByteInternet/zfs_arc
0899e82 Merge pull request redhat-openstack#199 from ByteInternet/write_graphite_logsenderrors
86962bb Support LogSendErrors on the write_graphite plugin
8d457c9 Add collectd::plugin::zfs_arc
4fa9f16 Merge pull request redhat-openstack#197 from guerremdq/patch-1
520c382 Add "" to Hostname
724e215 Merge pull request redhat-openstack#196 from jpds/entropy-example-fix
e9e16b7 README.md: Fixed example entropy snippet.
3b694bc Merge pull request redhat-openstack#195 from quiffman/master
e58fb05 Double quote the csv plugin DataDir.
bff587b Merge pull request redhat-openstack#193 from radford/curl-json-sock
e606d73 Merge pull request redhat-openstack#191 from bdossantos/fix/curl_MeasureResponseTime
ff1831d Merge pull request redhat-openstack#178 from joshgarnett/master
822ac69 Merge pull request redhat-openstack#192 from radford/write-http-storerates-bool
44766fb curl_json: Support reading from a unix socket
b1d0f1c write_http: StoreRates is a bool, not a string
9a092b4 Use '@plugininstance' to avoid warning message about deprecation
68b7b13 Merge pull request redhat-openstack#190 from dedded/apache-fix
7489cc8 curl : 'MeasureResponseTime' needs exactly one boolean argument
2181dc4 Add collectd-apache package needed on RedHat
f08d58c Merge pull request redhat-openstack#188 from cloudevelops/consolidate-python-plugin-2
a5aa0ae Merge pull request redhat-openstack#189 from cloudevelops/consolidate-curl-json-plugin
7cf838f New style naming and permissions for curl_json plugin
27ad95b Ensured deprecated file removed
462b312 Merge pull request redhat-openstack#186 from czhujer/master
ebf9ae7 Merge pull request redhat-openstack#187 from rjw1/patch-1
c6abe0a add a missing p
dd7f921 add missing package
6d92f5d Merge pull request redhat-openstack#185 from smoeding/fix-network-plugin
29a9837 Variables in templates should use @-notation
3b691fd Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Mar 3, 2015
1830403 Merge pull request redhat-openstack#233 from pdxcat/release_320
0c4930e Release 3.2.0
c3d912b Merge pull request redhat-openstack#226 from 3dna/jmx-plugin
d36948e Merge pull request redhat-openstack#232 from vchepkov/fix-pe-support
5f9b23a metadata update
fcd63aa adding README.md docs for java and genericjmx
868d65a Merge pull request redhat-openstack#230 from michakrause/target_v5upgrade
ac4cd27 Merge pull request redhat-openstack#229 from michakrause/rrdcached-statistics
3b3245d Merge pull request redhat-openstack#224 from 3dna/snmp-define-data-host
ad60c64 Merge pull request redhat-openstack#216 from michakrause/master
05a9f02 Added v5_upgrade Plugin: https://collectd.org/wiki/index.php/Target:v5_upgrade
88fb530 added CollectStatistics option to rrdcached plugin
7822ba6 Perl Plugin: changed exec in provider 'false' case:
6064813 remove the ensure parameter
880baad Merge pull request redhat-openstack#228 from x-way/mymaster
bb978ee add id and path facts to test context
c605da8 set java path to undef on unsupported platforms
acb5074 plugin/ntpd: IncludeUnitID option only available in collectd > 5.2
e785050 collectd doesn't auto-include its java dir in class path :(
f68c147 genericjmx connection stanza
6737a8d use appropriate regex modifier
43ee029 MBean stanzas
faf3c6c genericjmx plugin base
d0379e7 consistency!
55054bd test the interface not the result
9276be2 collectd doesn't like having an empty <Plugin java> stanza
8031829 java plugin
64c4020 these values need to be quoted
ba762bd default these to empty hashes since they can now be empty
22a1662 split out the snmp data and hosts into defines
1990227 Merge pull request redhat-openstack#223 from sijis/add_packages
06ad3cd arrayify the values and collects
15f9ec5 plugin/varnish: package should also adhere to the ensure param passed
a101e47 plugin/postgresql: add package for redhat systems
1c463e3 plugin/write_riemann: add package for redhat systems
a334b6e plugin/write_http: add package for redhat systems
ec761d3 plugin/snmp: add package for redhat systems
e9f8110 plugin/sensors: add package for redhat systems
7ffa8db plugin/python: add package for redhat systems
78e4908 plugin/ping: add package for redhat systems
4e926bc plugin/perl: add package for redhat systems
a5340e5 plugin/nginx: add package for redhat systems
e17fd8a plugin/mysql: add package for redhat systems
094fe12 plugin/iptables: add package for redhat systems
97e126d plugin/curl_json: add package for redhat systems
ca26ce8 plugin/curl: add package for redhat systems
b8fb2bc plugin/amqp: add package for redhat systems
a68885e plugin/bind: add package for redhat systems
a3202b0 Merge pull request redhat-openstack#222 from 3dna/snmp-template-array
e900a09 arrayify the values and collects
f270d16 Add puppet forge badge to the README
6dac254 Merge pull request redhat-openstack#221 from sijis/plugin_lvm
fe726cb README: added lvm plugin example
7a8009b plugin/lvm: should also adhere to the ensure param passed
97cc610 added lvm plugin
71c281f Merge pull request redhat-openstack#219 from pdxcat/3.1.0
4a3179d Merge pull request redhat-openstack#220 from pdxcat/enable_docker_travisci
00ec0ed Disable sudo in .travis.yml to enable container builds
0e8a019 Release 3.1.0
9944bf1 Merge pull request redhat-openstack#202 from arioch/master
cc315de Merge pull request redhat-openstack#217 from bogus-py/filecount
68ca262 Merge pull request redhat-openstack#218 from cloudevelops/update-exec-plugin
1ac0d48 exec plugin refresh
5c3779e filecount: support all options
d13b812 Lintian fixes
1dff045 Merge pull request redhat-openstack#213 from petems/update_readme_with_conntrack
af4eab2 Merge pull request redhat-openstack#214 from bogus-py/python
e606526 plugin::python introduce ensure parameter
84fcbce Merge pull request redhat-openstack#207 from petems/add_beaker_tests
08f8528 Merge pull request redhat-openstack#211 from txaj/pass-interval-parameter
385e9e7 Merge pull request redhat-openstack#210 from txaj/fix-booleans-pulled-from-hiera
6b88f84 Add conntrack to README.md
b677d5d Basic acceptance test with beaker
c3a8aaa Merge branch 'master' of https://github.com/pdxcat/puppet-module-collectd
2190a9e Make plugins passing the $interval parameter
8ef18e6 Ensure variable using 'false' will be interpreted.
3fae4b2 Merge pull request redhat-openstack#200 from txaj/loadplugin-options2
3f33f0d Add rspec test to ensure the bracket syntax is using when available
2e515ea Merge pull request redhat-openstack#209 from txaj/add-conntrack
3bbfe77 Add conntrack module
5ef3917 Cleaning the now redundant LoadPlugin declaration
b671d00 Uses the LoadPlugin syntax with bracket when supported
1b75c78 Merge pull request redhat-openstack#201 from bogus-py/curl
c16a8d6 Merge pull request redhat-openstack#206 from muling-tt/master
3e13ce6 Merge pull request redhat-openstack#208 from pdxcat/fix_travis2
bd830de Fix travis by using plabs gemfile
1c481f7 Basic acceptance test with beaker
5802325 Add cpufreq plugin
ca2f400 Add cpufreq plugin doc
3abf175 Merge pull request redhat-openstack#205 from petems/patch-1
02ca5d8 Fix Puppet deprecation warning
4d01659 curl: fix handling of some parameters
8889605 Merge pull request redhat-openstack#198 from ByteInternet/zfs_arc
0899e82 Merge pull request redhat-openstack#199 from ByteInternet/write_graphite_logsenderrors
86962bb Support LogSendErrors on the write_graphite plugin
8d457c9 Add collectd::plugin::zfs_arc
4fa9f16 Merge pull request redhat-openstack#197 from guerremdq/patch-1
520c382 Add "" to Hostname
724e215 Merge pull request redhat-openstack#196 from jpds/entropy-example-fix
e9e16b7 README.md: Fixed example entropy snippet.
3b694bc Merge pull request redhat-openstack#195 from quiffman/master
e58fb05 Double quote the csv plugin DataDir.
bff587b Merge pull request redhat-openstack#193 from radford/curl-json-sock
e606d73 Merge pull request redhat-openstack#191 from bdossantos/fix/curl_MeasureResponseTime
ff1831d Merge pull request redhat-openstack#178 from joshgarnett/master
822ac69 Merge pull request redhat-openstack#192 from radford/write-http-storerates-bool
44766fb curl_json: Support reading from a unix socket
b1d0f1c write_http: StoreRates is a bool, not a string
9a092b4 Use '@plugininstance' to avoid warning message about deprecation
68b7b13 Merge pull request redhat-openstack#190 from dedded/apache-fix
7489cc8 curl : 'MeasureResponseTime' needs exactly one boolean argument
2181dc4 Add collectd-apache package needed on RedHat
f08d58c Merge pull request redhat-openstack#188 from cloudevelops/consolidate-python-plugin-2
a5aa0ae Merge pull request redhat-openstack#189 from cloudevelops/consolidate-curl-json-plugin
7cf838f New style naming and permissions for curl_json plugin
27ad95b Ensured deprecated file removed
462b312 Merge pull request redhat-openstack#186 from czhujer/master
ebf9ae7 Merge pull request redhat-openstack#187 from rjw1/patch-1
c6abe0a add a missing p
dd7f921 add missing package
6d92f5d Merge pull request redhat-openstack#185 from smoeding/fix-network-plugin
29a9837 Variables in templates should use @-notation
3b691fd Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request May 11, 2015
1e6be5d3b0b920be9fee9873ab49609766d93e46 Merge pull request redhat-openstack#202 from puppetlabs/modulesync_updates
3a09f845f4cf4182617ee80a4ec90804b740af1a beaker gemfile fixes
f255e7467b5820bab87a268cf3cab8a90d1c656f sync via modulesync
f2acb2dfc2cdbfa4aa61acdf463656fb94e535c6 sync via modulesync
9243aefd1c57e12439610f5d6a82144e70bb904c Merge pull request redhat-openstack#201 from fatmcgav/PR190_fixup
8f7d2489c48ebbb6e36e417f9355aa4ece37483d Pin Puppetlabs-apt module to 1.8.x, as incompatible with 2.x Also incorporates strider's changes for rspec-puppet 2.x. spec: updates for rspec-puppet 2.x and rspec 3.x
801a82b03b9f6af36f2bc842c7114831d59b5d07 Merge pull request redhat-openstack#191 from strider/puppet4
90bd357bbb916463c105bb85bca46d2d87ca4f97 Merge pull request redhat-openstack#189 from lorello/master
a91fd23ed30551b8295a3589a1144f473891848c Add Puppet 4.x lint checks
8b5f00f81b23ae8812d9d1b6757b99a7099c4057 changed apt key to 40 chars to remove apt module warning

Change-Id: I887147ddf2cfde5b4dd458f6a22400c67b2171f9
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request May 11, 2015
1e6be5d3b0b920be9fee9873ab49609766d93e46 Merge pull request redhat-openstack#202 from puppetlabs/modulesync_updates
3a09f845f4cf4182617ee80a4ec90804b740af1a beaker gemfile fixes
f255e7467b5820bab87a268cf3cab8a90d1c656f sync via modulesync
f2acb2dfc2cdbfa4aa61acdf463656fb94e535c6 sync via modulesync
9243aefd1c57e12439610f5d6a82144e70bb904c Merge pull request redhat-openstack#201 from fatmcgav/PR190_fixup
8f7d2489c48ebbb6e36e417f9355aa4ece37483d Pin Puppetlabs-apt module to 1.8.x, as incompatible with 2.x Also incorporates strider's changes for rspec-puppet 2.x. spec: updates for rspec-puppet 2.x and rspec 3.x
801a82b03b9f6af36f2bc842c7114831d59b5d07 Merge pull request redhat-openstack#191 from strider/puppet4
90bd357bbb916463c105bb85bca46d2d87ca4f97 Merge pull request redhat-openstack#189 from lorello/master
a91fd23ed30551b8295a3589a1144f473891848c Add Puppet 4.x lint checks
8b5f00f81b23ae8812d9d1b6757b99a7099c4057 changed apt key to 40 chars to remove apt module warning
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Oct 19, 2015
Update apache to 9c1047d

9c1047d Merge pull request #1226 from DavidS/MODULES-2655-fix-sslprotocol-test
72df6f3 (MODULES-2655) Fix acceptance testing for SSLProtocol behaviour for real
3c953de Merge pull request #1225 from DavidS/multiple-fixes
1d46f7b (MODULES-2655) fix acceptance tests to correctly detect SELinux
94b2f0f (MODULES-2680) fix default nodeset to actually work
a2a6395 Merge pull request #1218 from damonconway/2673
680f3a9 (MODULES-2673) Adding dev_packages to apache class. Allows use of httpd24u-devel from the IUS repo.
6124598 Merge pull request #1224 from DavidS/allow_no_docroot
b63aac2 (MAINT) add a small test for no-docroot-mode
3a1a4e4 Merge pull request #1216 from bmfurtado/MODULES-2655
bb5b27e Added tests and updated docs for string and array support on ssl_protocol for apache::vhost.
f57f7f7 (MODULES-2120) Allow empty docroot
d57816b Added support for both string and array on ssl_protocol for apache::vhost
8447589 Change SSLProtocol in apache::vhost to be space separated

Update cinder to f7524dac1bab750db82a341d0fb61ba0cc7179d7

f7524dac1bab750db82a341d0fb61ba0cc7179d7 Merge "Specify a dedicated keystone user for cinderv2"
43dcec66ba41ebac2895159e7dea3cb1d4cae498 Merge "Put all the logging related parameters to the logging class"
18f2db7a1def9322a7b6b8693f5c84eafe988eff Specify a dedicated keystone user for cinderv2
d0b0f897f1ac3e1e030901ffcde2d9cf93f098d4 Merge "Remove deprecated mysql_module"
7fe7d77bf3010a1e9c6559e5435c72ed6ff4190e Put all the logging related parameters to the logging class
6e192209432e0a9a8bc2d4b9032fb5a93844bc1b Remove deprecated mysql_module

Update firewall to 2d870c46e95850ff6ee8bda19f48381512be1af7

2d870c46e95850ff6ee8bda19f48381512be1af7 Merge pull request #574 from DavidS/fix-selinux
55c838db80688edf63f0e70dcf2b755885b4a3f8 (MAINT) RedHat 6 also uses unconfined_t

Update glance to 3ffcc382d0ed3e3cd441830d59965dd62a2be7e0

3ffcc382d0ed3e3cd441830d59965dd62a2be7e0 Merge "Remove deprecated mysql_module"
26cbd53d991b4bbfcae1f354ab5cc16908185a3e Remove deprecated mysql_module

Update haproxy to 1c218e6fca7c217a94bc6046381bd4d6449223a4

1c218e6fca7c217a94bc6046381bd4d6449223a4 Merge pull request redhat-openstack#201 from traylenator/config_file
fe6fcb1059a482587f8a8be4a010cf31ad4f92f7 (MODULES-2704) Consistent use of ::haproxy::config_file

Update heat to f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d

f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d Missing domain in keystone::domain

Update ironic to 93018353468db291aa79b30656df85cfe4dee554

93018353468db291aa79b30656df85cfe4dee554 Merge "Simplify rpc_backend parameter"
8724c8f4a27e3e30fbae1e3dd1edfb573ffb652d Simplify rpc_backend parameter

Update keystone to 93af53da67370bc52b4f42ac08f6c5963ce7bb4e

93af53da67370bc52b4f42ac08f6c5963ce7bb4e Merge "Federation acceptance: bump packages to latest"
d2c44f731caa1ac3e57c407fc63c0c790e99e43f Replace indirection calls
a88ede3fe156e8057bb237f30926a5996dce7a82 Federation acceptance: bump packages to latest

Update manila to 3122525fe061364450e2e37cb293d24b2a3f2e5c

3122525fe061364450e2e37cb293d24b2a3f2e5c Merge "Put all the logging related parameters to the logging class"
0fa8d193d4b3ea8a6bf7ce379f6d703e01210960 Put all the logging related parameters to the logging class

Update mysql to 87b7e4de9cdc5feae49015c1d829e2e74f6c355b

87b7e4de9cdc5feae49015c1d829e2e74f6c355b Merge pull request #766 from DavidS/modules-2683-fix-root-password-hiding
5f49c45b2eab1a655b1547397806dd024ee82b5e (MODULES-2683) fix version compare to properly suppress show_diff for root password
6527a3aa22a79eb8a7fb554c9ddee7e53f4e534f (MAINT) switch to rspec-puppet-facts

Update neutron to 4b08d26f2f5a7d5f382b80a4631d7cca878f8a17

4b08d26f2f5a7d5f382b80a4631d7cca878f8a17 Merge "Delete namespaces by default"
3a1b5bec8bd4b25c0424c4bab0b0ec959d98c9b4 Merge "disable third-party software management"
4408e648f48ef8b500aa1a35018081623051c6f8 Delete namespaces by default
46a84300df5b7dda1d811a969f7660b818eeb6be Merge "dbsync should only notify services that use the db"
b9a1f479cfac84c98fa96b0ffabe08a9e847c03b disable third-party software management
fdf49deed8d64cea83b079b79d13d89df49926e3 dbsync should only notify services that use the db

Update redis to 4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed

4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed Add a option to override the service provider

Update stdlib to 2db7440

2db7440 Merge pull request #538 from mmckinst/bool2str_enhance
6de1a6e add functionality to bool2str to return strings of your choice for a boolean
39126a7 Merge pull request #539 from mentat/MODULES-2696
6aa7f2d Add check to ensure regex does not throw for none type.
57a8485 Merge pull request #537 from cmurphy/fix_load_module_metadata
25410c4 Let load_module_metadata succeed on empty file
0f8df10 Rename load_module_metadata test path
5b3c623 Merge pull request #536 from DavidS/improve-file_line-docs
ad173f2 (MODULES-2421) improve description of file_line

Update trove to 03f5a793a63e3788d92bda067b1b342a07db3ff7

03f5a793a63e3788d92bda067b1b342a07db3ff7 Simplify rpc_backend parameter

Update vcsrepo to 99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a

99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a Merge pull request redhat-openstack#273 from hunner/fix_trustcert
bf0f40ae4efa9095ca9a877acefdb781e1fbf1cd Fix :false to be default value
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Oct 19, 2015
Update apache to 9c1047d

9c1047d Merge pull request #1226 from DavidS/MODULES-2655-fix-sslprotocol-test
72df6f3 (MODULES-2655) Fix acceptance testing for SSLProtocol behaviour for real
3c953de Merge pull request #1225 from DavidS/multiple-fixes
1d46f7b (MODULES-2655) fix acceptance tests to correctly detect SELinux
94b2f0f (MODULES-2680) fix default nodeset to actually work
a2a6395 Merge pull request #1218 from damonconway/2673
680f3a9 (MODULES-2673) Adding dev_packages to apache class. Allows use of httpd24u-devel from the IUS repo.
6124598 Merge pull request #1224 from DavidS/allow_no_docroot
b63aac2 (MAINT) add a small test for no-docroot-mode
3a1a4e4 Merge pull request #1216 from bmfurtado/MODULES-2655
bb5b27e Added tests and updated docs for string and array support on ssl_protocol for apache::vhost.
f57f7f7 (MODULES-2120) Allow empty docroot
d57816b Added support for both string and array on ssl_protocol for apache::vhost
8447589 Change SSLProtocol in apache::vhost to be space separated

Update cinder to f7524dac1bab750db82a341d0fb61ba0cc7179d7

f7524dac1bab750db82a341d0fb61ba0cc7179d7 Merge "Specify a dedicated keystone user for cinderv2"
43dcec66ba41ebac2895159e7dea3cb1d4cae498 Merge "Put all the logging related parameters to the logging class"
18f2db7a1def9322a7b6b8693f5c84eafe988eff Specify a dedicated keystone user for cinderv2
d0b0f897f1ac3e1e030901ffcde2d9cf93f098d4 Merge "Remove deprecated mysql_module"
7fe7d77bf3010a1e9c6559e5435c72ed6ff4190e Put all the logging related parameters to the logging class
6e192209432e0a9a8bc2d4b9032fb5a93844bc1b Remove deprecated mysql_module

Update firewall to 2d870c46e95850ff6ee8bda19f48381512be1af7

2d870c46e95850ff6ee8bda19f48381512be1af7 Merge pull request #574 from DavidS/fix-selinux
55c838db80688edf63f0e70dcf2b755885b4a3f8 (MAINT) RedHat 6 also uses unconfined_t

Update glance to 3ffcc382d0ed3e3cd441830d59965dd62a2be7e0

3ffcc382d0ed3e3cd441830d59965dd62a2be7e0 Merge "Remove deprecated mysql_module"
26cbd53d991b4bbfcae1f354ab5cc16908185a3e Remove deprecated mysql_module

Update haproxy to 1c218e6fca7c217a94bc6046381bd4d6449223a4

1c218e6fca7c217a94bc6046381bd4d6449223a4 Merge pull request redhat-openstack#201 from traylenator/config_file
fe6fcb1059a482587f8a8be4a010cf31ad4f92f7 (MODULES-2704) Consistent use of ::haproxy::config_file

Update heat to f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d

f592e646c4b6ca1b6f06cd6e3e01ea43f692b56d Missing domain in keystone::domain

Update ironic to 93018353468db291aa79b30656df85cfe4dee554

93018353468db291aa79b30656df85cfe4dee554 Merge "Simplify rpc_backend parameter"
8724c8f4a27e3e30fbae1e3dd1edfb573ffb652d Simplify rpc_backend parameter

Update keystone to 93af53da67370bc52b4f42ac08f6c5963ce7bb4e

93af53da67370bc52b4f42ac08f6c5963ce7bb4e Merge "Federation acceptance: bump packages to latest"
d2c44f731caa1ac3e57c407fc63c0c790e99e43f Replace indirection calls
a88ede3fe156e8057bb237f30926a5996dce7a82 Federation acceptance: bump packages to latest

Update manila to 3122525fe061364450e2e37cb293d24b2a3f2e5c

3122525fe061364450e2e37cb293d24b2a3f2e5c Merge "Put all the logging related parameters to the logging class"
0fa8d193d4b3ea8a6bf7ce379f6d703e01210960 Put all the logging related parameters to the logging class

Update mysql to 87b7e4de9cdc5feae49015c1d829e2e74f6c355b

87b7e4de9cdc5feae49015c1d829e2e74f6c355b Merge pull request #766 from DavidS/modules-2683-fix-root-password-hiding
5f49c45b2eab1a655b1547397806dd024ee82b5e (MODULES-2683) fix version compare to properly suppress show_diff for root password
6527a3aa22a79eb8a7fb554c9ddee7e53f4e534f (MAINT) switch to rspec-puppet-facts

Update neutron to 4b08d26f2f5a7d5f382b80a4631d7cca878f8a17

4b08d26f2f5a7d5f382b80a4631d7cca878f8a17 Merge "Delete namespaces by default"
3a1b5bec8bd4b25c0424c4bab0b0ec959d98c9b4 Merge "disable third-party software management"
4408e648f48ef8b500aa1a35018081623051c6f8 Delete namespaces by default
46a84300df5b7dda1d811a969f7660b818eeb6be Merge "dbsync should only notify services that use the db"
b9a1f479cfac84c98fa96b0ffabe08a9e847c03b disable third-party software management
fdf49deed8d64cea83b079b79d13d89df49926e3 dbsync should only notify services that use the db

Update redis to 4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed

4a6c6a1a741354950b1ce0f31b8fdaa9254de4ed Add a option to override the service provider

Update stdlib to 2db7440

2db7440 Merge pull request #538 from mmckinst/bool2str_enhance
6de1a6e add functionality to bool2str to return strings of your choice for a boolean
39126a7 Merge pull request #539 from mentat/MODULES-2696
6aa7f2d Add check to ensure regex does not throw for none type.
57a8485 Merge pull request #537 from cmurphy/fix_load_module_metadata
25410c4 Let load_module_metadata succeed on empty file
0f8df10 Rename load_module_metadata test path
5b3c623 Merge pull request #536 from DavidS/improve-file_line-docs
ad173f2 (MODULES-2421) improve description of file_line

Update trove to 03f5a793a63e3788d92bda067b1b342a07db3ff7

03f5a793a63e3788d92bda067b1b342a07db3ff7 Simplify rpc_backend parameter

Update vcsrepo to 99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a

99e8b2e28ce9541202b8b2438a92ee8ac2b03d6a Merge pull request redhat-openstack#273 from hunner/fix_trustcert
bf0f40ae4efa9095ca9a877acefdb781e1fbf1cd Fix :false to be default value

Change-Id: I505e156a08c157a536ba0c922a2ef90083bbf10e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant