Removed legacy files, update cloudstack_setup_database to work with Chef14, initial server specs tests

Author: pdion891

.kitchen.yml

@@ -6,20 +6,11 @@ provisioner:
   name: chef_solo
 
 platforms:
-  - name: ubuntu-14.04
-  - name: centos-6.6
-  - name: centos-7.1
+#  - name: ubuntu-16.04
+  - name: centos-7
 
 suites:
   - name: default
     run_list:
-      - recipe[cloudstack::management_server]
-      - recipe[cloudstack::usage]
+      - recipe[cloudstack::circle-ci]
     attributes:
-  - name: acs46
-    run_list:
-      - recipe[cloudstack::management_server]
-      - recipe[cloudstack::usage]
-    attributes: 
-      cloudstack: 
-        release_major: '4.6'

CHANGELOG.md

@@ -3,6 +3,12 @@ cloudstack CHANGELOG
 
 This file is used to list changes made in each version of the co-cloudstack cookbook.
 
+6.0.0
+-----
+- pdion891 - Fix Chef14 issues on CentOS 7 for cloudstack_setup_database ressource.
+           - Added circle-ci recipe for automated CI.
+           - Remove management of sudoers file, pkgs are taking care of it.
+
 5.0.0
 -----
 - pdion891 - update default version to 4.11.

README.md

@@ -2,9 +2,9 @@
 
 Install and configure [Apache Cloudstack](http://cloudstack.apache.org) using [Chef](http://www.chef.io/). A wrapper cookbook is prefered in order to Install Apache CloudStack properly, refer to [cloudstack_wrapper cookbook](https://github.com/cloudops/cookbook_cloudstack_wrapper) for example.
 
-Work with Chef 12 only.
 
-Tested on CentOS 7 and Ubuntu 16.04
+Tested on CentOS 7
+Some parts work with Ubuntu 16.04 but this cookbook does not perform all configuraiton required for CloudStack Management-server on Ubuntu.
 
 ## Table of Contents
 

Thorfile

@@ -23,7 +23,7 @@ module Cloudstack
   module Database
     def init_database
       # Create database in MySQL using cloudstack-setup-databases scripts
-      setup_db_init_cmd = "#{@scriptname} #{@current_resource.user}:#{@current_resource.password}@#{@current_resource.ip} --deploy-as=#{@current_resource.root_user}:#{@current_resource.root_password} -m #{@current_resource.management_server_key} -k #{@current_resource.database_key}"
+      setup_db_init_cmd = "#{@scriptname} #{new_resource.user}:#{new_resource.password}@#{new_resource.ip} --deploy-as=#{new_resource.root_user}:#{new_resource.root_password} -m #{new_resource.management_server_key} -k #{new_resource.database_key}"
       cloudstack_setup_database = Mixlib::ShellOut.new(setup_db_init_cmd)
       cloudstack_setup_database.run_command
       if cloudstack_setup_database.exitstatus == 0
@@ -32,7 +32,7 @@ def init_database
 
     def init_config_database
       # Create database configuration for cloudstack management server that will use and existing database.
-      setup_db_init_cmd = "#{@scriptname} #{@current_resource.user}:#{@current_resource.password}@#{@current_resource.ip} -m #{@current_resource.management_server_key} -k #{@current_resource.database_key}"
+      setup_db_init_cmd = "#{@scriptname} #{new_resource.user}:#{new_resource.password}@#{new_resource.ip} -m #{new_resource.management_server_key} -k #{new_resource.database_key}"
       cloudstack_setup_database = Mixlib::ShellOut.new(setup_db_init_cmd)
       cloudstack_setup_database.run_command
       if cloudstack_setup_database.exitstatus == 0

libraries/database.rb renamed to database.rb

@@ -41,15 +41,32 @@ def port_open(ip, port, seconds = 1)
       false
     end
 
-    # Test if CloudStack Database already exist
+    def verify_db_connection?(db_host = 'localhost', db_user = 'root', db_password = 'password')
+      # Make sure we can connect to db server
+      conn_db_test = "mysql -h #{db_host} -u #{db_user} -p#{db_password} -e 'show databases;'"
+      begin
+        if shell_out!(conn_db_test).error?
+          false
+        else
+          true
+        end
+      rescue
+        false
+      end
+    end
+
     def db_exist?(db_host = 'localhost', db_user = 'cloud', db_password = 'password')
+      # Test if CloudStack Database already exist
+      # if fail to connect with db_user, return false;
       conn_db_test = "mysql -h #{db_host} -u #{db_user} -p#{db_password} -e 'show databases;'|grep cloud"
-      conn_db_test_out = Mixlib::ShellOut.new(conn_db_test)
-      conn_db_test_out.run_command
-      if conn_db_test_out.exitstatus == 0
-        return true
-      else
-        return false
+      begin
+        if shell_out!(conn_db_test).error?
+          false
+        else
+          true
+        end
+      rescue
+        false
       end
     end
 

libraries/cloudstack_helper.rb

@@ -4,7 +4,7 @@
 license          'Apache-2.0'
 description      'Installs/Configures cloudstack'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '5.0.0'
+version          '6.0.0'
 
 source_url 'https://github.com/cloudops/cookbook_cloudstack'
 issues_url 'https://github.com/cloudops/cookbook_cloudstack/issues'

metadata.rb

@@ -0,0 +1,51 @@
+#
+# Cookbook Name:: cloudstack
+# Recipe:: default
+# Author:: Pierre-Luc Dion (<[email protected]>)
+# Copyright 2018, CloudOps, Inc.
+#
+# kitchen test file
+
+include_recipe 'cloudstack::management_server'
+include_recipe 'cloudstack::usage'
+
+# install mysql-server
+package 'mariadb-server'
+
+execute 'set mysql root password' do
+  command 'mysqladmin -h 127.0.0.1 -u root password password'
+  action :nothing
+end
+
+if platform?(%w(redhat centos fedora oracle))
+  service 'mariadb' do
+    action :start
+    notifies :run, 'execute[set mysql root password]', :immediately
+  end
+elsif platform?(%w(ubuntu debian))
+  service 'mysql' do
+    action :start
+    notifies :run, 'execute[set mysql root password]', :immediately
+  end
+end
+
+# init database and connection configuration
+cloudstack_setup_database '127.0.0.1' do
+  root_user     'root'
+  root_password 'password'
+  user          'cloud'
+  password      'cloud'
+  action        :create
+end
+
+cloudstack_setup_management node.name do
+  tomcat7 true
+end
+
+service 'cloudstack-management' do
+  action [ :enable, :start ]
+end
+
+service 'cloudstack-usage' do
+  action [ :enable, :start ]
+end

providers/setup_management.rb

@@ -37,43 +37,3 @@
 
 include_recipe 'cloudstack::vhd-util'
 
-#
-# Set nproc limits for user cloud
-#
-template node['cloudstack']['nproc_limit_file'] do
-  source 'nproc_limits.erb'
-  owner 'root'
-  group 'root'
-  mode 0755
-  variables user:          node['cloudstack']['username'],
-            hard:          node['cloudstack']['nproc_limit_hard'],
-            soft:          node['cloudstack']['nproc_limit_soft'],
-            recipe_file:   __FILE__.to_s.split('cookbooks/').last,
-            template_file: source.to_s
-end
-
-#
-# Set nofile limits for user cloud
-#
-template node['cloudstack']['nofile_limit_file'] do
-  source 'nofile_limits.erb'
-  owner 'root'
-  group 'root'
-  mode 0755
-  variables user:          node['cloudstack']['username'],
-            hard:          node['cloudstack']['nofile_limit_hard'],
-            soft:          node['cloudstack']['nofile_limit_soft'],
-            recipe_file:   __FILE__.to_s.split('cookbooks/').last,
-            template_file: source.to_s
-end
-
-# Configure sudo for user cloud
-include_recipe 'sudo'
-sudo 'cloud' do
-  template 'sudoers_cloudstack.erb'
-end
-
-# service 'cloudstack-management' do
-#  supports :restart => true, :status => true, :start => true, :stop => true
-#  action :nothing
-# end

recipes/circle-ci.rb

@@ -1,8 +1,8 @@
 #
 # Cookbook Name:: cloudstack
-# Resource:: init_db
+# Resource:: setup_database
 # Author:: Pierre-Luc Dion (<[email protected]>)
-# Copyright 2015, CloudOps, Inc.
+# Copyright 2018, 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,62 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-actions :create
+# include Chef::Mixin::ShellOut
 
 default_action :create
 
-attribute :ip,                    name_attribute: true, kind_of: String
-attribute :user,                  kind_of: String, default: 'cloud'
-attribute :password,              kind_of: String, default: 'password'
-attribute :root_user,             kind_of: String, default: 'root'
-attribute :root_password,         kind_of: String, default: 'ilikerandompasswords'
-attribute :management_server_key, kind_of: String, default: 'password'
-attribute :database_key,          kind_of: String, default: 'password'
+property :ip,                    String, name_property: true
+property :user,                  String, default: 'cloud'
+property :password,              String, default: 'password'
+property :root_user,             String, default: 'root'
+property :root_password,         String, default: 'ilikerandompasswords'
+property :management_server_key, String, default: 'password'
+property :database_key,          String, default: 'password'
 
-attr_accessor :exists
+action :create do
+  unless dbconf_exist?
+    @scriptname = '/usr/bin/cloudstack-setup-databases'
+    if ::File.exist?(@scriptname) && verify_db_connection?(new_resource.ip, new_resource.root_user, new_resource.root_password)
+      if db_exist?(new_resource.ip, new_resource.user, new_resource.password)
+        converge_by('Using existing CloudStack database') do
+          init_config_database
+        end
+      else
+        converge_by('Creating CloudStack database') do
+          init_database
+        end
+      end
+    else
+      Chef::Log.error "#{@scriptname} not found or fail to connect to database."
+    end
+  end
+end
+
+action_class do
+  include Cloudstack::Helper
+
+  def init_database
+    # Create database in MySQL using cloudstack-setup-databases scripts
+    setup_db_init_cmd = "#{@scriptname} #{new_resource.user}:#{new_resource.password}@#{new_resource.ip} --deploy-as=#{new_resource.root_user}:#{new_resource.root_password} -m #{new_resource.management_server_key} -k #{new_resource.database_key}"
+    shell_out!(setup_db_init_cmd)
+  end
+
+  def init_config_database
+    # Create database configuration for cloudstack management server that will use and existing database.
+    setup_db_init_cmd = "#{@scriptname} #{new_resource.user}:#{new_resource.password}@#{new_resource.ip} -m #{new_resource.management_server_key} -k #{new_resource.database_key}"
+    shell_out!(setup_db_init_cmd)
+  end
+
+  def dbconf_exist?
+    # test if db.properties as been modified from default installation file. if password encrypted, then we step there to not break anything.
+    Chef::Log.debug 'Checking to see if database config db.properties as been configured'
+    conf_exist = Mixlib::ShellOut.new('cat /etc/cloudstack/management/db.properties |grep "ENC("')
+    conf_exist.run_command
+    if conf_exist.exitstatus == 0
+      true
+    else
+      Chef::Log.debug 'db.properties does not contain encrypted passwords.'
+      false
+    end
+  end
+end