fhcap-cli 0.4.5 → 0.4.6

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

@@ -37,7 +37,19 @@
           "protocols": ["all"],
           "start": 0,
           "end": 65535,
-          "groups": ["<%= config[:environment_name] %>", "<%= config[:environment_name] %>-api-lb"]
+          "groups": ["<%= config[:environment_name] %>"]
+        },
+        {
+          "protocols": ["icmp"],
+          "start": -1,
+          "end": -1,
+          "groups": ["<%= config[:environment_name] %>"]
+        },
+        {
+          "protocols": ["tcp"],
+          "start": 80,
+          "end": 80,
+          "groups": ["<%= config[:environment_name] %>-api-lb"]
         }
       ]
     },
@@ -110,7 +122,7 @@
         "private_ip_address": "",
         "subnet": "1c"
       },
-      "run_list": ["role[mongo_server]", "role[fh-stats]", "role[management_server]"]
+      "run_list": ["role[mount_data_volumes]", "role[mongo_server]", "role[fh-stats]", "role[management_server]"]
     }
   }
 }

data/templates/cluster/aws/single-blank.json.erb

@@ -14,6 +14,12 @@
           "start": 0,
           "end": 65535,
           "groups": ["<%= config[:environment_name] %>"]
+        },
+        {
+          "protocols": ["icmp"],
+          "start": -1,
+          "end": -1,
+          "groups": ["<%= config[:environment_name] %>"]
         }
       ]
     },

data/templates/cluster/aws/single.json.erb

@@ -37,7 +37,19 @@
           "protocols": ["all"],
           "start": 0,
           "end": 65535,
-          "groups": ["<%= config[:environment_name] %>", "<%= config[:environment_name] %>-studio-lb"]
+          "groups": ["<%= config[:environment_name] %>"]
+        },
+        {
+          "protocols": ["icmp"],
+          "start": -1,
+          "end": -1,
+          "groups": ["<%= config[:environment_name] %>"]
+        },
+        {
+          "protocols": ["tcp"],
+          "start": 80,
+          "end": 80,
+          "groups": ["<%= config[:environment_name] %>-studio-lb"]
         }
       ]
     },

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

@@ -8,7 +8,7 @@
       "run_list": ["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": {
-      "run_list": ["role[platform_mongo_server]", "role[gitlab-shell_server]", "role[management_server]", "recipe[feedhenry_common::fhctl]", "recipe[nginx_feedhenry::loadbalancer]"]
+      "run_list": ["role[platform_mongo_server]", "role[galera_arbiter_server]", "role[gitlab-shell_server]", "role[management_server]", "recipe[feedhenry_common::fhctl]", "recipe[nginx_feedhenry::loadbalancer]"]
     }
   }
 }

data/templates/kitchen/kitchen.docker.yml.erb

@@ -17,8 +17,5 @@ provisioner:
 platforms:
   - name: ubuntu-12.04
   - name: centos-7
-    busser:
-      sudo: true
-  - name: centos-6.4
     busser:
       sudo: true

data/templates/kitchen/kitchen.generate.yml.erb

@@ -1,2 +1 @@
-#<%% require 'kitchen-sync' %>
 <%= config[:kitchen_yaml] %>

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

@@ -0,0 +1,37 @@
+---
+driver_plugin: vagrant
+
+driver:
+  customize:
+    memory: 1024
+    cpus: 2
+    cpuexecutioncap: 90
+
+transport:
+  name: sftp
+
+provisioner:
+  name: chef_zero
+  data_bags_path: ../../data_bags
+  environments_path: ../../environments
+  solo_rb:
+    environment: test-kitchen
+  client_rb:
+    environment: test-kitchen
+  roles_path: ../../roles
+  require_chef_omnibus: 11.10.4
+platforms:
+  - name: ubuntu-12.04
+    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
+    driver:
+      box: rhel72x64
+      box_url: https://s3-eu-west-1.amazonaws.com/fhcap/rhel-7.2-2.2.20160118110004.git.ccbedc890e18519da4d3c68a265c5e9bc962ff2d_dirty.virtualbox.box
+    attributes:
+      rhsm:
+        username: <%= ENV['RHSM_USERNAME'] %>
+        password: <%= ENV['RHSM_PASSWORD'] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.4.3
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: librarian-chef
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +282,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: kitchen-vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -384,6 +398,8 @@ files:
 - lib/cookbooks/provision/recipes/aws_cluster_create.rb
 - lib/cookbooks/provision/recipes/aws_cluster_create_elb.rb
 - lib/cookbooks/provision/recipes/aws_cluster_destroy.rb
+- lib/cookbooks/provision/recipes/cluster_bootstrap.rb
+- lib/cookbooks/provision/recipes/cluster_bootstrap_instances.rb
 - lib/cookbooks/provision/recipes/cluster_create.rb
 - lib/cookbooks/provision/recipes/cluster_create_instances.rb
 - lib/cookbooks/provision/recipes/cluster_destroy.rb
@@ -405,6 +421,7 @@ files:
 - lib/extensions/chef/provisioning.rb
 - lib/extensions/chef/provisioning/aws_driver/driver.rb
 - lib/extensions/chef/provisioning/chef_run_data.rb
+- lib/extensions/chef/solr/query/regexpable_query.rb
 - lib/extensions/cheffish/merged_config.rb
 - lib/fhcap.rb
 - lib/fhcap/chef-dk/chef_runner.rb
@@ -455,9 +472,11 @@ files:
 - lib/fhcap/tasks/cluster/chef_provisioning_task.rb
 - lib/fhcap/tasks/cluster/cluster_task_base.rb
 - lib/fhcap/tasks/cluster/create.rb
+- lib/fhcap/tasks/cluster/create_dns_records.rb
 - lib/fhcap/tasks/cluster/create_environment.rb
 - lib/fhcap/tasks/cluster/destroy.rb
 - lib/fhcap/tasks/cluster/destroy_environment.rb
+- lib/fhcap/tasks/cluster/generate.rb
 - lib/fhcap/tasks/cluster/info.rb
 - lib/fhcap/tasks/cluster/list.rb
 - lib/fhcap/tasks/cluster/provision.rb
@@ -488,7 +507,9 @@ files:
 - spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_metadata_spec.rb
+- 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/knife/add_spec.rb
@@ -544,6 +565,7 @@ files:
 - templates/kitchen/kitchen.docker.yml.erb
 - templates/kitchen/kitchen.generate.yml.erb
 - templates/kitchen/kitchen.openstack.yml.erb
+- templates/kitchen/kitchen.vagrant.yml.erb
 homepage: https://github.com/fheng/fhcap-cli
 licenses:
 - MIT
@@ -564,7 +586,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: FHCAP Command Line Tool
@@ -575,7 +597,9 @@ test_files:
 - spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
 - spec/fhcap/tasks/chef/cookbook/update_metadata_spec.rb
+- 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/knife/add_spec.rb