Create fuel_lma_collector module
This change introduces the fuel_lma_collector Puppet module. This new module contains all the code which was in the lma_collector module and relies on the way Fuel uses Puppet like the use of Hiera. Change-Id: Ibfe97e745742b3f9718f873a8d564ed87476f334 Implements: blueprint lma-without-fuel
This commit is contained in:
parent
c71bf7a6bb
commit
b5d7fa5f9e
|
@ -14,9 +14,9 @@
|
|||
#
|
||||
include lma_collector::params
|
||||
|
||||
$lma = hiera_hash('lma_collector', {})
|
||||
$roles = node_roles(hiera('nodes'), hiera('uid'))
|
||||
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
|
||||
$lma = hiera_hash('lma_collector', {})
|
||||
$roles = node_roles(hiera('nodes'), hiera('uid'))
|
||||
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
|
||||
|
||||
$alarms_definitions = $lma['alarms']
|
||||
if $alarms_definitions == undef {
|
||||
|
@ -32,7 +32,7 @@ if $is_controller {
|
|||
}
|
||||
}
|
||||
|
||||
class { 'lma_collector::afds':
|
||||
class { 'fuel_lma_collector::afds':
|
||||
roles => hiera('roles'),
|
||||
node_cluster_roles => $lma['node_cluster_roles'],
|
||||
service_cluster_roles => $lma['service_cluster_roles'],
|
||||
|
|
|
@ -32,11 +32,11 @@ if ($plugin_data) {
|
|||
default => false,
|
||||
}
|
||||
|
||||
lma_collector::hiera_data { 'gse_filters':
|
||||
content => template('lma_collector/gse_filters.yaml.erb')
|
||||
fuel_lma_collector::hiera_data { 'gse_filters':
|
||||
content => template('fuel_lma_collector/gse_filters.yaml.erb')
|
||||
}
|
||||
|
||||
lma_collector::hiera_data { 'alarming':
|
||||
content => template('lma_collector/alarming.yaml.erb')
|
||||
fuel_lma_collector::hiera_data { 'alarming':
|
||||
content => template('fuel_lma_collector/alarming.yaml.erb')
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/*
|
||||
!/heka
|
||||
!/lma_collector
|
||||
!/fuel_lma_collector
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
fixtures:
|
||||
repositories:
|
||||
stdlib:
|
||||
repo: "git://github.com/puppetlabs/puppetlabs-stdlib"
|
||||
ref: "4.7.0"
|
||||
symlinks:
|
||||
fuel_lma_collector: "#{source_dir}"
|
||||
lma_collector: "#{source_dir}/../lma_collector"
|
||||
heka: "#{source_dir}/../heka"
|
|
@ -0,0 +1,8 @@
|
|||
spec/fixtures/modules/*
|
||||
spec/fixtures/manifests/*
|
||||
Gemfile.lock
|
||||
tests/lua/mocks/date_time.lua
|
||||
.bundle
|
||||
tests/lua/mocks/inspect.lua
|
||||
tests/lua/mocks/anomaly.lua
|
||||
tests/lua/mocks/annotation.lua
|
|
@ -0,0 +1,27 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
source 'https://rubygems.org'
|
||||
|
||||
group :development, :test do
|
||||
gem 'rake'
|
||||
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
|
||||
gem 'rspec'
|
||||
gem 'rspec-puppet'
|
||||
gem 'rspec-puppet-facts'
|
||||
gem 'puppetlabs_spec_helper'
|
||||
gem 'metadata-json-lint'
|
||||
# Need to use master branch of puppet-lint because of
|
||||
# https://github.com/rodjek/puppet-lint/issues/355
|
||||
gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
|
||||
end
|
|
@ -0,0 +1,202 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright {yyyy} {name of copyright owner}
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# fuel_lma_collector
|
||||
|
||||
## Overview
|
||||
|
||||
The `fuel_lma_collector` module provides classes and defines to ease the
|
||||
deployment of the LMA collectors in a Fuel environment.
|
||||
|
||||
## Usage
|
||||
|
||||
TBD
|
||||
|
||||
Limitations
|
||||
-----------
|
||||
|
||||
|
||||
License
|
||||
-------
|
||||
|
||||
Licensed under the terms of the Apache License, version 2.0.
|
||||
|
||||
Contact
|
||||
-------
|
||||
|
||||
Simon Pasquier, <spasquier@mirantis.com>
|
||||
|
||||
Support
|
||||
-------
|
||||
|
||||
See the Contact section.
|
|
@ -0,0 +1,25 @@
|
|||
require 'puppetlabs_spec_helper/rake_tasks'
|
||||
require 'puppet-lint/tasks/puppet-lint'
|
||||
require 'puppet-syntax/tasks/puppet-syntax'
|
||||
require 'metadata-json-lint/rake_task'
|
||||
|
||||
PuppetLint.configuration.fail_on_warnings = true
|
||||
PuppetLint.configuration.send('disable_80chars')
|
||||
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
|
||||
PuppetLint.configuration.send('disable_class_parameter_defaults')
|
||||
|
||||
exclude_paths = [
|
||||
"pkg/**/*",
|
||||
"vendor/**/*",
|
||||
"spec/**/*",
|
||||
]
|
||||
PuppetLint.configuration.ignore_paths = exclude_paths
|
||||
PuppetSyntax.exclude_paths = exclude_paths
|
||||
|
||||
desc "Run metadata_lint, lint, syntax, and spec tests."
|
||||
task :test => [
|
||||
:metadata_lint,
|
||||
:lint,
|
||||
:syntax,
|
||||
:spec,
|
||||
]
|
|
@ -13,7 +13,7 @@
|
|||
# under the License.
|
||||
#
|
||||
|
||||
class lma_collector::afds (
|
||||
class fuel_lma_collector::afds (
|
||||
$roles = undef,
|
||||
$node_cluster_roles = undef,
|
||||
$service_cluster_roles = undef,
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
# Copyright 2016 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
|
@ -11,7 +11,7 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
define lma_collector::hiera_data (
|
||||
define fuel_lma_collector::hiera_data (
|
||||
$content,
|
||||
$ensure = present,
|
||||
) {
|
|
@ -0,0 +1,25 @@
|
|||
{
|
||||
"name": "mirantis-fuel_lma_collector",
|
||||
"version": "1.0.0",
|
||||
"author": "Simon Pasquier <spasquier@mirantis.com>",
|
||||
"summary": "Puppet Fuel LMA Collector Module",
|
||||
"license": "Apache-2.0",
|
||||
"source": "git://git.openstack.org/cgit/openstack/fuel-plugin-lma-collector.git",
|
||||
"project_page": "none",
|
||||
"issues_url": "none",
|
||||
"operatingsystem_support": [
|
||||
{
|
||||
"operatingsystem": "Ubuntu",
|
||||
"operatingsystemrelease": ["14.04"]
|
||||
}
|
||||
],
|
||||
"requirements": [
|
||||
{"name": "puppet", "version_requirement": "3.x"},
|
||||
{"name": "pe", "version_requirement": "3.x"}
|
||||
],
|
||||
"description": "Puppet module for configuring the LMA collector service in a Fuel deployment",
|
||||
"dependencies": [
|
||||
{"name": "mirantis/lma_collector", "version_requirement": "1.x"},
|
||||
{"name": "puppetlabs/stdlib", "version_requirement": "4.x"}
|
||||
]
|
||||
}
|
|
@ -13,7 +13,7 @@
|
|||
# under the License.
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'lma_collector::afds' do
|
||||
describe 'fuel_lma_collector::afds' do
|
||||
let(:facts) do
|
||||
{:kernel => 'Linux', :operatingsystem => 'Ubuntu',
|
||||
:osfamily => 'Debian'}
|
|
@ -14,7 +14,7 @@
|
|||
require 'spec_helper'
|
||||
require 'yaml'
|
||||
|
||||
describe 'lma_collector::hiera_data' do
|
||||
describe 'fuel_lma_collector::hiera_data' do
|
||||
let(:title) { :foo }
|
||||
let(:facts) do
|
||||
{:kernel => 'Linux', :operatingsystem => 'Ubuntu',
|
|
@ -0,0 +1,6 @@
|
|||
--format
|
||||
s
|
||||
--colour
|
||||
--loadby
|
||||
mtime
|
||||
--backtrace
|
|
@ -0,0 +1,22 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
require 'rspec-puppet'
|
||||
|
||||
fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
|
||||
|
||||
RSpec.configure do |c|
|
||||
c.module_path = File.join(fixture_path, 'modules')
|
||||
c.manifest_dir = File.join(fixture_path, 'manifests')
|
||||
c.environmentpath = File.join(Dir.pwd, 'spec')
|
||||
end
|
13
tox.ini
13
tox.ini
|
@ -1,5 +1,5 @@
|
|||
[tox]
|
||||
envlist = manifests,heka,lma_collector,docs,qa_docs,build_plugin,collectd_python
|
||||
envlist = manifests,heka,fuel_lma_collector,lma_collector,docs,qa_docs,build_plugin,collectd_python
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
|
@ -39,6 +39,17 @@ commands =
|
|||
bundle install --path {toxinidir}/.bundled_gems
|
||||
bundle exec rake test
|
||||
|
||||
[testenv:fuel_lma_collector]
|
||||
deps =
|
||||
changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
|
||||
whitelist_externals =
|
||||
bundle
|
||||
mkdir
|
||||
commands =
|
||||
mkdir -p {toxinidir}/.bundled_gems
|
||||
bundle install --path {toxinidir}/.bundled_gems
|
||||
bundle exec rake test
|
||||
|
||||
[flake8]
|
||||
ignore = H105,H201,E241,H401
|
||||
exclude = haproxy.py
|
||||
|
|
Loading…
Reference in New Issue