open-dock 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150c46db503004545ec312bd2ce8ed9f66209652
-  data.tar.gz: 07114833bf30dcd99e61657b7baaf720c73292f2
+  metadata.gz: 36a07c0274e5f860e522cf5d0054df2ffeb496b7
+  data.tar.gz: 08f8407704c902e46499a44f1f2e152dd2a6e6d9
 SHA512:
-  metadata.gz: d55a31f3c32ed3ad20b7503fb75583774d315ab72dd4ad0e4a2d67745b6ca3bae0c4c85bdc347e14be2197c0e60562b4fea4d68ba41674a28cf50a4d8c2c6d07
-  data.tar.gz: 2f0aa8c959ecc56faf3a3abaf182eefb5b47bc47198fe44a03fb8d9d2ea1b6c8ab0b218c3cb8ede8ebd5eea440032a18fc3f8fcc459481665dd32c8adeee012d
+  metadata.gz: f9ed35d9f922d74eda160ec9b476c4339c760bcf4d637d5fc51c4f6248decba414c4ea664ad1cf29bf495d1fbfb3a1e2933edc1682f4cdd5bed3cab74358df80
+  data.tar.gz: 32c7f411787f744477db96524e0aeb3f86efa0595b3e06ec0ce300cb3d88b0edd60e9269fa86dc88fae09087acdd41f5e8c1901c6ea0a706dc8b9a8d7009f7f2

data/README.md

@@ -1,4 +1,4 @@
-# ![logo](logo.jpg)
+#   ![logo](logo.jpg)
 
 Gem for orchestrating the creation of infrastructures of hosts and containers. You can manage CREATION (in any provider: DigitalOcean, Gcloud, vagrant for the moment), SHIPPING (with docker containers) and CONFIGURING (with Chef). All with 3 commands per host:
 
@@ -43,7 +43,7 @@ containers
   example.com.yml
 ```
 
-## Configure PROVIDER
+## Adding PROVIDER (/providers)
 
 `ops list` command will list all providers supported by this gem.
 
@@ -79,7 +79,7 @@ google_project: "project_name"
 google_key_location: "path_to_your_p12_file"
 ```
 
-## Configure HOST
+## Creating HOST (/hosts)
 
 With these files you can configure your instances/servers/droplets/ships on every provider you have configured in the last point.
 
@@ -139,7 +139,7 @@ source_image: coreos-stable-444-5-0-v20141016
 disk_size_gb: 10
 ```
 
-##Configure hosted CONTAINERS (Docker)
+## Shipping hosted CONTAINERS (/containers)
 
 To use this command you need [Docker](https://docs.docker.com/installation/) installed in the server.
 
@@ -187,12 +187,13 @@ By convention:
 
 * If [host_name] includes "localhost" string, it is assumed that containers are shipped as docker containers in local workstation
 
-## Configure Containers (are nodes for Chef)
+## Configuring Host (/nodes)
 
-To use this command you need:
+Configuration with Chef:
 
-* Chef installed in your nodes
-* SSHd running in your nodes
+* Install Chef and configure host from `nodes/[host_name].json` file
+* Configure all containers in a Host from `nodes/[host_name]/*` containers.
+* Configure specific container in a Host from `nodes/[host_name]/[container_name]` containers.
 
 Configuration with chef commands
 
@@ -204,8 +205,12 @@ By convention:
 
 * "root" is the user by default in all containers
 * Each container configuration is defined in a Chef node: `nodes/[host_name]/[container_name].json`
+* If there is only a json file, is assumed a non-docker host:
+`nodes/[host_name].json`
 
 ```
+# Just configure host from example.com.json
+ops configure example.com
 # Configure all containers in 'example.com' host
 ops configure example.com
 # Configure 'www' container in 'example.com' host
@@ -329,3 +334,7 @@ Create command `ops configure [host_name]` this will cook all containers. By con
 ### v0.1.8
 
 * Including Vagrant provider
+
+### v0.1.14
+
+* Adding the posibility to configure non-docker hosts.

data/lib/open-dock/base.rb

@@ -2,6 +2,7 @@ module Ops
   HOSTS_DIR = "hosts"
   CONTAINERS_DIR = "containers"
   PROVIDERS_DIR = "providers"
+  NODES_DIR = "nodes"
   DEFAULT_USER = "root"
 
   def self.get_user_for(host_name)

data/lib/open-dock/chef.rb

@@ -1,5 +1,26 @@
 module Chef
-  def self.cook(user, container_name, host, ssh_port)
+
+  def self.install(user, host)
+    Net::SSH.start(host, user) do |ssh|
+      if ssh.exec!('which chef-client')
+        say 'Chef already installed'
+      else
+        say "Installing Chef, please wait ..."
+        ssh.exec! 'apt-get -y update; \
+                  apt-get -y install curl build-essential libxml2-dev libxslt-dev git ; \
+                  curl -L https://www.opscode.com/chef/install.sh | bash'
+      end
+    end
+  end
+
+  def self.cook(user, host)
+    say "Configuring #{host}, please wait ....\n"
+    command = "knife solo cook #{user}@#{host}"
+    say "Chef CMD: #{command}\n"
+    system command
+  end
+
+  def self.cook_container(user, container_name, host, ssh_port)
     say "Container '#{container_name}' configuring on #{host}, please wait ....\n"
     command = "knife solo cook #{user}@#{host} -p #{ssh_port} nodes/#{host}/#{container_name}.json"
     say "Chef CMD: #{command}\n"

data/lib/open-dock/commands/configure_host.rb

@@ -10,14 +10,19 @@ command :configure do |c|
     user = Ops::DEFAULT_USER
     containers = Docker::containers_for(host)
 
-    if options.container == "all"
-      containers.each do |container_name, config|
-        ssh_port = Docker::get_container_port config
-        Chef::cook(user,container_name, host, ssh_port)
-      end
+    if File.exists? "#{Ops::NODES_DIR}/#{host}.json" # Not a container ship
+      Chef::install(user, host)
+      Chef::cook(user, host)
     else
-      ssh_port = Docker::get_container_port containers[options.container]
-      Chef::cook(user, options.container, host, ssh_port)
+      if options.container == "all"
+        containers.each do |container_name, config|
+          ssh_port = Docker::get_container_port config
+          Chef::cook_container(user,container_name, host, ssh_port)
+        end
+      else
+        ssh_port = Docker::get_container_port containers[options.container]
+        Chef::cook_container(user, options.container, host, ssh_port)
+      end
     end
   end
 end

data/lib/open-dock/version.rb

@@ -1,3 +1,3 @@
 module OpenDock
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Juan Lebrijo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler