abiquo-etk 0.4.29 → 0.4.32

data/VERSION

@@ -1 +1 @@
-0.4.29
+0.4.32

data/abiquo-etk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{abiquo-etk}
-  s.version = "0.4.29"
+  s.version = "0.4.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]
-  s.date = %q{2010-10-29}
+  s.date = %q{2010-11-03}
   s.description = %q{Tools to troubleshoot and manage your Abiquo installation}
   s.email = %q{srubio@abiquo.com}
   s.executables = ["abiquo-check-16-install", "abicli", "abiquo-initenv"]

data/abiquo-etk.spec

@@ -5,7 +5,7 @@
 
 Summary: Abiquo Elite Toolkit
 Name: rubygem-%{gemname}
-Version: 0.4.28
+Version: 0.4.32
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -43,10 +43,8 @@ rm -rf %{buildroot}
 %files
 %defattr(-, root, root, -)
 %{_bindir}/abicli
-%{_bindir}/aetk-setup-server
-%{_bindir}/aetk-setup-rs
-%{_bindir}/aetk-setup-v2v
 %{_bindir}/abiquo-check-16-install
+%{_bindir}/abiquo-initenv
 %{gemdir}/gems/%{gemname}-%{version}/
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %doc %{geminstdir}/LICENSE
@@ -57,6 +55,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov 03 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.32-1
+- Updated to upstream 0.4.32-1
+
+* Tue Nov 02 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.31-1
+- Updated to upstream 0.4.31
+
+* Tue Nov 02 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.30-1
+- Updated to upstream 0.4.30
+
+* Tue Nov 02 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.29-1
+- Updated to upstream 0.4.29
+
 * Fri Oct 29 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.28-1
 - Updated to upstream 0.4.28
 

data/bin/abiquo-initenv

@@ -13,33 +13,17 @@ def create_schemas(user = 'root', password = '')
   end
 
   if `#{cmd} -e 'show databases'|grep kinton`.strip.chomp.empty?
-    cib = false
-    if File.exist? '/etc/abiquo-release'
-      if File.readlines('/etc/abiquo-release').join =~ /cloud-in-a-box/
-        log.info 'Cloud in a Box profile found'
-        cib = true
-      end
+    out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-schema.sql`
+    if $?.exitstatus == 0 
+      log.info 'kinton-schema imported succesfully.'
+    else
+      log.error "Error importing kinton-schema: #{out}"
     end
-    if cib
-      out = `mysql -u root < /usr/share/doc/abiquo-16-pocsetup/cloud-in-a-box.sql`
-      if $?.exitstatus == 0 
-        log.info 'cloud-in-a-box schema imported succesfully.'
-      else
-        log.error "Error importing cloud-in-a-box schema: #{out}"
-      end
+    out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-premium-schema.sql`
+    if $?.exitstatus == 0 
+      log.info 'kinton-premium-schema imported succesfully.'
     else
-      out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-schema.sql`
-      if $?.exitstatus == 0 
-        log.info 'kinton-schema imported succesfully.'
-      else
-        log.error "Error importing kinton-schema: #{out}"
-      end
-      out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-premium-schema.sql`
-      if $?.exitstatus == 0 
-        log.info 'kinton-premium-schema imported succesfully.'
-      else
-        log.error "Error importing kinton-premium-schema: #{out}"
-      end
+      log.error "Error importing kinton-premium-schema: #{out}"
     end
   else
     log.warn 'kinton schema found. Skipping schema creation.'
@@ -51,7 +35,6 @@ def init_server_install
   config_file ='/etc/sysconfig/abiquo-server'
   log = AETK::Log.instance
 
-  log.info "Server install detected. Setting up the environment."
   begin
     if File.exist? config_file 
       @settings = abiquo_server_settings
@@ -81,7 +64,6 @@ def init_remote_services_install
   config_file ='/etc/sysconfig/abiquo-rs'
 
   log = AETK::Log.instance
-  log.info "Remote Services install detected. Setting up the environment."
 
   begin
     @settings = {}
@@ -113,7 +95,6 @@ end
 def init_v2v_install
   config_file ='/etc/sysconfig/abiquo-server'
   log = AETK::Log.instance
-  log.info "V2V install detected. Setting up the environment."
 end
 
 def init_rs_plus_v2v_install
@@ -121,16 +102,61 @@ def init_rs_plus_v2v_install
   init_v2v_install
 end
 
-AETK::Log.instance.info "Running abiquo-initenv..."
+log = AETK::Log.instance
+log.info "Running abiquo-initenv..."
 case AETK::System.detect_install_type 
+when :monolithic
+  log.info "Monolithic install detected. Setting up the environment."
+  init_server_install
+  init_remote_services_install
+  init_v2v_install
 when :server
+  log.info "Server install detected. Setting up the environment."
   init_server_install
 when :remote_services
+  log.info "Remote Services install detected. Setting up the environment."
   init_remote_services_install
 when :v2v
+  log.info "V2V install detected. Setting up the environment."
   init_v2v_install
 when :rs_plus_v2v
+  log.info "Remote Services + V2V install detected. Setting up the environment."
   init_rs_plus_v2v_install
 else
   AETK::Log.instance.error "Couldn't detect install type. Skipping first setup."
 end
+
+#
+# Try to apply netapp ontap connector settings
+#
+if File.exist?('/opt/abiquo/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml')
+  AETK::Log.info "Abiquo ONTAP connector found."
+  if File.exist?('/etc/sysconfig/abiquo-rs')
+    buf = File.read '/etc/sysconfig/abiquo-rs'
+    buf.each_line do |l|
+      if l =~ /ontap_user/
+        user = l.split('=').last.strip.chomp rescue ''
+        AETK::Log.info "ONTAP: Configure ontap-user"
+        `abicli set ontap-user #{user}`
+      end
+    end
+    buf.each_line do |l|
+      if l =~ /ontap_password/
+        password = l.split('=').last.strip.chomp rescue ''
+        AETK::Log.info "ONTAP: Configure ontap-password"
+        `abicli set ontap-password #{password}`
+      end
+    end
+    buf.each_line do |l|
+      if l =~ /ontap_server_ip/
+        server = l.split('=').last.strip.chomp rescue ''
+        AETK::Log.info "ONTAP: Configure ontap-server-ip"
+        `abicli set ontap-server-ip #{server}`
+      end
+    end
+  else
+    AETK::Log.warn "/etc/sysconfig/abiquo-rs config file not found. Skipping ONTAP configuration."
+  end
+else
+  AETK::Log.info "Abiquo ONTAP connector NOT found."
+end

data/lib/abiquo-etk.rb

@@ -134,6 +134,22 @@ module AETK
   
   class Log
 
+    def self.debug(mgs)
+      instance.debug msg
+    end
+
+    def self.info(msg)
+      instance.info msg
+    end
+
+    def self.error(msg)
+      instance.error msg
+    end
+
+    def self.warn(msg)
+      instance.warn msg
+    end
+
     def self.instance(file = '/var/log/abiquo-etk.log')
       @@logger ||= Logger.new file
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 4
-  - 29
-  version: 0.4.29
+  - 32
+  version: 0.4.32
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-11-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency