itamae-plugin-recipe-consul 0.1.0.beta1 → 0.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6668ddb6110c3d51b955f3826e1b6a06d35929
-  data.tar.gz: dca2477ed81f92ad162395dddae1c8268edc12dd
+  metadata.gz: 35dff917fe52d426622f41c69854e171cee51e7b
+  data.tar.gz: 146d79c36514f64ffbf195a7f2ac21d9c48d3cc6
 SHA512:
-  metadata.gz: 8c786cfcc1dc058983904442e8ec23e64597b2305b8fb9877206c1b31ebee98d881ba9073c4bdd689b57a62f3eacf8b67e4d9876d5bdfef3d0e352fbc175ba56
-  data.tar.gz: 7803b99b34b2e1dc54d7c1911b4b7a312dab0efe1432ed3d6fb75c2fc8051f6e60c85ff3725cf396546a113da97fb4a54249678ca79bc40191d8c4683d10a9f3
+  metadata.gz: fed4298985a184b34fa70600a9e3f20edb526316c8008ac05632a6a04d788441b4d68dd9d77aec3d71c3d45f9e72615b540b4a139d5438d198e5907569fc0fb4
+  data.tar.gz: 326ca4a203a0896efe4726ae80aa4b5aff4a08574bc1e9bb1b1b81ec60a78acc4db14bc04d08df17fe6eff7953c80d4b235a8c7af4020737f4193775890e5876

data/README.md

@@ -2,6 +2,7 @@
 
 Itamae plugin to install [Consul](https://www.consul.io/) with init scripts
 
+[![Gem Version](https://badge.fury.io/rb/itamae-plugin-recipe-consul.svg)](https://badge.fury.io/rb/itamae-plugin-recipe-consul)
 [![Dependency Status](https://gemnasium.com/badges/github.com/sue445/itamae-plugin-recipe-consul.svg)](https://gemnasium.com/github.com/sue445/itamae-plugin-recipe-consul)
 
 [![wercker status](https://app.wercker.com/status/1d28d36364b4f79161fc248c6c934072/m/master "wercker status")](https://app.wercker.com/project/bykey/1d28d36364b4f79161fc248c6c934072)
@@ -78,7 +79,7 @@ bundle exec rake itamae:centos70
 bundle exec rake spec:centos70
 ```
 
-see [Vagrantfile](Vagrantfile) and [Rakefile](Rakefile)
+Avairable hosts are defined in [Vagrantfile](Vagrantfile) and [Rakefile](Rakefile)
 
 ## Contributing
 
@@ -89,3 +90,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/sue445
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+## Special thanks
+systemd unit file and init.d script
+
+http://qiita.com/yunano/items/7ef5fa5670721de55627

data/Rakefile

@@ -9,10 +9,11 @@ namespace :spec do
   task :all => HOSTS
 
   HOSTS.each do |host|
+    desc "Run serverspec to #{host}"
     RSpec::Core::RakeTask.new(host.to_sym) do |t|
       puts "Running tests to #{host} ..."
       ENV["TARGET_HOST"] = host
-      t.pattern = "spec/*_spec.rb"
+      t.pattern = "spec/**/*_spec.rb"
     end
   end
 end
@@ -21,7 +22,7 @@ namespace :itamae do
   task :all => HOSTS
 
   HOSTS.each do |host|
-    desc "Running itamae to #{host}"
+    desc "Run itamae to #{host}"
     task host do
       sh "bundle exec itamae ssh --host=#{host} --vagrant --node-yaml=recipes/node.yml recipes/install.rb"
     end

data/lib/itamae/plugin/recipe/consul/default.rb

@@ -1,19 +1,3 @@
-node.validate! do
-  {
-    consul: {
-      version: string,
-    },
-  }
-end
-
-node.reverse_merge!(
-  consul: {
-    src_dir:    "/usr/local/src",
-    bin_dir:    "/usr/local/bin",
-    data_dir:   "/tmp/consul",
-    gomaxprocs: 2,
-  },
-)
-
-include_recipe "./download"
+include_recipe "./setup"
+include_recipe "./install"
 include_recipe "./service"

data/lib/itamae/plugin/recipe/consul/{download.rb → install.rb}

@@ -1,3 +1,4 @@
+# Download and install consul executable file
 package "unzip"
 
 zip_name = "consul_#{node[:consul][:version]}_linux_amd64.zip"

data/lib/itamae/plugin/recipe/consul/service/centos.rb

@@ -0,0 +1,9 @@
+if node[:platform_version].to_i >= 7
+  set_consul_systemd_unit "/etc/sysconfig/consul"
+else
+  set_consul_initd_script "/etc/sysconfig/consul"
+end
+
+service "consul" do
+  action [:enable, :start]
+end

data/lib/itamae/plugin/recipe/consul/service/debian.rb

@@ -0,0 +1,7 @@
+if node[:platform_version].to_i >= 8
+  set_consul_systemd_unit "/etc/default/consul"
+
+  service "consul" do
+    action [:enable, :start]
+  end
+end

data/lib/itamae/plugin/recipe/consul/service/default.rb

@@ -0,0 +1,12 @@
+# Setup init.d script or systemd unit
+include_recipe "./definitions"
+
+directory "/etc/consul.d"
+
+case node[:platform]
+when "debian"
+  include_recipe "./debian"
+
+when "redhat"
+  include_recipe "./centos"
+end

data/lib/itamae/plugin/recipe/consul/service/definitions.rb

@@ -0,0 +1,49 @@
+environment_content =
+  <<-EOS
+GOMAXPROCS=#{node[:consul][:gomaxprocs]}
+OPTIONS="#{node[:consul][:options]}"
+  EOS
+
+# Set systemd unit file
+define :set_consul_systemd_unit do
+  environment_file = params[:name]
+
+  file environment_file do
+    content environment_content
+  end
+
+  template "/etc/systemd/system/consul.service" do
+    variables(
+      environment_file: environment_file,
+      bin_path:         "#{node[:consul][:bin_dir]}/consul",
+      data_dir:         node[:consul][:data_dir],
+    )
+
+    notifies :run,     "execute[systemctl daemon-reload]"
+    notifies :restart, "service[consul]"
+  end
+
+  execute "systemctl daemon-reload" do
+    action :nothing
+  end
+end
+
+# Set init.d script
+define :set_consul_initd_script do
+  environment_file = params[:name]
+
+  file environment_file do
+    content environment_content
+  end
+
+  template "/etc/init.d/consul" do
+    mode "755"
+    variables(
+      environment_file: environment_file,
+      bin_path:         "#{node[:consul][:bin_dir]}/consul",
+      data_dir:         node[:consul][:data_dir],
+    )
+
+    notifies :restart, "service[consul]"
+  end
+end

data/lib/itamae/plugin/recipe/consul/setup.rb

@@ -0,0 +1,18 @@
+# Check required node values
+node.validate! do
+  {
+    consul: {
+      version: string,
+    },
+  }
+end
+
+# Set default node values
+node.reverse_merge!(
+  consul: {
+    src_dir:    "/usr/local/src",
+    bin_dir:    "/usr/local/bin",
+    data_dir:   "/tmp/consul",
+    gomaxprocs: 2,
+  },
+)

data/lib/itamae/plugin/recipe/consul/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Consul
-        VERSION = "0.1.0.beta1"
+        VERSION = "0.1.0.beta2"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-consul
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -101,12 +101,14 @@ files:
 - itamae-plugin-recipe-consul.gemspec
 - lib/itamae/plugin/recipe/consul.rb
 - lib/itamae/plugin/recipe/consul/default.rb
-- lib/itamae/plugin/recipe/consul/download.rb
-- lib/itamae/plugin/recipe/consul/service.rb
-- lib/itamae/plugin/recipe/consul/templates/etc/default/consul.erb
-- lib/itamae/plugin/recipe/consul/templates/etc/init.d/consul.erb
-- lib/itamae/plugin/recipe/consul/templates/etc/sysconfig/consul.erb
-- lib/itamae/plugin/recipe/consul/templates/etc/systemd/system/consul.service.erb
+- lib/itamae/plugin/recipe/consul/install.rb
+- lib/itamae/plugin/recipe/consul/service/centos.rb
+- lib/itamae/plugin/recipe/consul/service/debian.rb
+- lib/itamae/plugin/recipe/consul/service/default.rb
+- lib/itamae/plugin/recipe/consul/service/definitions.rb
+- lib/itamae/plugin/recipe/consul/service/templates/etc/init.d/consul.erb
+- lib/itamae/plugin/recipe/consul/service/templates/etc/systemd/system/consul.service.erb
+- lib/itamae/plugin/recipe/consul/setup.rb
 - lib/itamae/plugin/recipe/consul/version.rb
 - recipes/install.rb
 - recipes/node.yml

data/lib/itamae/plugin/recipe/consul/service.rb

@@ -1,78 +0,0 @@
-# ref. http://qiita.com/yunano/items/7ef5fa5670721de55627
-directory "/etc/consul.d"
-
-# Set systemd script
-define :consul_systemd_script do
-  environment_file = params[:name]
-
-  template "/etc/systemd/system/consul.service" do
-    variables(
-      environment_file: environment_file,
-      bin_path:         "#{node[:consul][:bin_dir]}/consul",
-      data_dir:         node[:consul][:data_dir],
-    )
-
-    notifies :run,     "execute[systemctl daemon-reload]"
-    notifies :restart, "service[consul]"
-  end
-
-  execute "systemctl daemon-reload" do
-    action :nothing
-  end
-end
-
-# Set init.d script
-define :consul_initd_script do
-  environment_file = params[:name]
-
-  template "/etc/init.d/consul" do
-    mode "755"
-    variables(
-      environment_file: environment_file,
-      bin_path:         "#{node[:consul][:bin_dir]}/consul",
-      data_dir:         node[:consul][:data_dir],
-    )
-
-    notifies :restart, "service[consul]"
-  end
-end
-
-case node[:platform]
-when "debian"
-  environment_file = "/etc/default/consul"
-
-  template environment_file do
-    variables(
-      gomaxprocs: node[:consul][:gomaxprocs],
-      options:    node[:consul][:options],
-    )
-  end
-
-  if node[:platform_version].to_i >= 8
-    consul_systemd_script environment_file
-
-    service "consul" do
-      action [:enable, :start]
-    end
-  end
-
-when "redhat"
-  environment_file = "/etc/sysconfig/consul"
-
-  template environment_file do
-    variables(
-      gomaxprocs: node[:consul][:gomaxprocs],
-      options:    node[:consul][:options],
-    )
-  end
-
-  if node[:platform_version].to_i >= 7
-    consul_systemd_script environment_file
-  else
-    consul_initd_script environment_file
-  end
-
-  service "consul" do
-    action [:enable, :start]
-  end
-end

data/lib/itamae/plugin/recipe/consul/templates/etc/default/consul.erb

@@ -1,2 +0,0 @@
-GOMAXPROCS=<%= @gomaxprocs %>
-OPTIONS="<%= @options %>"

data/lib/itamae/plugin/recipe/consul/templates/etc/sysconfig/consul.erb

@@ -1,2 +0,0 @@
-GOMAXPROCS=<%= @gomaxprocs %>
-OPTIONS="<%= @options %>"