add support for centos7 for 4.10 with jdk8

Author: pdion891

libraries/global_setting.rb

@@ -23,7 +23,7 @@ module GlobalSetting
 
     # Support whyrun
     def whyrun_supported?
-      true
+      false
     end
 
     def load_current_value(name)

metadata.rb

@@ -4,14 +4,16 @@
 license          'Apache 2.0'
 description      'Installs/Configures cloudstack'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '4.0.5'
+version          '4.0.7'
 
 source_url 'https://github.com/cloudops/cookbook_cloudstack'
 issues_url 'https://github.com/cloudops/cookbook_cloudstack/issues'
 
 depends "yum", "> 3.0"
 depends "apt", "> 2.0"
-depends "mysql", "> 6.0.0"
+depends 'mysql', '~> 8.0'
+
+#depends "mysql", "> 6.0.0"
 depends "sudo", ">= 2.6.0"
 
 supports 'centos'

providers/setup_management.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: cloudstack
 # Provider:: setup_management
 # Author:: Pierre-Luc Dion (<[email protected]>)
-# Copyright 2015, CloudOps, Inc.
+# Copyright 2017, CloudOps, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,16 +16,42 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# execute default cloudstack configuration script 
+# execute default cloudstack configuration script
 ###############################################################################
 
-use_inline_resources
+# use_inline_resources
 
-action :run do
+# # Support whyrun
+# def whyrun_supported?
+#   false
+# end
 
-  bash "cloudstack-setup-management" do
-    code "/usr/bin/cloudstack-setup-management"
-    not_if { ::File.exists?("/etc/cloudstack/management/tomcat6.conf") || ::File.exists?("/etc/cloudstack/management/server.xml")}
-  end
+# action :run do
+#   load_current_resource
 
-end
+#   if !@current_resource.exists
+#     params = ''
+# #    params += ' --tomcat7' if @current_resource.tomcat7
+# #    params += ' --https' if @current_resource.https
+# #    params += ' --no-start' if @current_resource.nostart
+
+#     bash "cloudstack-setup-management" do
+#       code "/usr/bin/cloudstack-setup-management #{params}"
+#       not_if { ::File.exists?("/etc/cloudstack/management/tomcat6.conf") || ::File.exists?("/etc/cloudstack/management/server.xml")}
+#     end
+#   end
+
+# end
+
+# def load_current_resource
+#   @current_resource = Chef::Resource::CloudstackSetupDatabase.new(@new_resource.name)
+#   @current_resource.name(@new_resource.name)
+#   @current_resource.tomcat7(@new_resource.tomcat7)
+#   @current_resource.https(@new_resource.https)
+#   @current_resource.nostart(@new_resource.nostart)
+
+#   # use tomcat7 if CentOS 7
+# #  @current_resource.tomcat = true if node['platform'] == 'centos' && node['platform_version'] == '7'
+
+#   @current_resource.exists = ::File.exists?("/etc/cloudstack/management/server.xml")
+# end

recipes/management_server.rb

@@ -20,13 +20,14 @@
 ####
 
 include_recipe 'cloudstack::default'
-include_recipe "cloudstack::repo"
+include_recipe 'cloudstack::repo'
 
 package "cloudstack-management" do
    action :install
    if ! node['cloudstack']['version'].empty?
      version node['cloudstack']['version']
    end
+   timeout 300
 end
 
 # tomcat6 package installation automatically start tomcat6 on port 8080.
@@ -82,4 +83,3 @@
 #  supports :restart => true, :status => true, :start => true, :stop => true
 #  action :nothing
 #end
-

resources/global_setting.rb

@@ -5,8 +5,7 @@
 # Copyright 2015, CloudOps, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.require "system_vm_template"
-
+# you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0

resources/setup_management.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: cloudstack
 # Resource:: setup_management
 # Author:: Pierre-Luc Dion (<[email protected]>)
-# Copyright 2015, CloudOps, Inc.
+# Copyright 2017, CloudOps, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.require "system_vm_template"
@@ -18,13 +18,24 @@
 # limitations under the License.
 #
 #
-# execute default cloudstack configuration script 
+# execute default cloudstack configuration script
 ###############################################################################
 
-actions :run
+property :host,    String,        name_property: true
+property :tomcat7, [true, false], required: false, default: false
+property :https,   [true, false], required: false, default: false
+property :nostart, [true, false], required: false, default: false
 
-default_action :run
+tomcat7 = true if node['platform'] == 'centos' && node['platform_version'].split('.')[0] == '7'
 
-attribute :host                   , :name_attribute => true, :kind_of => String
+action :run do
+  params = ''
+  params += ' --tomcat7' if tomcat7
+  params += ' --https'   if https
+  params += ' --nostart' if nostart
 
-attr_accessor :exists
+  bash "cloudstack-setup-management" do
+    code "/usr/bin/cloudstack-setup-management #{params}"
+    not_if { ::File.exists?("/etc/cloudstack/management/tomcat6.conf") || ::File.exists?("/etc/cloudstack/management/server.xml")}
+  end
+end