x/fuel-plugin-elasticsearch-kibana
Code Issues Proposed changes

Use the hiera default mechanism for plugins

Browse Source 
Change-Id: I61bb0a28b3743c7ee4e0ee0621bff09db47f32bd
This commit is contained in:
Swann Croiset
2016-01-04 17:17:27 +01:00
parent 4688dbcde4
commit 55eacfa28a
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
deployment_scripts/puppet/manifests/hiera_override.pp
View File

@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
$hiera_dir = '/etc/hiera/override' $hiera_dir = '/etc/hiera/plugins'
$plugin_name = 'elasticsearch_kibana' $plugin_name = 'elasticsearch_kibana'
$plugin_yaml = "${plugin_name}.yaml" $plugin_yaml = "${plugin_name}.yaml"
$corosync_roles = [$plugin_name] $corosync_roles = [$plugin_name]
@@ -64,20 +64,7 @@ lma::elasticsearch::recover_after_time: <%= @recover_after_time %>
lma::elasticsearch::recover_after_nodes: <%= @recover_after_nodes %> lma::elasticsearch::recover_after_nodes: <%= @recover_after_nodes %>
') ')
file {$hiera_dir:
ensure => directory,
} ->
file { "${hiera_dir}/${plugin_yaml}": file { "${hiera_dir}/${plugin_yaml}":
ensure => file, ensure => file,
content => "${calculated_content}\n", content => "${calculated_content}\n",
} }
package {'ruby-deep-merge':
ensure => 'installed',
}
file_line {"${plugin_name}_hiera_override":
path => '/etc/hiera.yaml',
line => " - override/${plugin_name}",
after => ' - "override/module/%{calling_module}"',
}