fhcap-cli 0.4.9 → 0.4.10

data/templates/kitchen/kitchen.vagrant.yml.erb

@@ -25,13 +25,49 @@ platforms:
     driver:
       box: opscode-ubuntu-12.04
       box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
-  - name: rhel-7.2
     provisioner:
-      require_chef_omnibus: 12.6.0
+      require_chef_omnibus: 11.10.4
+  - name: centos-6.5
+    driver:
+      box: opscode-centos-6.5
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
+    provisioner:
+      require_chef_omnibus: 11.10.4
+    busser:
+      sudo: true
+  - name: centos-7
+    driver:
+      box: opscode-centos-7.2
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box
+    provisioner:
+      require_chef_omnibus: 12.15.19
+    busser:
+      sudo: true
+  - name: rhel-7.2
     driver:
       box: rhel72x64
       box_url: https://s3-eu-west-1.amazonaws.com/fhcap/rhel-7.2-2.2.20160118110004.git.ccbedc890e18519da4d3c68a265c5e9bc962ff2d_dirty.virtualbox.box
+    provisioner:
+      require_chef_omnibus: 12.15.19
+    busser:
+      sudo: true
     attributes:
       rhsm:
         username: <%= ENV['RHSM_USERNAME'] %>
-        password: <%= ENV['RHSM_PASSWORD'] %>
+        password: <%= ENV['RHSM_PASSWORD'] %>
+  - name: macosx-10.10
+    driver:
+      box: macosx-10.10
+      box_url: https://fh-bento.s3-eu-west-1.amazonaws.com/macosx-10.10.virtualbox.box?AWSAccessKeyId=AKIAJF6RUJU3QEBF7HYA&Expires=1510850416&Signature=3sNahrw05PBgsIG%2F5P5BC4rt7VA%3D
+      vagrantfiles:
+        - Vagrantfile-osx.rb
+    provisioner:
+      require_chef_omnibus: 12.15.19
+  - name: macosx-10.12
+    driver:
+      box: macosx-10.12
+      box_url: https://fh-bento.s3-eu-west-1.amazonaws.com/fhcap-base-macosx-1012_build-essential.box?AWSAccessKeyId=AKIAJF6RUJU3QEBF7HYA&Expires=1510751892&Signature=tl73F9fQV8QgheIxVVBFgirWBLc%3D
+      vagrantfiles:
+        - Vagrantfile-osx.rb
+    provisioner:
+      require_chef_omnibus: 12.15.19

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.35
+- !ruby/object:Gem::Dependency
+  name: ffi-yajl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +304,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: chef-provisioning-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -296,42 +352,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: kitchen-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: kitchen-docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: kitchen-openstack
   requirement: !ruby/object:Gem::Requirement
@@ -386,11 +442,13 @@ files:
 - .rakeTasks
 - .rspec
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/fhcap
+- entrypoint.sh
 - fhcap-cli.gemspec
 - lib/cookbooks/provision/libraries/provision.rb
 - lib/cookbooks/provision/metadata.rb
@@ -422,6 +480,9 @@ files:
 - lib/cookbooks/provision/recipes/rabbitmq_reset_cluster.rb
 - lib/cookbooks/provision/recipes/restart_services.rb
 - lib/cookbooks/provision/recipes/seed_cookbooks.rb
+- lib/cookbooks/provision/recipes/ssh.rb
+- lib/cookbooks/provision/recipes/ssh_cluster_create.rb
+- lib/cookbooks/provision/recipes/ssh_cluster_destroy.rb
 - lib/extensions/chef/provisioning.rb
 - lib/extensions/chef/provisioning/aws_driver/driver.rb
 - lib/extensions/chef/provisioning/chef_run_data.rb
@@ -429,6 +490,7 @@ files:
 - lib/extensions/chef/resource/aws_instance.rb
 - lib/extensions/chef/solr/query/regexpable_query.rb
 - lib/extensions/cheffish/merged_config.rb
+- lib/extensions/thor/actions.rb
 - lib/fhcap.rb
 - lib/fhcap/chef-dk/chef_runner.rb
 - lib/fhcap/cli.rb
@@ -488,10 +550,13 @@ files:
 - lib/fhcap/tasks/cluster/provision.rb
 - lib/fhcap/tasks/cluster/status.rb
 - lib/fhcap/tasks/cluster/test.rb
+- lib/fhcap/tasks/dns/aws/create_record.rb
+- lib/fhcap/tasks/dns/aws/delete_record.rb
+- lib/fhcap/tasks/dns/aws/list_records.rb
+- lib/fhcap/tasks/dns/aws/route53_helper.rb
 - lib/fhcap/tasks/dns/create_record.rb
 - lib/fhcap/tasks/dns/delete_record.rb
-- lib/fhcap/tasks/dns/list.rb
-- lib/fhcap/tasks/dns/route53_helper.rb
+- lib/fhcap/tasks/dns/list_records.rb
 - lib/fhcap/tasks/knife/add.rb
 - lib/fhcap/tasks/knife/list.rb
 - lib/fhcap/tasks/knife/remove.rb
@@ -516,8 +581,8 @@ files:
 - spec/fhcap/tasks/cluster/create_dns_records_spec.rb
 - spec/fhcap/tasks/cluster/create_spec.rb
 - spec/fhcap/tasks/cluster/generate_spec.rb
-- spec/fhcap/tasks/dns/create_record_spec.rb
-- spec/fhcap/tasks/dns/delete_record_spec.rb
+- spec/fhcap/tasks/dns/aws/create_record_spec.rb
+- spec/fhcap/tasks/dns/aws/delete_record_spec.rb
 - spec/fhcap/tasks/knife/add_spec.rb
 - spec/fhcap/tasks/knife/remove_spec.rb
 - spec/fhcap/tasks/provider/add_spec.rb
@@ -542,6 +607,7 @@ files:
 - templates/cluster/aws/core-3node.json.erb
 - templates/cluster/aws/core-small-9node.json.erb
 - templates/cluster/aws/farm-3node.json.erb
+- templates/cluster/aws/farm-5node.json.erb
 - templates/cluster/aws/farm-single.json.erb
 - templates/cluster/aws/mbaas-3node.json.erb
 - templates/cluster/aws/nginx-test.json.erb
@@ -552,6 +618,7 @@ files:
 - templates/cluster/core-mbaas-6node.json.erb
 - templates/cluster/core-small-9node.json.erb
 - templates/cluster/farm-3node.json.erb
+- templates/cluster/farm-5node.json.erb
 - templates/cluster/farm-single.json.erb
 - templates/cluster/mbaas-3node.json.erb
 - templates/cluster/nginx-test.json.erb
@@ -559,6 +626,7 @@ files:
 - templates/cluster/openstack/core-3node.json.erb
 - templates/cluster/openstack/core-small-9node.json.erb
 - templates/cluster/openstack/farm-3node.json.erb
+- templates/cluster/openstack/farm-5node.json.erb
 - templates/cluster/openstack/farm-single.json.erb
 - templates/cluster/openstack/mbaas-3node.json.erb
 - templates/cluster/openstack/nginx-test.json.erb
@@ -571,6 +639,10 @@ files:
 - templates/init/knife.rb.erb
 - templates/init/knife_local.rb.erb
 - templates/kitchen/Cheffile.erb
+- templates/kitchen/Dockerfile-rhel
+- templates/kitchen/Vagrantfile-osx.rb
+- templates/kitchen/docker_id_rsa
+- templates/kitchen/docker_id_rsa.pub
 - templates/kitchen/kitchen.aws.yml.erb
 - templates/kitchen/kitchen.docker.yml.erb
 - templates/kitchen/kitchen.generate.yml.erb
@@ -610,8 +682,8 @@ test_files:
 - spec/fhcap/tasks/cluster/create_dns_records_spec.rb
 - spec/fhcap/tasks/cluster/create_spec.rb
 - spec/fhcap/tasks/cluster/generate_spec.rb
-- spec/fhcap/tasks/dns/create_record_spec.rb
-- spec/fhcap/tasks/dns/delete_record_spec.rb
+- spec/fhcap/tasks/dns/aws/create_record_spec.rb
+- spec/fhcap/tasks/dns/aws/delete_record_spec.rb
 - spec/fhcap/tasks/knife/add_spec.rb
 - spec/fhcap/tasks/knife/remove_spec.rb
 - spec/fhcap/tasks/provider/add_spec.rb

data/lib/fhcap/tasks/dns/list.rb

@@ -1,37 +0,0 @@
-require 'fhcap/tasks/task_base'
-require 'fhcap/tasks/dns/route53_helper'
-require 'aws-sdk'
-
-module Fhcap
-  module Tasks
-    module Dns
-      class List < TaskBase
-
-        include Fhcap::Route53Helper
-
-        def run
-          thor.say "Dns::List", :yellow
-
-          table_contents = [table_header('Domain', 'Type', 'TTL', 'Value')]
-
-          provider_names_for('dns').each do |provider|
-            with_provider_client(provider) do |client|
-              resp = client.list_hosted_zones
-              resp.hosted_zones.each do |zone|
-                resp = client.list_resource_record_sets(hosted_zone_id: zone.id)
-                resp.resource_record_sets.each do |record_set|
-                  value = record_set.resource_records.map(&:value).join(',')
-                  alias_target = record_set.alias_target.dns_name rescue nil
-                  table_contents << table_row(record_set.name.gsub('\052', '*'), record_set.type, record_set.ttl, alias_target || value)
-                end
-              end
-            end
-          end
-
-          thor.print_table table_contents
-        end
-
-      end
-    end
-  end
-end