Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[For Review] Add Elasticsearch 5.3.3 #70

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion puppet/Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ mod 'puppetlabs-apt', "4.1.0"
mod 'puppetlabs-mysql'
mod 'puppetlabs-vcsrepo'
mod 'puppetlabs-stdlib'

mod 'ftaeger-mailhog',
:git => "https://github.com/jeffgeorge/ftaeger-mailhog.git",
:ref => "remove_wget_cache_dir"

mod 'saz-memcached'
mod 'elastic-elasticsearch', '5.4.3'

mod 'clwdev-precip', :path => '/vagrant/puppet/precip'
mod 'clwdev-precip', :path => '/vagrant/puppet/precip'
38 changes: 27 additions & 11 deletions puppet/Puppetfile.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,38 @@
FORGE
remote: https://forgeapi.puppetlabs.com
specs:
elastic-elasticsearch (5.4.3)
puppet-yum (< 3.0.0, >= 0.9.6)
puppetlabs-apt (< 5.0.0, >= 2.0.0)
puppetlabs-java (< 3.0.0, >= 1.0.0)
puppetlabs-stdlib (< 5.0.0, >= 4.6.0)
richardc-datacat (< 1.0.0, >= 0.6.2)
puppet-archive (1.3.0)
puppetlabs-stdlib (< 5.0.0, >= 4.6.0)
puppet-staging (2.2.0)
puppetlabs-apache (1.11.0)
puppetlabs-concat (< 3.0.0, >= 1.1.1)
puppetlabs-stdlib (< 5.0.0, >= 4.2.0)
puppet-yum (2.0.1)
puppetlabs-concat (< 5.0.0, >= 1.2.5)
puppetlabs-stdlib (< 5.0.0, >= 4.10.0)
puppetlabs-apache (2.0.0)
puppetlabs-concat (< 5.0.0, >= 2.2.1)
puppetlabs-stdlib (< 5.0.0, >= 4.13.1)
puppetlabs-apt (4.1.0)
puppetlabs-stdlib (< 5.0.0, >= 4.16.0)
puppetlabs-concat (2.2.1)
puppetlabs-stdlib (< 5.0.0, >= 4.2.0)
puppetlabs-firewall (1.8.1)
puppetlabs-concat (4.0.1)
puppetlabs-stdlib (< 5.0.0, >= 4.13.1)
puppetlabs-firewall (1.9.0)
puppetlabs-java (2.1.0)
puppet-archive (< 2.0.0, >= 1.1.0)
puppetlabs-stdlib (< 5.0.0, >= 4.13.1)
puppetlabs-mysql (3.11.0)
puppet-staging (< 3.0.0, >= 1.0.1)
puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
puppetlabs-stdlib (4.16.0)
puppetlabs-vcsrepo (1.4.0)
saz-memcached (2.8.1)
puppetlabs-firewall (>= 0.1.0)
puppetlabs-stdlib (>= 3.2.0)
puppetlabs-stdlib (4.19.0)
puppetlabs-vcsrepo (2.0.0)
richardc-datacat (0.6.2)
saz-memcached (3.0.2)
puppetlabs-firewall (< 2.0.0, >= 0.1.0)
puppetlabs-stdlib (< 6.0.0, >= 4.6.0)

GIT
remote: https://github.com/jeffgeorge/ftaeger-mailhog.git
Expand All @@ -34,6 +49,7 @@ PATH

DEPENDENCIES
clwdev-precip (>= 0)
elastic-elasticsearch (= 5.4.3)
ftaeger-mailhog (>= 0)
puppetlabs-apache (>= 0)
puppetlabs-apt (= 4.1.0)
Expand Down
8 changes: 0 additions & 8 deletions puppet/precip/Modulefile

This file was deleted.

18 changes: 18 additions & 0 deletions puppet/precip/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'vim',
'g++',
'software-properties-common',
'ruby-augeas',
]:
ensure => present,
}
Expand Down Expand Up @@ -98,6 +99,23 @@

# Install Memcached
class { 'memcached': }

# Install Elasticsearch
# (Allows VM host access and enables CORS for all .vm hosts)
class { 'elasticsearch':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two stylistic items here:

  1. Two Spaces instead of tabs, please: http://puppet-lint.com/checks/hard_tabs/
  2. Line up arrows under the config element: http://puppet-lint.com/checks/arrow_alignment/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additionally, rather than just adding Elasticsearch by default, I'd like to see it wrapped in a feature-switch. So, new object in config.rb, Vagrantfile and a new Fact, tracking enabled optional things. We can then use the same kind of functionality to optionally provision Solr, or optionally provision PML, or optionally provision in-box theme compilation tools.

I'd also like to see any optional things pulled into their own class in their own Puppet file.

restart_on_change => true,
java_install => true,
instances => {
'es-01' => {
'config' => {
'network.host' => '0.0.0.0',
'network.bind_host' => '0',
'http.cors.enabled' => 'true',
'http.cors.allow-origin' => '/https?:\/\/.*\.vm/',
},
},
},
}

# Install Mailhog, back to being handled by ftaeger-mailhog
class { 'mailhog': }
Expand Down
14 changes: 14 additions & 0 deletions puppet/precip/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "clwdev-precip",
"version": "0.0.3",
"author": "Travelopia, Inc. (Clearwater Development Team)",
"summary": "Builds and configures a full-featured Acquia Cloud–oriented LAMP+ infrastructure for Drupal–based applications.",
"license": "MIT",
"source": "https://github.com/clwdev/precip/puppet/precip",
"project_page": "https://github.com/clwdev/precip",
"issues_url": "https://github.com/clwdev/precip/issues",
"description": "This puppet module defines a full-featured LAMP Stack for local development of Drupal sites, and (pretty closely) mirrors how Acquia Cloud Drupal Environments work. It's the special-sauce behind the Precip vagrant box.",
"dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0 < 5.0.0" }
]
}