corl 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 881f554ea8a48b043dcd9835c4cad50e4c2b51cb
-  data.tar.gz: 1d1f66df8ea0a33900f95727620e033b99037583
+  metadata.gz: 7a8900e16b96f2022f8c52ed251802c43e5a9224
+  data.tar.gz: 357559d77d1dd84501a5284cbb199cd0c631d239
 SHA512: 
-  metadata.gz: 2ee65aa1433b07072305fd0e1a4d5d09e61255a59d013df507329681b01f8826084b65cb15edb097e0547278d151fa7129b9f1b3e6c5b2562e64cce309cd878d
-  data.tar.gz: e49913e5c758ee2402edbde41061f0b70c1f2692a92c068a891c6f82d4a8e0035a1382455a4d5b14b07662ad9a0d3ab603440286ef1a4e2d4a7695bf94567aa8
+  metadata.gz: febc1d9a88160e7066180c423cf6fe2d3a5d610a3dd4a988c79873e55a5590d4e27221c29c9067bdca02eee11dd04b985cdf6668902ecd1fbac788374200bc3b
+  data.tar.gz: 3cc2e3bd2070075ce89166b1802f6049f68af56e027512ca16f1283a23e84cf1e49de6b0400964cba7376d844ce433a75ee83b31aeb21c744dc6bff415c08c14

data/README.rdoc

@@ -1,26 +1,8 @@
-## Welcome to CORL (Coral Orchestration and Research Library)
-
-CORL is a cloud application framework and command line utility that provides 
-easy and extensible creation and management of project based networks and nodes
-and relevant infrastructure.
-
-The CORL system is built on top of our general purpose Nucleon application
-framework.
-
-
-
-
-
-
-
-
-
-
-
-
-
+=== CORL (Coral Orchestration and Research Library)
 
+Coming soon!
 
+Note:  This library is still very early in development!
 
 ==== Contributing to CORL
  

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/bootstrap/os/ubuntu/05_ruby.sh

@@ -17,26 +17,15 @@ function initialize_rvm_user()
   local PROFILE_FILE="${LOCAL_HOME}/.profile"
   
   local PATH_ENTRY='PATH=${PATH}:/usr/local/rvm/bin'
-  local RVMSUDO_SECURE_PATH="export rvmsudo_secure_path=1"
-  local SUDO_ALIAS="alias sudo=rvmsudo"
-  
   local SCRIPT_INCLUDE="[[ -s '/usr/local/rvm/scripts/rvm' ]] && source '/usr/local/rvm/scripts/rvm'"
 
-  echo "3. Initializing RVM user ${USER_NAME} group and environment settings"
-  adduser "$USER_NAME" rvm >>/tmp/ruby.config.log 2>&1 || exit 52
+  echo "4. Initializing RVM user ${USER_NAME} group and environment settings"
+  adduser "$USER_NAME" rvm >>/tmp/ruby.config.log 2>&1 || exit 53
   
   if ! grep -Fxq "$PATH_ENTRY" "$PROFILE_FILE" >>/tmp/ruby.config.log 2>&1
   then
     echo "$PATH_ENTRY" >> "$PROFILE_FILE"
   fi
-  if ! grep -Fxq "$RVMSUDO_SECURE_PATH" "$PROFILE_FILE" >>/tmp/ruby.config.log 2>&1
-  then
-    echo "$RVMSUDO_SECURE_PATH" >> "$PROFILE_FILE"
-  fi
-  if ! grep -Fxq "$SUDO_ALIAS" "$PROFILE_FILE" >>/tmp/ruby.config.log 2>&1
-  then
-    echo "$SUDO_ALIAS" >> "$PROFILE_FILE"
-  fi   
   if ! grep -Fxq "$SCRIPT_INCLUDE" "$BASHRC_FILE" >>/tmp/ruby.config.log 2>&1
   then
     echo "$SCRIPT_INCLUDE" >> "$BASHRC_FILE"
@@ -49,6 +38,17 @@ gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 >/tmp/ruby.config.log
 echo "2. Installing RVM"
 curl -sL https://get.rvm.io | bash -s stable >>/tmp/ruby.config.log 2>&1 || exit 51
 
+if [ ! -e "/etc/profile.d/rvmsudo.sh" ]
+then
+echo "3. Adding a sudoers initialization file (compatible with RVM)"
+
+( cat <<'EOP'
+export rvmsudo_secure_path=1
+alias sudo=rvmsudo
+EOP
+) > "/etc/profile.d/rvmsudo.sh" || exit 52
+fi
+
 initialize_rvm_user 'root'
 
 for USER_HOME in /home/*/
@@ -60,18 +60,24 @@ do
   fi
 done
 
-echo "4. Installing Rubinius -- this will take some time"
-su - -c "rvm install rbx-2.3.0 --rubygems 2.4.2" root >>/tmp/ruby.config.log 2>&1 || exit 53
-su - -c "rvm use rbx-2.3.0 --default" root >>/tmp/ruby.config.log 2>&1 || exit 54
+echo "5. Installing Rubinius -- this will take some time"
+
+if [ -z "$RUBY_RVM_VERSION" ]
+then
+  RUBY_RVM_VERSION='ruby-2.1'
+fi
+
+su - -c "rvm install $RUBY_RVM_VERSION" root >>/tmp/ruby.config.log 2>&1 || exit 54
+su - -c "rvm use $RUBY_RVM_VERSION --default" root >>/tmp/ruby.config.log 2>&1 || exit 55
 
 
 if [ ! -e "/root/.gemrc" ]
 then
-echo "5. Adding an initial .gemrc configuration"
+echo "6. Adding an initial .gemrc configuration"
 
 # Set Gem options
 ( cat <<'EOP'
 gem: --no-rdoc --no-ri 
 EOP
-) > "/root/.gemrc" || exit 55
+) > "/root/.gemrc" || exit 56
 fi

data/bootstrap/os/ubuntu/06_puppet.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------
+
+PUPPET_PACKAGE="3.7.3-1puppetlabs1"
+
+#---
+
+# Set up Puppet Apt repositories
+echo "1. Fetching Puppet keys"
+apt-key adv --recv-key --keyserver pgp.mit.edu 4BD6EC30 >/tmp/puppet.key.log 2>&1 || exit 60
+
+echo "2. Updating Puppet packages from source"
+echo -e "# corl_puppet\ndeb http://apt.puppetlabs.com $OS_NAME main dependencies\ndeb-src http://apt.puppetlabs.com $OS_NAME main dependencies" | cat > /etc/apt/sources.list.d/corl_puppet.list || exit 61
+chmod 0644 /etc/apt/sources.list.d/corl_puppet.list || exit 62
+apt-get -y update >/tmp/puppet.update.log 2>&1 || exit 63
+
+# Install Puppet
+echo "3. Ensuring Puppet"
+
+rm -f /etc/puppet/puppet.conf
+rm -f /etc/hiera.yaml
+
+apt-get -y install hiera puppet-common="$PUPPET_PACKAGE" puppet="$PUPPET_PACKAGE" >/tmp/puppet.install.log 2>&1 || exit 64
+chown -R root:puppet /var/lib/puppet || exit 65
+
+# Set up Hiera configuration
+mkdir -p /var/corl/config || exit 66
+
+echo "4. Configuring Puppet"
+( cat <<'EOP'
+[main]
+  logdir=/var/log/puppet
+  vardir=/var/lib/puppet
+  ssldir=/var/lib/puppet/ssl
+  rundir=/var/run/puppet
+  factpath=$vardir/lib/facter
+EOP
+) > /etc/puppet/puppet.conf || exit 67
+
+
+echo "5. Configuring Hiera"
+  
+( cat <<'EOP'
+---
+:merge_behavior: deeper
+:backends:
+  - yaml
+  - json
+:yaml:
+  :datadir: /var/corl/config
+:json:
+  :datadir: /var/corl/config
+:hierarchy:
+  - common
+EOP
+) > /etc/hiera.yaml || exit 68
+
+chmod 0440 /etc/hiera.yaml || exit 69

data/bootstrap/os/ubuntu/10_corl.sh

@@ -27,28 +27,4 @@ then
 else
   echo "2. Installing latest release of CORL"
   su - -c "gem install corl" root >/tmp/corl.install.log 2>&1 || exit 102
-fi
-
-# Set up Hiera configuration
-mkdir -p /var/corl/config || exit 108
-
-if [ ! -e /etc/hiera.yaml ]
-then
-echo "5. Configuring Hiera"
-  
-( cat <<'EOP'
----
-:merge_behavior: deeper
-:backends:
-  - yaml
-  - json
-:yaml:
-  :datadir: /var/corl/config
-:json:
-  :datadir: /var/corl/config
-:hierarchy:
-  - common
-EOP
-) > /etc/hiera.yaml || exit 109
-chmod 0440 /etc/hiera.yaml || exit 110
-fi
+fi

data/corl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.5.4 ruby lib
+# stub: corl 0.5.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-12-04"
+  s.date = "2014-12-27"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -43,11 +43,13 @@ Gem::Specification.new do |s|
     "bootstrap/os/ubuntu/01_git.sh",
     "bootstrap/os/ubuntu/02_editor.sh",
     "bootstrap/os/ubuntu/05_ruby.sh",
+    "bootstrap/os/ubuntu/06_puppet.sh",
     "bootstrap/os/ubuntu/09_nucleon.sh",
     "bootstrap/os/ubuntu/10_corl.sh",
     "corl.gemspec",
     "lib/CORL/builder/identity.rb",
     "lib/CORL/builder/package.rb",
+    "lib/CORL/builder/project.rb",
     "lib/CORL/configuration/file.rb",
     "lib/CORL/machine/AWS.rb",
     "lib/CORL/machine/physical.rb",

data/lib/CORL/builder/identity.rb

@@ -2,10 +2,10 @@
 module CORL
 module Builder
 class Identity < Nucleon.plugin_class(:CORL, :builder)
-   
+
   #-----------------------------------------------------------------------------
   # Identity plugin interface
- 
+
   def normalize(reload)
     super do
       @identities = {}
@@ -14,33 +14,33 @@ class Identity < Nucleon.plugin_class(:CORL, :builder)
 
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   def build_directory
     File.join(network.directory, 'config', 'identities')
   end
-  
+
   #---
-  
+
   def identities
     @identities
   end
-  
+
   def set_identity(name, directory)
     @identities[name] = directory
   end
- 
+
   #-----------------------------------------------------------------------------
   # Identity interface operations
-  
+
   def build_provider(name, project_reference, environment)
     provider_id = id(name)
     directory   = File.join(internal_path(build_directory), provider_id.to_s)
     success     = true
-      
+
     info("Building identity #{blue(name)} at #{purple(project_reference)} into #{green(directory)}", { :i18n => false })
-      
+
     full_directory = File.join(network.directory, directory)
-      
+
     unless identities.has_key?(provider_id)
       project = build_config.manage(:project, extended_config(:identity, {
         :directory     => full_directory,
@@ -54,16 +54,16 @@ class Identity < Nucleon.plugin_class(:CORL, :builder)
         warn("Identity #{cyan(name)} failed to initialize", { :i18n => false })
         success = false
       end
-           
+
       if success
         # Make thid project private.
         FileUtils.chmod_R('go-wrx', full_directory)
-          
+
         set_identity(provider_id, full_directory)
         build_config.set_location(plugin_provider, name, directory)
       end
     end
-    success("Build of identity #{blue(name)} finished", { :i18n => false }) if success
+    #success("Build of identity #{blue(name)} finished", { :i18n => false }) if success
     success
   end
 end

data/lib/CORL/builder/package.rb

@@ -2,10 +2,10 @@
 module CORL
 module Builder
 class Package < Nucleon.plugin_class(:CORL, :builder)
-  
+
   #-----------------------------------------------------------------------------
   # Package plugin interface
- 
+
   def normalize(reload)
     super do
       @packages = {}
@@ -14,33 +14,33 @@ class Package < Nucleon.plugin_class(:CORL, :builder)
 
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   def build_directory
     File.join(network.build_directory, 'packages')
   end
-  
+
   #---
-  
+
   def packages
     @packages
   end
-  
+
   def set_package(name, directory)
     @packages[name] = directory
   end
- 
+
   #-----------------------------------------------------------------------------
   # Package interface operations
-  
+
   def build_provider(name, project_reference, environment)
     provider_id = id(name)
     directory   = File.join(internal_path(build_directory), provider_id.to_s)
     success     = true
-      
+
     info("Building package #{blue(name)} at #{purple(project_reference)} into #{green(directory)}", { :i18n => false })
-      
+
     full_directory = File.join(network.directory, directory)
-      
+
     unless packages.has_key?(provider_id)
       project = build_config.manage(:configuration, extended_config(:package, {
         :directory     => full_directory,
@@ -52,22 +52,22 @@ class Package < Nucleon.plugin_class(:CORL, :builder)
         warn("Package #{cyan(name)} failed to initialize", { :i18n => false })
         success = false
       end
-           
+
       if success
         set_package(provider_id, full_directory)
-        
+
         build_config.import(project)
         build_config.set_location(plugin_provider, name, directory)
-      
+
         if project.get([ :builders, plugin_provider ], false)
-          sub_packages = process_environment(project.get_hash([ :builders, plugin_provider ]), environment)          
-          
-          status  = parallel(:build_provider, sub_packages, environment)          
+          sub_packages = process_environment(project.get_hash([ :builders, plugin_provider ]), environment)
+
+          status  = parallel(:build_provider, sub_packages, environment)
           success = false if status.values.include?(false)
         end
       end
     end
-    success("Build of package #{blue(name)} finished", { :i18n => false }) if success
+    #success("Build of package #{blue(name)} finished", { :i18n => false }) if success
     success
   end
 end

data/lib/CORL/builder/project.rb

@@ -0,0 +1,37 @@
+
+module CORL
+module Builder
+class Project < Nucleon.plugin_class(:CORL, :builder)
+
+  #-----------------------------------------------------------------------------
+  # Project interface operations
+
+  def build_provider(provider_path, project_reference, environment)
+    path    = provider_path.to_s
+    success = true
+
+    info("Building project #{purple(project_reference)} into #{green(path)}", { :i18n => false })
+
+    full_directory = File.join(network.directory, path)
+    project        = build_config.manage(:project, extended_config(:project, {
+      :directory     => full_directory,
+      :url           => project_reference,
+      :create        => File.directory?(full_directory) ? false : true,
+      :pull          => true,
+      :internal_ip   => CORL.public_ip, # Needed for seeding Vagrant VMs
+      :manage_ignore => false,
+      :corl_file     => false
+    }))
+    unless project
+      warn("Project #{cyan(path)} failed to initialize", { :i18n => false })
+      success = false
+    end
+    if success
+      #success("Build of project #{blue(path)} finished", { :i18n => false })
+      network.ignore(path)
+    end
+    success
+  end
+end
+end
+end