fhcap-cli 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09020b5dc2b0856ed6a23b9cba27bd6b64292a28
-  data.tar.gz: 3feb30346f4309392dfab910dc01717a3e75ab61
+  metadata.gz: 586e4b4984cbf2ee4847cfa59ca3a69bb7784345
+  data.tar.gz: bb3fc51822d6289862e760de8251eea9abbb2689
 SHA512:
-  metadata.gz: bb24f0d1e80edb6eb66c3298e8eb7cb2698a59ceabeb12dea7d37b40d5b7b2dcb9e4e68bb73e167f3715b91311b3f234665d312c65e1bb340448dc12535bf6e1
-  data.tar.gz: 31c31e4980a12127a5c7e6d1a524b2acce6d18954c636c835ca4350cf2132db9f6394628a4707e40dc804eae5c82a610f09daa9d0eba77ac99ffc6f1fe281d37
+  metadata.gz: ab9358a1d95772e4bc80f9b256da13a476c0b2075eb3b11dd90377d64645229a0808761d811f6562b68275b844cc231d74f4c476a162ff779c31ecdb62434742
+  data.tar.gz: c7410c8d9b6ec940b8b130ffefbd1f7504961fe1f53ba7a5d6fdff1bd05d80aa29ccabdb6633a5a3e8aa10e1610f29bd9b2a1136d1bfa969392fdf6f604a031a

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 
 ## Unreleased
 
+## 0.4.12
+
+* [RHMAP-14106] - Add cookbook option to component update tasks. Allows updating the version of a component that isn't contained in a cookbook of the same name.
+* [RHMAP-13583] - Adding support for NFS server in Openshift Multi Node templates
+* [RHMAP-13133] - Add options to component update task that allow any stage to be skipped (artifact/config/cookbook update)
+* [RHMAP-13133] - Use force flag to force attribute file update during component update if set to true.
+* [RHMAP-13137] - Openshift Multi Node Cluster support: Added new templates, environments and post create recipes for both AWS and Openstack
+* [RHMAP-13265] - Modified DNS creation logic to support ELBs in AWS Openshift Multi Node Cluster template (ose_multi_node)
+
 ## 0.4.11
 
 * Fix component update for components that do not have a config that can be parsed into chef attributes (unifiedpush)

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

@@ -0,0 +1,41 @@
+include_recipe 'provision::common'
+include_recipe "provision::#{node['driver']}"
+
+with_cluster_instances(node) do |cluster_instances|
+  cluster_instances.each do |chef_environment, instances|
+    with_chef_environment chef_environment do
+
+      search_role = '.*ose.*_server'
+      run_list_query = /role\[#{search_role}\]/
+
+      ose_instances = instances.select do |name, cfg|
+        if cfg[:instance_config] && cfg[:instance_config][:run_list] && cfg[:instance_config][:run_list].index { |s| s =~ run_list_query }
+          node.default['tmp_node_run_list'] = {} unless node['tmp_node_run_list']
+          tmp_run_list = node['tmp_node_run_list'][name] ? node['tmp_node_run_list'][name].dup : []
+          if cfg[:instance_config][:run_list].include?("role[ose_storage_server]")
+            tmp_run_list << 'role[ose_storage_server]'
+          else
+            tmp_run_list << 'recipe[openshift::common]'
+          end
+          cfg[:instance_config][:tmp_run_list] = tmp_run_list
+          node.default['tmp_node_run_list'][name] = tmp_run_list
+          true
+        else
+          false
+        end
+      end
+
+      machine_batch "ose_reset_cluster: Batch Provison" do
+        ose_instances.each do |name, cfg|
+          machine name do
+            chef_environment chef_environment
+            machine_options(cfg[:machine_options])
+            run_list cfg[:instance_config][:tmp_run_list]
+          end
+        end
+        action :converge
+      end
+
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 
 include_recipe "provision::galera_reset_cluster"
 include_recipe "provision::rabbitmq_reset_cluster"
-include_recipe "provision::mongo_reset_cluster"
+include_recipe "provision::mongo_reset_cluster"
+include_recipe "provision::ose_reset_cluster"

data/lib/fhcap.rb

@@ -3,7 +3,7 @@ require "pathname"
 
 module Fhcap
   GEM_DIR = File.expand_path '..', File.dirname(__FILE__)
-  TEMPLATE_NAMES = %w{single core-3node mbaas-3node core-mbaas-6node core-small-9node nginx-test single-blank farm-3node farm-5node farm-single ose-single}.sort
+  TEMPLATE_NAMES = %w{single core-3node mbaas-3node core-mbaas-6node core-small-9node nginx-test single-blank farm-3node farm-5node farm-single ose-single ose-multi-node}.sort
 
   class << self
     def source_root

data/lib/fhcap/component.rb

@@ -7,36 +7,41 @@ module Fhcap
 
       add_shared_option :verbose, :aliases => "-v", :desc => "Verbose output", :type => :boolean, :required => false, :default => false
       add_shared_option :interactive, :aliases => "-i", :desc => "Interactive mode (Stops for input)", :type => :boolean, :required => false, :default => false
+      add_shared_option :cookbook, :desc => "Cookbook where component artifact version is stored if different from component name", :type => :string, :required => false
 
       desc "update COMPONENT VERSION BUILD", "Update a single component"
 
-      shared_options :interactive, :verbose
+      shared_options :interactive, :verbose, :cookbook
       method_option 'force', :type => :boolean, :aliases => "-f", :desc => "Will force the component version update even if the artifact cant be found"
       method_option 'level', :type => :string, :aliases => "-l", :desc => "Cookbook Bump level", :default => 'minor', :enum => %w{major minor patch}
+      method_option 'update-artifact', :desc => "Update component artifact", :type => :boolean, :required => false, :default => true
+      method_option 'update-config', :desc => "Update component config", :type => :boolean, :required => false, :default => true
+      method_option 'update-cookbook', :desc => "Update component cookbook", :type => :boolean, :required => false, :default => true
 
       def update(component, version, build)
 
+        artifact_cookbook = options[:cookbook] || component
         #1. Update artifact version
-        Fhcap::CLI::Component.new.invoke(:update_artifact, [component, version, build], {interactive: options[:interactive]})
+        Fhcap::CLI::Component.new.invoke(:update_artifact, [component, version, build], {cookbook: artifact_cookbook, interactive: options[:interactive]}) if options['update-artifact']
 
         #2. Update config
-        Fhcap::CLI::Component.new.invoke(:update_config, [component], {force: options[:force]})
+        Fhcap::CLI::Component.new.invoke(:update_config, [artifact_cookbook], {force: options[:force]}) if options['update-config']
 
         #3. Update cookbook
-        Fhcap::CLI::Cookbook.new.invoke(:update, [], {cookbooks: [component], level: options['level']})
+        Fhcap::CLI::Cookbook.new.invoke(:update, [], {cookbooks: [artifact_cookbook], level: options['level']}) if options['update-cookbook']
 
       end
 
       desc "update_artifact COMPONENT VERSION BUILD", "Update a single component artifact"
 
-      shared_options :interactive
+      shared_options :interactive, :cookbook
 
       def update_artifact(component, version, build)
         require "fhcap/tasks/chef/cookbook/update_artifact"
-        Tasks::Chef::Cookbook::UpdateArtifact.new(task_options(options.dup.merge({cookbook: component, version: version, build: build}))).run
+        Tasks::Chef::Cookbook::UpdateArtifact.new(task_options(options.dup.merge({cookbook: options[:cookbook], component: component, version: version, build: build}))).run
       end
 
-      desc "update_config COMPONENT", "Generates a chef attributes file from the given config file (json or java properties)"
+      desc "update_config COOKBOOK", "Generates a chef attributes file from the given config file (json or java properties)"
       long_desc <<-LONGDESC
       Updates a chef attribute file e.g. site-cookbooks/fh-ngui/attributes/conf.json form a config file stored within the
       components own git repository e.g. <FH_SRC_DIR>/fh-ngui/config.dev.json. It can take both json config files

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

@@ -6,20 +6,24 @@ module Fhcap
       module Cookbook
         class UpdateArtifact < ChefTaskBase
 
-          attr_reader :name, :version, :build
+          attr_reader :name, :cookbook, :version, :build
 
           def initialize(options)
             super
-            @name = options[:cookbook]
+            @name = options[:component]
+            @cookbook = options[:cookbook] || @name
             @version = options[:version]
             @build = options[:build]
           end
 
           def run
-            thor.say "Chef::Cookbook::UpdateArtifact cookbook = #{name}, version = #{version}, build = #{build}", :yellow
-            cookbook = cookbook_loader.cookbooks_by_name[name]
+            thor.say "Chef::Cookbook::UpdateArtifact name = #{name}, cookbook = #{cookbook}, version = #{version}, build = #{build}", :yellow
+            c = cookbook_loader.cookbooks_by_name[cookbook]
+            unless c
+              exit_with_error("Failed to load cookbook \"#{cookbook}\"!")
+            end
 
-            artifact_attribute_filepath = cookbook.attribute_filenames.find { |e| /artifact.rb/ =~ e }
+            artifact_attribute_filepath = c.attribute_filenames.find { |e| /artifact.rb/ =~ e }
 
             if artifact_attribute_filepath
               text = File.read(artifact_attribute_filepath)
@@ -27,7 +31,7 @@ module Fhcap
               replace = replace.gsub(/default\['#{name}'\]\['build'\] = .+$/, "default['#{name}']['build'] = '#{build}'")
               thor.create_file(artifact_attribute_filepath, replace, {force: !options[:interactive]})
             else
-              thor.say_status("error", "No artifact file found for #{name}", :red)
+              thor.say_status("error", "No artifact file found for #{name} in #{cookbook}", :red)
             end
 
           end

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

@@ -63,7 +63,7 @@ module Fhcap
                 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))
+                thor.create_file(conf_attr_file, cfg.attribute_file_content(name, sort), {force: force})
               else
                 thor.say "Missing local file '#{file}', skipping config update"
               end

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

@@ -71,42 +71,44 @@ module Fhcap
         end
 
         def create_dns_record_openstack
-          create_records_for_query("recipes:nginx_feedhenry\\:\\:loadbalancer", ["*"])
+          cluster_config[:environments].each do |env_name, env_cfg|
+            create_records_for_query(env_name, env_cfg, "recipes:nginx_feedhenry\\:\\:loadbalancer", ["*"])
+          end
         end
 
         def create_records_openshift
           #This is a very basic openshift DNS setup and does not take into account a HA setup or LBs
-          create_records_for_query("roles:ose_master_server", [""])
-          create_records_for_query("roles:ose_node_server", ["*"])
+          cluster_config[:environments].each do |env_name, env_cfg|
+            create_records_for_query(env_name, env_cfg, "roles:ose_master_server", [""])
+            create_records_for_query(env_name, env_cfg, "roles:ose_node_server", ["*"]) unless env_cfg[:load_balancers]
+          end
         end
 
-        def create_records_for_query(query, records)
-          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 #{query}" -c #{knife_config_file} -F json -a name -a cloud.public_ipv4`)
-
-            query_node = nodes['rows'].collect do |row|
-              name, attrs = row.first
-              attrs
-            end.first
-
-            if query_node
-              if query_node['cloud.public_ipv4']
-                records.each do |record|
-                  dns_record_cfg = {
-                      domain: [record, env_cfg[:domain]].compact.reject(&:empty?).join('.'),
-                      ipaddress: query_node['cloud.public_ipv4']
-                  }
-                  Dns::CreateRecord.new(@options.dup.merge(dns_record_cfg)).run
-                end
-              else
-                thor.say "Found query node '#{query_node['name']}', but was unable to retrieve it's IP!!}"
+        def create_records_for_query(env_name, env_cfg, query, records)
+          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 #{query}" -c #{knife_config_file} -F json -a name -a cloud.public_ipv4`)
+
+          query_node = nodes['rows'].collect do |row|
+            name, attrs = row.first
+            attrs
+          end.first
+
+          if query_node
+            if query_node['cloud.public_ipv4']
+              records.each do |record|
+                dns_record_cfg = {
+                    domain: [record, env_cfg[:domain]].compact.reject(&:empty?).join('.'),
+                    ipaddress: query_node['cloud.public_ipv4']
+                }
+                Dns::CreateRecord.new(@options.dup.merge(dns_record_cfg)).run
               end
             else
-              thor.say "Unable to locate node for query '#{query}' in cluster!!"
+              thor.say "Found query node '#{query_node['name']}', but was unable to retrieve it's IP!!}"
             end
+          else
+            thor.say "Unable to locate node for query '#{query}' in cluster!!"
           end
         end
 
@@ -123,4 +125,4 @@ module Fhcap
       end
     end
   end
-end
+end

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

@@ -160,6 +160,8 @@ module Fhcap
               'mbaas'
             when /ose-single/
               'ose-single'
+            when /ose-multi-node/
+              'ose-multi-node'
             when /single/
               'single'
             when /farm/
@@ -172,4 +174,4 @@ module Fhcap
       end
     end
   end
-end
+end

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

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

@@ -15,20 +15,46 @@ describe Fhcap::Tasks::Chef::Cookbook::UpdateArtifact do
     {}
   end
 
-  let(:options) do
-    {
-        :config => config,
-        :thor => thor,
-        :cookbook => 'testname',
-        :version => '9.9.9',
-        :build => '999'
-    }
-  end
+  context "without cookbook" do
+
+    let(:options) do
+      {
+          :config => config,
+          :thor => thor,
+          :component => 'testname',
+          :version => '9.9.9',
+          :build => '999'
+      }
+    end
+
+    describe "#initialize" do
+      specify { expect(subject.name).to eq('testname') }
+      specify { expect(subject.cookbook).to eq('testname') }
+      specify { expect(subject.version).to eq('9.9.9') }
+      specify { expect(subject.build).to eq('999') }
+    end
 
-  describe "#initialize" do
-    specify { expect(subject.name).to eq('testname') }
-    specify { expect(subject.version).to eq('9.9.9') }
-    specify { expect(subject.build).to eq('999') }
   end
 
+  context "with cookbook" do
+
+    let(:options) do
+      {
+          :config => config,
+          :thor => thor,
+          :component => 'testname',
+          :cookbook => 'testcookbook',
+          :version => '9.9.9',
+          :build => '999'
+      }
+    end
+
+    describe "#initialize" do
+      specify { expect(subject.name).to eq('testname') }
+      specify { expect(subject.cookbook).to eq('testcookbook') }
+      specify { expect(subject.version).to eq('9.9.9') }
+      specify { expect(subject.build).to eq('999') }
+    end
+
+  end
 end

data/templates/chef/environment_ose-multi-node.json.erb

@@ -0,0 +1,30 @@
+{
+  "name": "<%= config[:name] %>",
+  "description": "<%= config[:name] %> Environment",
+  "cookbook_versions": {
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment",
+  "default_attributes": {
+    "openshift": {
+      "domain": "<%= config[:domain] %>"
+    },
+    "rhsm": {
+      "username": "CHANGEME",
+      "password": "CHANGEME"
+    },
+    "resolver": {
+      "nameservers": [
+        "8.8.8.8",
+        "8.8.4.4"
+      ]
+    }
+  },
+  "override_attributes": {
+    "authorization": {
+      "sudo": {
+        "passwordless": true
+      }
+    }
+  }
+}

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

@@ -39,11 +39,34 @@
   "security_groups": {
     "ops-admin": {
       "authorize_ingress": [
+	{
+	  "protocols": ["icmp"],
+          "start": -1,
+          "end": -1,
+	  "sources": [
+	    "52.51.188.129"
+	  ]
+	},
         {
           "protocols": ["all"],
           "start": 0,
           "end": 65535,
-          "sources": ["<%= @my_public_ip %>", "83.147.149.210/32", "46.38.161.225/32", "54.229.76.48/32", "79.125.117.182/32", "78.137.150.209/32", "52.37.106.23", "52.50.12.70", "52.62.158.176", "52.70.198.93", "52.193.17.19", "52.86.106.110", "52.48.49.57"]
+	  "sources": [
+	    "<%= @my_public_ip %>",
+	    "46.38.161.225/32",
+	    "52.193.17.19",
+	    "52.37.106.23",
+	    "52.48.49.57",
+	    "52.50.12.70",
+	    "52.51.188.129",
+	    "52.62.158.176",
+	    "52.70.198.93",
+	    "52.86.106.110",
+	    "54.229.76.48/32",
+	    "78.137.150.209/32",
+	    "79.125.117.182/32",
+	    "149.11.36.106/32"
+	  ]
         }
       ]
     },
@@ -58,4 +81,4 @@
       ]
     }
   }
-}
+}

data/templates/cluster/aws/ose-multi-node.json.erb

@@ -0,0 +1,230 @@
+{
+  "domain": "<%= config[:domain] %>",
+  <%- unless config[:provider_config][:cidr] == "none" -%>
+  "subnets": {
+    "1a": {
+      "cidr": "0/26",
+      "availability_zone": "1a"
+    },
+    "1b": {
+      "cidr": "64/26",
+      "availability_zone": "1b"
+    },
+    "1c": {
+      "cidr": "128/26",
+      "availability_zone": "1c"
+    }
+  },
+  "vpc": {
+    "enable_dns_support": true,
+    "enable_dns_hostnames": true
+  },
+  <%- end -%>
+  "security_groups": {
+    "<%= config[:environment_name] %>-ose-master": {
+      "authorize_ingress": [
+        {
+          "protocols": [
+            "all"
+          ],
+          "start": 0,
+          "end": 65535,
+          "groups": [
+            "<%= config[:environment_name] %>-ose-master",
+            "<%= config[:environment_name] %>-ose-node",
+            "<%= config[:environment_name] %>-ose-nfs"
+          ]
+        },
+        {
+          "protocols": [
+            "icmp"
+          ],
+          "start": -1,
+          "end": -1,
+          "groups": [
+            "<%= config[:environment_name] %>-ose-master",
+            "<%= config[:environment_name] %>-ose-node",
+            "<%= config[:environment_name] %>-ose-nfs"
+          ]
+        },
+        {
+          "protocols": [
+            "tcp"
+          ],
+          "start": 8443,
+          "end": 8443,
+          "sources": [
+            "0.0.0.0/0"
+          ]
+        }
+      ]
+    },
+    "<%= config[:environment_name] %>-ose-node": {
+      "authorize_ingress": [
+        {
+          "protocols": [
+            "all"
+          ],
+          "start": 0,
+          "end": 65535,
+          "groups": [
+            "<%= config[:environment_name] %>-ose-master",
+            "<%= config[:environment_name] %>-ose-node",
+            "<%= config[:environment_name] %>-ose-lb",
+            "<%= config[:environment_name] %>-ose-nfs"
+          ]
+        },
+        {
+          "protocols": [
+            "icmp"
+          ],
+          "start": -1,
+          "end": -1,
+          "groups": [
+            "<%= config[:environment_name] %>-ose-master",
+            "<%= config[:environment_name] %>-ose-node",
+            "<%= config[:environment_name] %>-ose-lb",
+            "<%= config[:environment_name] %>-ose-nfs"
+          ]
+        }
+      ]
+    },
+    "<%= config[:environment_name] %>-ose-lb": {
+      "authorize_ingress": [
+        {
+          "protocols": [
+            "tcp"
+          ],
+          "start": 80,
+          "end": 80,
+          "sources": [
+            "0.0.0.0/0"
+          ]
+        }
+      ]
+    },
+    "<%= config[:environment_name] %>-ose-nfs": {
+      "authorize_ingress": [
+        {
+          "protocols": [
+            "all"
+          ],
+          "start": 0,
+          "end": 65535,
+          "groups": [
+            "<%= config[:environment_name] %>-ose-master",
+            "<%= config[:environment_name] %>-ose-node",
+            "<%= config[:environment_name] %>-ose-nfs"
+          ]
+        },
+        {
+          "protocols": [
+            "icmp"
+          ],
+          "start": -1,
+          "end": -1,
+          "groups": [
+            "<%= config[:environment_name] %>-ose-master",
+            "<%= config[:environment_name] %>-ose-node",
+            "<%= config[:environment_name] %>-ose-lb"
+          ]
+        }
+      ]
+    }
+  },
+  "load_balancers": {
+    "ose-lb": {
+      "security_groups": ["<%= config[:environment_name] %>-ose-lb"],
+      "subnets": ["1a", "1b", "1c"],
+      "scheme": "internet-facing",
+      "listeners": [
+        {
+          "port": 80,
+          "protocol": "http",
+          "instance_port": 80,
+          "instance_protocol": "http"
+        }
+      ]
+    }
+  },
+  "instances": {
+    "master1": {
+      "aws": {
+        "security_groups": [
+          "ops-admin",
+          "<%= config[:environment_name] %>-ose-master"
+        ]
+        <%- unless config[:provider_config][:cidr] == "none" -%>
+        ,"private_ip_address": "",
+        "subnet": "1a"
+        <%- end -%>
+      },
+      "run_list": [
+        "role[ose_master_server]"
+      ]
+    },
+    "node1": {
+      "aws": {
+        "security_groups": [
+          "ops-admin",
+          "<%= config[:environment_name] %>-ose-node"
+        ]
+        <%- unless config[:provider_config][:cidr] == "none" -%>
+        ,"private_ip_address": "",
+        "subnet": "1a"
+        <%- end -%>
+      },
+      "run_list": [
+        "role[ose_node_server]"
+      ],
+      "load_balancers": ["ose-lb"]
+    },
+    "node2": {
+      "aws": {
+        "security_groups": [
+          "ops-admin",
+          "<%= config[:environment_name] %>-ose-node"
+        ]
+        <%- unless config[:provider_config][:cidr] == "none" -%>
+        ,"private_ip_address": "",
+        "subnet": "1b"
+        <%- end -%>
+      },
+      "run_list": [
+        "role[ose_node_server]"
+      ],
+      "load_balancers": ["ose-lb"]
+    },
+    "node3": {
+      "aws": {
+        "security_groups": [
+          "ops-admin",
+          "<%= config[:environment_name] %>-ose-node"
+        ]
+        <%- unless config[:provider_config][:cidr] == "none" -%>
+        ,"private_ip_address": "",
+        "subnet": "1c"
+        <%- end -%>
+      },
+      "run_list": [
+        "role[ose_node_server]"
+      ],
+      "load_balancers": ["ose-lb"]
+    },
+    "nfs1": {
+      "aws": {
+        "security_groups": [
+          "ops-admin",
+          "<%= config[:environment_name] %>-ose-nfs"
+        ]
+        <%- unless config[:provider_config][:cidr] == "none" -%>
+        ,"private_ip_address": "",
+        "subnet": "1a"
+        <%- end -%>
+      },
+      "run_list": [
+        "role[ose_storage_server]"
+      ]
+    }
+  }
+}

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

@@ -87,8 +87,9 @@
       },
       "run_list": [
         "role[ose_master_server]",
-        "role[ose_node_server]"
+        "role[ose_node_server]",
+        "role[ose_storage_server]"
       ]
     }
   }
-}
+}

data/templates/cluster/openstack/ose-multi-node.json.erb

@@ -0,0 +1,30 @@
+{
+  "domain": "<%= config[:domain] %>",
+  "instances": {
+    "master1": {
+      "run_list": [
+        "role[ose_master_server]"
+      ]
+    },
+    "node1": {
+      "run_list": [
+        "role[ose_node_server]"
+      ]
+    },
+    "node2": {
+      "run_list": [
+        "role[ose_node_server]"
+      ]
+    },
+    "node3": {
+      "run_list": [
+        "role[ose_node_server]"
+      ]
+    },
+    "nfs1": {
+      "run_list": [
+        "role[ose_storage_server]"
+      ]
+    }
+  }
+}

data/templates/cluster/openstack/ose-single.json.erb

@@ -4,8 +4,9 @@
     "node1": {
       "run_list": [
         "role[ose_master_server]",
-        "role[ose_node_server]"
+        "role[ose_node_server]",
+        "role[ose_storage_server]"
       ]
     }
   }
-}
+}

data/templates/cluster/ose-multi-node.json.erb

@@ -0,0 +1,8 @@
+{
+  "environments": [
+    {
+      "name": "ose-multi-node",
+      "template": "ose-multi-node"
+    }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -476,6 +476,7 @@ files:
 - lib/cookbooks/provision/recipes/openstack_cluster_destroy.rb
 - lib/cookbooks/provision/recipes/ose_install.rb
 - lib/cookbooks/provision/recipes/ose_post_install.rb
+- lib/cookbooks/provision/recipes/ose_reset_cluster.rb
 - lib/cookbooks/provision/recipes/post_create_instances.rb
 - lib/cookbooks/provision/recipes/rabbitmq_reset_cluster.rb
 - lib/cookbooks/provision/recipes/restart_services.rb
@@ -601,6 +602,7 @@ files:
 - templates/chef/environment_empty.json.erb
 - templates/chef/environment_farm.json.erb
 - templates/chef/environment_mbaas.json.erb
+- templates/chef/environment_ose-multi-node.json.erb
 - templates/chef/environment_ose-single.json.erb
 - templates/chef/environment_single.json.erb
 - templates/cluster/aws/common.json.erb
@@ -611,6 +613,7 @@ files:
 - templates/cluster/aws/farm-single.json.erb
 - templates/cluster/aws/mbaas-3node.json.erb
 - templates/cluster/aws/nginx-test.json.erb
+- templates/cluster/aws/ose-multi-node.json.erb
 - templates/cluster/aws/ose-single.json.erb
 - templates/cluster/aws/single-blank.json.erb
 - templates/cluster/aws/single.json.erb
@@ -630,9 +633,11 @@ files:
 - templates/cluster/openstack/farm-single.json.erb
 - templates/cluster/openstack/mbaas-3node.json.erb
 - templates/cluster/openstack/nginx-test.json.erb
+- templates/cluster/openstack/ose-multi-node.json.erb
 - templates/cluster/openstack/ose-single.json.erb
 - templates/cluster/openstack/single-blank.json.erb
 - templates/cluster/openstack/single.json.erb
+- templates/cluster/ose-multi-node.json.erb
 - templates/cluster/ose-single.json.erb
 - templates/cluster/single-blank.json.erb
 - templates/cluster/single.json.erb