fhcap-cli 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70a588e2af142866f7769a2f1b8ee1a8cf669bf
-  data.tar.gz: 12ee618fb29f5376cddd76ccccd9334cb4315f58
+  metadata.gz: 2404936a843382f70df3f7f0c834b3ed5891ab4f
+  data.tar.gz: b3edd1294c2b6ea919a7d81642bf464adf29808a
 SHA512:
-  metadata.gz: ae42d497ed5c59525b800a31f8a09d5a34c6a00a9eb67989287e38da4e3a06075360aec7161f6e063b7a48ea8d317996c1b568665815fcf894e5f513e2a49d20
-  data.tar.gz: d769c3a259218b4314b0472bf1d83aca477cb4ef37d516698b3389a022fad0759ea37ced456d6949b6522cd58ff8f5481f05aa2f62d21383c39ddbb03d0d6f2e
+  metadata.gz: 78843714ea979e07b5dffc9a4dec0f75e3fc626480bab516f27879e2ce106ca6cfeef9867fa3862ddd9a43dd1546055967a9d1e01be585f4d1d49fe1e01cc2d8
+  data.tar.gz: 1d8872f549528b47f72ec8f465763b94beb8d907c7d9d43a6ab4d38606f306aa3a84db13284c729891546ec83f225f35405a0aa0cb255c504d6bdbac621cf6f9

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## 0.4.5
+
+* [RHMAP-3789] - Implement series option for cluster provision task to allow switching between parallel/series provisions of cluster nodes.
+* [RHMAP-2898] - Use library classes where possible instead of running commands directly via CLI.
+* [RHMAP-3708] - Use meh1 buildfarm by default
+* [RHMAP-3675] - Remove metadata, readme and changelog update from component/cookbook update task. Added separate update_metadata task to allow updating metadata and readmes.
+* [RHMAP-3787] - Skip config update if not applicable during component update
+
 ## 0.4.4
 
 * [RHMAP-3188] - Multi node template improvements. Breaks out clustered component (galera, rabbitmq and mongo) provisions into separate creation steps allowing them to be handled in isolation from the full chef run.

data/fhcap-cli.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |spec|
   spec.description   = 'FHCAP Command Line Tool'
   spec.homepage      = "https://github.com/fheng/fhcap-cli"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_rubygems_version = '>= 2.5.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -28,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'knife-cookbook-readme', '= 0.2.1'
   spec.add_dependency 'ruby-progressbar', '= 1.7.5'
   spec.add_dependency 'java_properties', '= 0.0.4'
+  spec.add_dependency 'archive-tar-minitar', '= 0.5.2'
   spec.add_dependency 'aws-sdk', '= 2.1.35'
   spec.add_dependency 'chef', '= 12.4.3'
   spec.add_dependency 'chef-provisioning', '= 1.4.1'

data/lib/cookbooks/provision/recipes/cluster_provision_instances.rb

@@ -2,6 +2,7 @@ with_cluster_instances(node) do |cluster_instances|
   cluster_instances.each do |chef_environment, instances|
     with_chef_environment chef_environment do
       machine_batch 'cluster_provision_instances' do
+        max_simultaneous node['max_simultaneous']
         instances.each do |name, cfg|
           machine name do
             chef_environment chef_environment

data/lib/fhcap/cluster.rb

@@ -42,6 +42,7 @@ module Fhcap
       method_option 'roles', :type => :string, :desc => "Query to pass to roles"
       method_option 'series', :type => :boolean, :default => false, :desc => "Run provision in series"
       method_option 'strategy', :type => :string, :default => 'chef', :desc => "Provision strategy to use. Default is chef provisioning, falls back to knife provision.", :enum => %w{chef knife}
+      method_option 'seed-cookbooks', :type => :boolean, :default => false, :desc => "Seed cookbooks on each node before running provision (Prevents long wait during cookbook sync if nodes run-list has changed)"
 
       provision_steps = %w{repo-checkout cookbook-promote server-bootstrap provision}
       provision_steps.each do |step|
@@ -123,6 +124,17 @@ module Fhcap
         Tasks::Cluster::ChefProvisioningTask.new(task_options(options.dup)).run
       end
 
+      desc "bootstrap_server", "[ADVANCED USAGE] Bootstrap a chef server for this cluster"
+
+      shared_options :verbose
+
+      method_option 'name', :type => :string, :required => true, :desc => 'Cluster name'
+
+      def bootstrap_server
+        require 'fhcap/tasks/cluster/bootstrap_server'
+        Tasks::Cluster::BootstrapServer.new(task_options(options.dup)).run
+      end
+
     end
   end
 end

data/lib/fhcap/component.rb

@@ -12,8 +12,7 @@ module Fhcap
 
       shared_options :interactive, :verbose
       method_option 'force', :type => :boolean, :aliases => "-f", :desc => "Will force the component version update even if the artifact cant be found"
-      method_option 'wip', :type => :boolean, :desc => "Work in progress. Limits the meta that is changed during the update. i.e. no readme etc.."
-      method_option 'tag', :type => :string, :desc => "Adds a tag to a components changelog entry"
+      method_option 'level', :type => :string, :aliases => "-l", :desc => "Cookbook Bump level", :default => 'minor', :enum => %w{major minor patch}
 
       def update(component, version, build)
 
@@ -24,9 +23,7 @@ module Fhcap
         Fhcap::CLI::Component.new.invoke(:update_config, [component], {force: options[:force]})
 
         #3. Update cookbook
-        clog_entry = "Updated #{component} component version #{version}-#{build}"
-        clog_entry += " (#{options[:tag]})" if options[:tag]
-        Fhcap::CLI::Cookbook.new.invoke(:update, [], {cookbooks: [component], :"changelog-entries" => [clog_entry], wip: options['wip']})
+        Fhcap::CLI::Cookbook.new.invoke(:update, [], {cookbooks: [component], level: options['level']})
 
       end
 

data/lib/fhcap/cookbook.rb

@@ -10,56 +10,55 @@ module Fhcap
 
       desc "update", "Update a cookbook, defaults to all cookbooks."
       long_desc <<-LONGDESC
-      Updates a cookbook(s) version, metadata, readme and changelog.
+      Updates a cookbook(s) version.
 
       With --cookbooks (-c) <cookbook1 cookbook2> option, specifies the cookbook(s) to update, default is all cookbooks.
 
       With --modified (-m) option, updates all cookbooks modified between the current HEAD and the last origin commit.
 
-      With --changelog-entries (-e) <'entry1' 'entry2'> option, changelog entries to be put into the cookbook(s) changelog file for this version change.
-
       With --level (-l) [major|minor|patch"] option, sets the bump level to be applied to the given cookbook(s), default is minor.
 
       With --version (-v) 1.1.1 option, sets the version to be applied to the given cookbook(s).
 
-      With --wip option, defaults the level option to 'patch' and skips all metadata updates i.e. cookbook metadata, readme and changelog files are not modified.
+      With --wip option, defaults the level option to 'patch' and skips all metadata updates.
 
       Examples:
 
-      fhcap cookbook update -c feedhenry_common -e 'Some awesome new feature'
+      fhcap cookbook update -c feedhenry_common
 
-      fhcap cookbook update -c feedhenry_common --wip
+      fhcap cookbook update -c feedhenry_common -l major
 
-      fhcap cookbook update -c feedhenry_common -l major -e 'Some major change'
+      fhcap cookbook update -c feedhenry_common -v 1.2.3
       LONGDESC
 
       shared_options :cookbooks, :modified
 
-      method_option 'changelog-entries', :type => :array, :aliases => "-e", :default => ["Replace me with a proper changelog entry"], :desc => "Changelog entries"
-      method_option 'level', :type => :string, :aliases => "-l", :desc => "Bump level", :enum => %w{major minor patch}
+      method_option 'level', :type => :string, :aliases => "-l", :desc => "Cookbook Bump level", :default => 'minor', :enum => %w{major minor patch}
       method_option 'version', :type => :string, :aliases => "-v", :desc => "Version to set manually"
-      method_option 'wip', :type => :boolean, :desc => "Work in progress. No meta is generated and level is set to patch level changes."
 
       def update
         require "fhcap/tasks/chef/cookbook/update_version"
-        require "fhcap/tasks/chef/cookbook/update_metadata"
-        require "fhcap/tasks/chef/cookbook/update_readme"
-        require "fhcap/tasks/chef/cookbook/update_changelog"
         cookbooks = get_cookbooks(options, nil, repo_cookbook_paths('-cookbooks'))
         say("Cookbook update for #{cookbooks}", :yellow)
 
         cookbooks.each do |cookbook|
           Tasks::Chef::Cookbook::UpdateVersion.new(task_options(options.dup.merge({cookbook: cookbook}))).run
         end
+      end
+
+      desc "update_metadata", "Update a cookbooks metadata, defaults to all cookbooks."
+
+      shared_options :cookbooks, :modified
+
+      def update_metadata
+        require "fhcap/tasks/chef/cookbook/update_metadata"
+        require "fhcap/tasks/chef/cookbook/update_readme"
+        cookbooks = get_cookbooks(options, nil, repo_cookbook_paths('-cookbooks'))
+        say("Cookbook update_metadata for #{cookbooks}", :yellow)
 
-        if options[:wip]
-          say("WIP, skipping meta updates.", :yellow)
-        else
-          cookbooks.each do |cookbook|
-            Tasks::Chef::Cookbook::UpdateMetadata.new(task_options(options.dup.merge({cookbook: cookbook}))).run
-            Tasks::Chef::Cookbook::UpdateReadme.new(task_options(options.dup.merge({cookbook: cookbook}))).run
-            Tasks::Chef::Cookbook::UpdateChangelog.new(task_options(options.dup.merge({cookbook: cookbook}))).run
-          end
+        cookbooks.each do |cookbook|
+          Tasks::Chef::Cookbook::UpdateMetadata.new(task_options(options.dup.merge({cookbook: cookbook}))).run
+          Tasks::Chef::Cookbook::UpdateReadme.new(task_options(options.dup.merge({cookbook: cookbook}))).run
         end
       end
 

data/lib/fhcap/tasks/chef/chef_server_task.rb

@@ -21,6 +21,7 @@ module Fhcap
         end
 
         def with_chef_server(&block)
+          ::Chef::Config.solo = false
           if local_chef_server?
             with_local_chef_server(&block)
           else
@@ -102,6 +103,37 @@ module Fhcap
           end
         end
 
+        def knife_environment_delete(env, server)
+          thor.say " * deleting environment '#{env}' from #{server}"
+          delete_chef_object(::Chef::Knife::EnvironmentDelete, server, env)
+        end
+
+        def knife_data_bag_delete(data_bag, item, server)
+          thor.say " * deleting data bag '#{data_bag} #{item}' from #{server}"
+          delete_chef_object(::Chef::Knife::DataBagDelete, server, data_bag, item)
+        end
+
+        def delete_chef_object(klass, server, *args)
+          begin
+            suppress_stdout(!options[:verbose]) do
+              klass.load_deps
+              knife_command = klass.new(args)
+              knife_command.config[:config_file] = knife_config_file_for(server)
+              knife_command.config[:yes] = true
+              knife_command.configure_chef
+              knife_command.run
+            end
+          rescue Net::HTTPServerException => e
+            response = e.response
+            case response
+              when Net::HTTPNotFound
+                puts "The object you are looking for could not be found, assuming this ok and continuing ..."
+              else
+                raise e
+            end
+          end
+        end
+
       end
     end
   end

data/lib/fhcap/tasks/chef/chef_task_base.rb

@@ -25,6 +25,7 @@ module Fhcap
         end
 
         def run_knife_cmd(cmd, server, capture=true)
+          #ToDo [RHMAP-2898] Use knife object
           cmd = "cd #{File.expand_path("..", knife_config_dir)} && knife #{cmd} -c #{knife_config_file_for(server)}"
           resp = thor.run(cmd, :capture => capture)
           thor.say resp if verbose && !capture

data/lib/fhcap/tasks/chef/cookbook/archive.rb

@@ -1,5 +1,7 @@
 require 'fhcap/tasks/chef/chef_task_base'
 require 'fhcap/tasks/repo/checkout'
+require 'zlib'
+require 'archive/tar/minitar'
 
 module Fhcap
   module Tasks
@@ -31,7 +33,10 @@ module Fhcap
               end
             end
 
-            thor.run("tar -czf #{@archive} -C #{config.tmp_dir} cookbooks")
+            Dir.chdir config.tmp_dir do
+              ::Archive::Tar::Minitar.pack('cookbooks', Zlib::GzipWriter.new(File.open(@archive, 'wb')))
+            end
+
             thor.say_status 'create', @archive, :green
           end
 

data/lib/fhcap/tasks/chef/cookbook/list_artifacts.rb

@@ -12,7 +12,9 @@ module Fhcap
           end
 
           def run
-            thor.say "Chef::Cookbook::Component::List", :yellow
+            if print_table?
+              thor.say "Chef::Cookbook::Component::List", :yellow 
+            end
             cookbooks = get_cookbooks(options, nil, repo_cookbook_paths('site-cookbooks'))
 
             results = print_table? ? [table_header("Component", "Version", "Build")] : []

data/lib/fhcap/tasks/chef/cookbook/update_config.rb

@@ -43,7 +43,9 @@ module Fhcap
             cookbook = cookbook_loader.cookbooks_by_name[name]
 
             conf_attr_file = cookbook.attribute_filenames.find { |e| /conf.rb/ =~ e }
-            exit_with_error("No cookbook conf.rb attribute file found for #{name}") unless conf_attr_file
+            unless conf_attr_file
+              return thor.say "No cookbook conf.rb attribute file found for #{name}, skipping config update"
+            end
 
             conf_src_files = cfg_lookup(name)
             exit_with_error("No local src config file found for #{name}") if conf_src_files.empty?
@@ -52,14 +54,18 @@ module Fhcap
             thor.say "conf_src_files = #{conf_src_files}"
 
             conf_src_files.each() do |file|
-              if File.extname(file) =~ /.properties/
-                cfg = Fhcap::JavaConfig.new
+              if File.exists? file
+                if File.extname(file) =~ /.properties/
+                  cfg = Fhcap::JavaConfig.new
+                else
+                  cfg = Fhcap::JsonConfig.new
+                end
+                cfg.from_attributes_file(name, conf_attr_file)
+                cfg.from_file(file, force, overrides)
+                thor.create_file(conf_attr_file, cfg.attribute_file_content(name, sort))
               else
-                cfg = Fhcap::JsonConfig.new
+                thor.say "Missing local file '#{file}', skipping config update"
               end
-              cfg.from_attributes_file(name, conf_attr_file)
-              cfg.from_file(file, force, overrides)
-              thor.create_file(conf_attr_file, cfg.attribute_file_content(name, sort))
             end
 
           end

data/lib/fhcap/tasks/chef/cookbook/update_readme.rb

@@ -1,4 +1,5 @@
 require 'fhcap/tasks/chef/chef_task_base'
+require 'knife_cookbook_readme'
 
 module Fhcap
   module Tasks
@@ -18,8 +19,14 @@ module Fhcap
             cookbook = cookbook_loader.cookbooks_by_name[name]
             metadata_file = cookbook.metadata_filenames.first
             readme_file = cookbook.root_filenames.find { |e| /README/ =~ e }
-            cmd = "knife cookbook readme from #{metadata_file} > #{readme_file}"
-            thor.run(cmd)
+            thor.say_status :run, "knife cookbook readme from #{metadata_file} > #{readme_file}", :green
+
+            template_file = File.join(Fhcap.source_root, 'templates', 'chef', 'cookbook', 'README.md.erb')
+            metadata = ::KnifeCookbookReadme::Metadata.from_file(metadata_file)
+            template = File.read(template_file)
+            result = ::KnifeCookbookReadme::Readme.new(metadata).render(template)
+
+            thor.create_file readme_file, result, force: true
           end
 
         end

data/lib/fhcap/tasks/chef/cookbook/update_version.rb

@@ -12,7 +12,7 @@ module Fhcap
             super
             @name = options[:cookbook]
             @version = options[:version]
-            @level = ('manual' if @version) || ('patch' if options[:wip]) || options[:level] || 'minor'
+            @level = ('manual' if @version) || options[:level] || 'minor'
           end
 
           def run

data/lib/fhcap/tasks/chef/environments/destroy.rb

@@ -1,4 +1,6 @@
 require 'fhcap/tasks/chef/chef_server_task'
+require 'chef/knife/environment_delete'
+require 'chef/knife/data_bag_delete'
 
 module Fhcap
   module Tasks
@@ -17,10 +19,10 @@ module Fhcap
             thor.say "Chef::Environments::Destroy #{@name}", :yellow
 
             if chef_server
-              if thor.yes? "Remove all environments and config from the chef server (#{chef_server})?"
+              if thor.yes? "Remove all environments and config from the chef server '#{chef_server}'? (y/n)"
                 with_chef_server do
-                  run_knife_cmd("environment delete #{@name} -y", chef_server)
-                  run_knife_cmd("data bag delete environments #{@name} -y", chef_server)
+                  knife_environment_delete(@name, chef_server)
+                  knife_data_bag_delete('environments', @name, chef_server)
                 end
               end
             end

data/lib/fhcap/tasks/chef/provisioning/chef_provisioning_task_base.rb

@@ -20,7 +20,8 @@ module Fhcap
                                          local_repo_path: repo_dir(@chef_repo),
                                          local_repo_clusters_dir: repo_clusters_dir(@chef_repo),
                                          chef_server_config: chef_server_config_hash_for(@chef_server),
-                                         provider_credentials:  provider_credentials(@cluster_config[:provider_id])
+                                         provider_credentials:  provider_credentials(@cluster_config[:provider_id]),
+                                         max_simultaneous: options[:series] ? 1 : nil
                                      })
             else
               exit_with_error("Unknown cluster #{@name}")

data/lib/fhcap/tasks/chef/provisioning/provision.rb

@@ -9,7 +9,7 @@ module Fhcap
           def run
             thor.say "Chef::Provisioning::Provision #{@name}", :yellow
             with_chef_server do
-              #seed_cookbooks if local_chef_server?
+              seed_cookbooks if options[:'seed-cookbooks']
               do_chef_run("provision::cluster_provision")
             end
           end

data/lib/fhcap/tasks/chef/server/create_user.rb

@@ -38,6 +38,7 @@ module Fhcap
 
             import_cfg = {}
 
+            #ToDo [RHMAP-2898] Use knife object
             private_key = run_knife_cmd(cmd, user_config[:chef_server])
 
             if $?.exitstatus == 0

data/lib/fhcap/tasks/cluster/bootstrap_server.rb

@@ -0,0 +1,17 @@
+require 'fhcap/tasks/cluster/cluster_task_base'
+require 'fhcap/tasks/chef/server/bootstrap'
+
+module Fhcap
+  module Tasks
+    module Cluster
+      class BootstrapServer < ClusterTaskBase
+
+        def run
+          thor.say "Cluster::BootstrapServer: name = #{name}", :yellow
+          Chef::Server::Bootstrap.new(@options.dup.merge({:environments => cluster_environments}.merge(chef_task_options))).run
+        end
+
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/cluster/create.rb

@@ -207,6 +207,7 @@ module Fhcap
           cluster_config[:environments].each do |env_name, env_cfg|
             env_name = "#{name}-#{env_name}"
             knife_config_file = knife_config_file_for(cluster_config[:chef_server])
+            #ToDo [RHMAP-2898] Use knife object
             nodes = JSON.parse(`knife search "chef_environment:#{env_name} AND recipes:nginx_feedhenry\\:\\:loadbalancer" -c #{knife_config_file} -F json -a name -a cloud.public_ipv4`)
 
             lb_node = nodes['rows'].collect do |row|

data/lib/fhcap/tasks/repo/checkout.rb

@@ -147,10 +147,18 @@ module Fhcap
 
         def repo_librarian_install(repo_dir)
           if File.exists? File.join(repo_dir, 'Cheffile')
-            cmd = %w{librarian-chef install}
-            cmd << '--quiet' unless verbose
-            cmd = cmd.join(' ')
-            run_inside_repo_dir(repo_dir, cmd)
+            thor.say_status :run, "librarian-chef install from \"#{repo_dir}\"", :green
+            require "librarian/chef/environment"
+            require "librarian/action/resolve"
+            require "librarian/action/install"
+            require "librarian/ui"
+
+            environment = ::Librarian::Chef::Environment.new(:project_path => repo_dir)
+            environment.ui = ::Librarian::UI::Shell.new(::Thor::Shell::Basic.new)
+            environment.ui.be_quiet! unless verbose
+
+            ::Librarian::Action::Resolve.new(environment).run
+            ::Librarian::Action::Install.new(environment).run
           end
           true
         end

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/fhcap/tasks/chef/cookbook/archive_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require "fhcap/tasks/chef/cookbook/archive"
+
+describe Fhcap::Tasks::Chef::Cookbook::Archive do
+
+  subject {
+    Fhcap::Tasks::Chef::Cookbook::Archive.new(options)
+  }
+
+  let(:thor) do
+    DummyThor.new
+  end
+
+  let(:config) do
+    {}
+  end
+
+  describe "#initialize" do
+  end
+
+end

data/templates/chef/cookbook/README.md.erb

@@ -0,0 +1,72 @@
+<%= title %>
+<%= '=' * title.length %>
+
+<%= description %>
+
+Requirements
+------------
+
+### Platform:
+
+<% unless platforms.empty? %>
+<% platforms.each do |platform| %>
+* <%= platform %>
+<% end %>
+<% else %>
+*No platforms defined*
+<% end %>
+
+### Cookbooks:
+
+<% unless dependencies.empty? %>
+<% dependencies.each do |cookbook| %>
+* <%= cookbook %>
+<% end %>
+<% else %>
+*No dependencies defined*
+<% end %>
+
+Attributes
+----------
+
+<% unless attributes.empty? %>
+<table>
+  <tr>
+    <td>Attribute</td>
+    <td>Description</td>
+    <td>Default</td>
+  </tr>
+<% attributes.each do |name, description, default| %>
+  <tr>
+    <td><code><%= name %></code></td>
+    <td><%= description %></td>
+    <td><code><%= default %></code></td>
+  </tr>
+<% end %>
+</table>
+<% else %>
+*No attributes defined*
+<% end %>
+
+Recipes
+-------
+
+<% unless recipes.empty? %>
+<% recipes.each do |recipe, description| %>
+### <%= recipe %>
+
+<%= description %>
+
+<% end %>
+<% else %>
+*No recipes defined*
+<% end %>
+
+License and Author
+------------------
+
+Author:: <%= author %> (<<%= author_email %>>)
+
+Copyright:: <%= copyright_year %>, <%= author %>
+
+License:: <%= license %>

data/templates/chef/cookbook/metadata.erb

@@ -23,23 +23,4 @@ depends '<%= k %>'
 %>
 <% sanatized_recipes_hash.sort.each do |k, v| %>
 recipe '<%= k.to_s %>', '<%= v %>'
-<% end %>
-<% attributes.sort.each do |attr_name, attr_hash| %>
-
-attribute '<%= attr_name %>',
-  <% sanatized_attrs_hash = {}
-     attr_hash.each do |k, v|
-       if k == 'calculated' || k == 'type' || (k == 'choice' && v.empty?)
-         next
-       end
-       sanatized_attrs_hash[k] = v
-     end
-  %>
-  <% sanatized_attrs_hash.sort.each_with_index do |attr, index| %>
-    <%
-       k = attr[0]
-       v = attr[1]
-    %>
-          :<%= k %> => <% if v.is_a? Array %><%=v%><% else %>"<%== v %>"<%end%><%if index < sanatized_attrs_hash.length - 1%>,<%end%>
-  <% end %>
 <% end %>

data/templates/chef/environment_core.json.erb

@@ -30,7 +30,7 @@ end
     "apache2": {
       "buildfarm": {
         "android": {
-          "url": "qed1-builder.feedhenry.net"
+          "url": "meh1-builder.feedhenry.net"
         },
         "windowsphone": {
           "url": "e103-stg-digman-01.feedhenry.net"

data/templates/chef/environment_single.json.erb

@@ -21,7 +21,7 @@ end
     "apache2": {
       "buildfarm": {
         "android": {
-          "url": "qed1-builder.feedhenry.net"
+          "url": "meh1-builder.feedhenry.net"
         },
         "windowsphone": {
           "url": "e103-stg-digman-01.feedhenry.net"

data/templates/cluster/aws/core-3node.json.erb

@@ -82,7 +82,7 @@
         "subnet": "1a"
       },
       "load_balancers": ["studio", "scm", "messaging", "metrics"],
-      "run_list": ["role[mount_data_volumes]", "role[platform_mongo_server]", "role[rabbitmq_server]", "role[app_server]", "role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-stats]", "recipe[feedhenry_common::fhctl]"]
+      "run_list": ["role[mount_data_volumes]", "role[platform_mongo_server]", "role[rabbitmq_server]", "role[galera_server]", "role[app_server]", "role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-stats]", "recipe[feedhenry_common::fhctl]"]
     },
     "node2": {
       "aws": {
@@ -91,7 +91,7 @@
         "subnet": "1b"
       },
       "load_balancers": ["studio", "scm", "messaging", "metrics"],
-      "run_list": ["role[mount_data_volumes]", "role[platform_mongo_server]", "role[rabbitmq_server]", "role[app_server]", "role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "recipe[feedhenry_common::fhctl]"]
+      "run_list": ["role[mount_data_volumes]", "role[platform_mongo_server]", "role[rabbitmq_server]", "role[galera_server]", "role[app_server]", "role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "recipe[feedhenry_common::fhctl]"]
     },
     "mgt1": {
       "aws": {

data/templates/cluster/aws/mbaas-3node.json.erb

@@ -37,7 +37,7 @@
           "protocols": ["all"],
           "start": 0,
           "end": 65535,
-          "groups": ["<%= config[:environment_name] %>", "<%= config[:environment_name] %>-studio-lb"]
+          "groups": ["<%= config[:environment_name] %>", "<%= config[:environment_name] %>-api-lb"]
         }
       ]
     },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -150,6 +150,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +434,6 @@ files:
 - lib/fhcap/tasks/chef/cookbook/list.rb
 - lib/fhcap/tasks/chef/cookbook/list_artifacts.rb
 - lib/fhcap/tasks/chef/cookbook/update_artifact.rb
-- lib/fhcap/tasks/chef/cookbook/update_changelog.rb
 - lib/fhcap/tasks/chef/cookbook/update_config.rb
 - lib/fhcap/tasks/chef/cookbook/update_metadata.rb
 - lib/fhcap/tasks/chef/cookbook/update_readme.rb
@@ -438,6 +451,7 @@ files:
 - lib/fhcap/tasks/chef/server/info.rb
 - lib/fhcap/tasks/chef/server/provision.rb
 - lib/fhcap/tasks/clean.rb
+- lib/fhcap/tasks/cluster/bootstrap_server.rb
 - lib/fhcap/tasks/cluster/chef_provisioning_task.rb
 - lib/fhcap/tasks/cluster/cluster_task_base.rb
 - lib/fhcap/tasks/cluster/create.rb
@@ -469,6 +483,7 @@ files:
 - lib/fhcap/thor_base.rb
 - lib/fhcap/version.rb
 - spec/fhcap/cli_spec.rb
+- spec/fhcap/tasks/chef/cookbook/archive_spec.rb
 - spec/fhcap/tasks/chef/cookbook/list_artifacts_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
@@ -487,6 +502,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/dummy_config.rb
 - spec/support/dummy_thor.rb
+- templates/chef/cookbook/README.md.erb
 - templates/chef/cookbook/changelog.md.erb
 - templates/chef/cookbook/metadata.erb
 - templates/chef/environment_core.json.erb
@@ -540,12 +556,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.0
@@ -554,6 +570,7 @@ specification_version: 4
 summary: FHCAP Command Line Tool
 test_files:
 - spec/fhcap/cli_spec.rb
+- spec/fhcap/tasks/chef/cookbook/archive_spec.rb
 - spec/fhcap/tasks/chef/cookbook/list_artifacts_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_config_spec.rb

data/lib/fhcap/tasks/chef/cookbook/update_changelog.rb

@@ -1,63 +0,0 @@
-require 'fhcap/tasks/chef/chef_task_base'
-
-module Fhcap
-  module Tasks
-    module Chef
-      module Cookbook
-        class UpdateChangelog < ChefTaskBase
-
-          attr_reader :name
-
-          def initialize(options)
-            super
-            @name = options[:cookbook]
-          end
-
-          def run
-            thor.say "Chef::Cookbook::UpdateChangelog cookbook = #{name}", :yellow
-            cookbook = cookbook_loader.cookbooks_by_name[name]
-            meta = get_cookbook_meta(name)
-
-            version = meta.version
-            changelog_file = cookbook.root_filenames.find { |e| /CHANGELOG.md/ =~ e }
-
-            if changelog_file
-              changelog = parse_changelog(changelog_file)
-
-              if changelog[version]
-                thor.say_status("error", "Already a Changelog entry for #{name} version #{version}", :red)
-              else
-                changelog[version] = options[:'changelog-entries'] || []
-                thor.template(File.join('templates', 'chef', 'cookbook', 'changelog.md.erb'), changelog_file, {:cookbook => name, :changelog => changelog})
-              end
-            else
-              thor.say_status("error", "No Changelog found for #{name}", :red)
-            end
-
-          end
-
-          private
-
-          def parse_changelog(file)
-            changelog = {}
-            lines = File.readlines(file)
-            current_version = nil
-            lines.each do |line|
-              if match = line.match(/^## (\d+.\d+.\d+):/)
-                current_version = version = match[1]
-                changelog[version] = []
-              elsif match = line.match(/^* (.+)$/)
-                entry = match[1]
-                if current_version
-                  changelog[current_version] << entry
-                end
-              end
-            end
-            changelog
-          end
-
-        end
-      end
-    end
-  end
-end