tdl 0.0.1 → 0.0.2

data/lib/etdl_processor.rb

@@ -8,6 +8,7 @@
 ###########################################################
 
 require 'cloud_inst'
+require 'package_system'
 
 ###############################################################
 # Use various subsystems to process an etdl
@@ -28,54 +29,18 @@ class ETDLProcessor
 
     puts "using address #{inst.address}\nssh:#{inst.ssh}\nscp:#{inst.scp}".green
 
+    # TODO compare instance to etdl os
+
     inst
   end
 
   def process(etdl, instance)
-    # TODO need to open firewall ports (we have to open them manually now)
-
-    # set hostname
-    hostname = etdl.instance_attributes[:hostname]
-      unless hostname.nil?
-        puts "Setting hostname to #{hostname}".green
-        instance.exec "sudo hostname #{hostname}"
-
-        # append hostname to /etc/hosts/
-        etdl.instance_attributes[:files] <<
-          {:name => '/etc/hosts', :append => true,
-           :owner => 'root', :group => 'root', :mode => 644,
-           :contents => "#{instance.address} #{hostname}"}
-      end
+    # TODO setup repos
 
     # yum install packages
     packages = etdl.instance_attributes[:packages].join(" ")
       puts "installing #{packages}".green
-      puts instance.exec("sudo yum install -y --nogpgcheck #{packages}").blue
-
-    # start services
-    services = etdl.instance_attributes[:services]
-      services.each { |s|
-        puts "starting/enabling service #{s[:name]}".green
-        s[:pre].each { |cmd|
-          puts " running precommand #{cmd}".green
-          puts instance.exec("sudo #{cmd}").blue
-        }
-        puts instance.exec("sudo service #{s[:name]} start").blue
-        puts instance.exec("sudo chkconfig --levels 35 #{s[:name]} on").blue
-        s[:post].each { |cmd|
-          puts " running postcommand #{cmd}".green
-          puts instance.exec("sudo #{cmd}").blue
-        }
-      }
-
-    # create dirs
-    dirs = etdl.instance_attributes[:dirs]
-      dirs.each { |d|
-        puts "creating dir #{d[:name]}".green
-        instance.exec("sudo rm -rf #{d[:name]}") if d[:remove]
-        instance.exec("sudo mkdir -p #{d[:name]}")
-        instance.exec("sudo chown #{d[:owner]}.#{d[:group]} #{d[:name]}")
-      }
+      puts instance.exec(TDLTools::PackageSystem.install_pkg_cmd(packages)).blue
 
     # copy files over
     files = etdl.instance_attributes[:files]
@@ -85,19 +50,27 @@ class ETDLProcessor
         tf.close
 
         instance.cp tf.path, f[:name]
-        instance.exec("sudo chown #{f[:owner]}.#{f[:group]} #{f[:name]}")
-        instance.exec("sudo chmod #{f[:mode]} #{f[:name]}")
       }
 
     cmds = etdl.instance_attributes[:commands]
       cmds.each { |c|
-        puts "running command #{c[:cmd]} as #{c[:user]}"
-        puts instance.exec("sudo -u #{c[:user]} -i #{c[:cmd]}").blue
+        puts "running command #{c[:cmd]}"
+        puts instance.exec("#{c[:cmd]}").blue
       }
   end
 
   def verify(etdl, instance)
-    # TODO
+    etdl.verify_cmds.each { |v|
+        puts "running verification #{v}"
+        output = instance.exec("#{v}")
+        if $?.to_i == 0
+          puts output.blue
+          puts "  ...success!".blue
+        else
+          puts output.red
+          puts "  ... #{v} failed".red
+        end
+    }
   end
 
   def terminate_instance(instance)

data/lib/package_system.rb

@@ -0,0 +1,20 @@
+# tdl-tools package system representation
+#
+# Part of the Aeolus suite http://aeolusproject.org
+# Licensed under the MIT license
+# Copyright (C) 2013 Red Hat, Inc.
+# Written By Mo Morsi <mmorsi@redhat.com>
+#
+###########################################################
+
+# TODO use libosinfo to pull os information
+#      support os's other than rpm based ones
+
+module TDLTools
+class PackageSystem
+  # return command to install the specified packages on the local system
+  def self.install_pkg_cmd(packages)
+    "sudo yum install -y --nogpgcheck #{packages}"
+  end
+end
+end

data/lib/tdl_gem_path.rb

@@ -0,0 +1,14 @@
+# tdl-tools helper utility, return path to tdl-tools gem
+#
+# Part of the Aeolus suite http://aeolusproject.org
+# Licensed under the MIT license
+# Copyright (C) 2013 Red Hat, Inc.
+# Written By Mo Morsi <mmorsi@redhat.com>
+#
+###########################################################
+
+module TDLTools
+  def self.gem_path
+    File.dirname(File.expand_path(__FILE__)) + "/../"
+  end
+end

data/tdl-config.yml

@@ -0,0 +1,47 @@
+# type of cloud deploying instance/image to
+type:
+
+# for tdl-launch:
+provider:
+username:
+password:
+image:
+keyname:
+ssh_cmd:
+scp_cmd:
+
+# for imagefactory ec2
+#account:
+#access_key:
+#secret_access_key:
+#certificate:
+#key:
+
+# for imagefactory openstack
+#username:
+#tenant:
+#password:
+#strategy:
+#auth_url:
+#glance_host:
+#glance_port:
+
+# for imagefactory rhevm
+#username:
+#password:
+#api_url:
+#nfs_path:
+#nfs_dir:
+#nfs_host:
+#cluster:
+#timeout:
+
+# for imagefactory vsphere
+#username:
+#password:
+#api_url:
+#username:
+#password:
+#datastore:
+#compute_resource:
+#network_name:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,6 +30,8 @@ dependencies:
 description: Aeolus Template Description Language Tools
 email: mmorsi@redhat.com
 executables:
+- tdl-config.rb
+- tdl-apply.rb
 - tdl-launch.rb
 - tdl-convert.rb
 - tdl-verify.rb
@@ -39,10 +41,19 @@ extra_rdoc_files: []
 files:
 - lib/etdl_processor.rb
 - lib/etdl.rb
+- lib/tdl_gem_path.rb
 - lib/cloud_inst.rb
+- lib/package_system.rb
+- data/sample.etdl
+- data/tdl.rng
+- data/sample.tdl
+- data/etdl.rng
 - LICENSE
 - Rakefile
 - README.md
+- tdl-config.yml
+- bin/tdl-config.rb
+- bin/tdl-apply.rb
 - bin/tdl-launch.rb
 - bin/tdl-convert.rb
 - bin/tdl-verify.rb