open-dock 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eee642a498a4d4faa1e00a618afa1b993dfb75a
-  data.tar.gz: c7a61dc4ad766ebf27b14500296bd9461ccbd300
+  metadata.gz: 3f1505c1a79c47a3eaf3547ba9cb41d0b2a5947b
+  data.tar.gz: ab491f5bf6610a624e9f8473806cbfb1b0fc0fe1
 SHA512:
-  metadata.gz: f6ca4d9d727cb99c000deb9062b9d433480bebfca123a1f9d8d746e8a8f2eb10de79834f89e8d9df995e6fd1ff925fe6ea0aab857905221a5b03ab0f49e0c185
-  data.tar.gz: 9586f5989f25bf6fe874b98d929afb2a3e3284257ac34d3a2015ca4b63fffe480bee4443a757c2b32dc5685d3e89521c739752403d65d6ede7c0e4547739257b
+  metadata.gz: 86e3b55323382232ac6f29a1c20bb3d2725ab7dce58f39958c7a37c3718a7993ca5612b16b1dbca04e7b3d4cf5bb5c91818e7fd1f517ff337a149ea5ef489837
+  data.tar.gz: c74ede46fee31e533eb8d55da0cc472420d7e12bcd9a14bbfb0d23cd04ac8f7e9d2ec01111025ddf107604e7a7a9dc1bc6620a3ba62e67d1446a2cdcf1235500

data/README.md

@@ -43,9 +43,9 @@ containers
 
 ## Configure PROVIDER
 
-`ops list` command will list all providers suported by this gem.
+`ops list` command will list all providers supported by this gem.
 
-TODO: Create more providers (aws, linode, gcloud, ...)
+TODO: Create more providers (vagrant, aws, linode, gcloud, ...)
 
 ### Digital Ocean
 
@@ -152,18 +152,29 @@ www:
 
 ### Shipping your local Docker
 
-You can create a file `containers/localhost.yml` where you can define containers. And launch them on your workstation:
+You can create a file `containers/localhost.example.com.yml` where you can define containers. And launch them on your workstation:
 
 ```
-ops ship localhost
+ops ship localhost.example.com
 ```
 
-## TODO: Configure Containers (are nodes, with  Chef)
+By convention:
+
+* If [host_name] include "localhost" string, it is assumed that containers are shipped on local workstation
+
+## Configure Containers (are nodes for Chef)
 
 Configuration with chef commands
 
-* `ops configure CONTAINER_NAME HOST_NAME`: configure with chef a container in host. Here you need to install knife-solo gem.
-    * knife solo cook [container_user]@[HOST_NAME] -p [container_ssh_port]
+* `ops configure HOST_NAME`: configure with chef all containers in host. Here you need to install knife-solo gem.
+    * Equivalent to: knife solo cook root@[HOST_NAME] -p [each container_ssh_port]
+    * `--container CONTAINER_NAME` to configure one container (default: '--container all')
+
+By convention:
+
+* "root" is the user in all containers
+* Each container configuration is defined in a Chef node: `nodes/[container_name].[host_name].json`
+* Then you have to create all container name records in your DNS provider: `[container_name].[host_name]   CNAME   [host_name].`
 
 ## Commands
 
@@ -177,7 +188,7 @@ Create/delete domain names, create/delete hosts and ship/unship hosts:
 * `ops ship HOST_NAME` run the containers in the host.
 * `ops unship HOST_NAME`
 * TODO: `ops reship HOST_NAME` unship/ship all containers from host.
-* TODO: `ops configure CONTAINER_NAME HOST_NAME` configure container with chef.
+* `ops configure HOST_NAME` configure all containers with chef.
 
 ## Create your infrastructure project (/ops)
 
@@ -198,7 +209,7 @@ source 'https://rubygems.org'
 
 gem 'open-dock'
 
-# OPTIONAL: Add next gems if you want to integrate with Chef as Configuration management tecnology
+# OPTIONAL: Add next gems if you want to integrate with Chef as Configuration management technology
 gem 'knife-solo'
 gem 'librarian-chef'
 gem 'foodcritic'
@@ -242,4 +253,13 @@ Or integrate it within your Chef infrastructure project. Just add the gem to you
 
 ### v0.1.0
 
-* Launch local containers with `containers/localhost.yml` and `ops ship localhost`
+* Launch local containers with `containers/localhost.yml` and `ops ship localhost`
+
+### v0.1.1
+
+Create command `ops configure [host_name]` this will cook all containers. By convention:
+
+* "root" is the user in all containers
+* Each container configuration is defined in a Chef node: `nodes/[container_name].[host_name].json`
+* Then you have to create all container name records in your DNS provider: `[container_name].[host_name]   CNAME   [host_name].`
+* If [host_name] include "localhost" string, it is assumed that containers are shipped on local workstation

data/lib/open-dock/chef.rb

@@ -0,0 +1,8 @@
+module Chef
+  def self.cook(user, container_name, host, ssh_port)
+    say "Container '#{container_name}' configuring on #{host}, please wait ....\n"
+    command = "knife solo cook #{user}@#{container_name}.#{host} -p #{ssh_port}"
+    say "Chef CMD: #{command}\n"
+    system command
+  end
+end

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

@@ -0,0 +1,27 @@
+command :configure do |c|
+  c.summary = 'Configure all Docker containers in a host using knife solo'
+  c.syntax = 'ops configure [host_name]'
+  c.description = "Configure all docker containers described in #{Ops::CONTAINERS_DIR}/[host_name].yml"
+  c.option '--container CONTAINER_NAME', String, 'Only configure this container'
+  c.example "Create a container called 'www' in the host example.com. This is described in '#{Ops::CONTAINERS_DIR}/example.com.yml' like:\n    #      www:\n    #        detach: true\n    #        image: jlebrijo/prun\n    #        ports:\n    #          - '2222:22'\n    #          - '80:80'\n    #      db:\n    #        detach: true\n    #        image: jlebrijo/prun-db\n    #        ports:\n    #          - '2223:22'\n    #          - '5432'\n    # Equivalent to run:\n    #      knife solo cook root@www.example.com -p 2222\n    #      knife solo cook root@db.example.com -p 2223'\n    # So you will need to create chef node files as 'nodes/[container_name].[host_name].json':\n    #      nodes/www.example.com.json\n    #      nodes/db.example.com.json", 'ops configure example.com'
+  c.action do |args, options|
+    options.default container: 'all'
+    host = args[0]
+    user = Docker::DEFAULT_USER
+    containers = Docker::containers_for(host)
+
+    if options.container == "all"
+      containers.each do |container_name, config|
+        ssh_port = get_port config
+        Chef::cook(user,container_name, host, ssh_port)
+      end
+    else
+      ssh_port = get_port containers[options.container]
+      Chef::cook(user, options.container, host, ssh_port)
+    end
+  end
+
+  def get_port(config)
+    config["ports"].select{|port| port.end_with? ":22"}[0].split(':')[0]
+  end
+end

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

@@ -1,11 +1,11 @@
 command :ship do |c|
   c.summary = 'Create Docker containers defined in ops/containers/[host_name].yml'
-  c.syntax = 'ops ship host [host_name]'
+  c.syntax = 'ops ship [host_name]'
   c.description = "Create all docker containers described in #{Ops::CONTAINERS_DIR}/[host_name].yml"
   c.example "Create a container called 'www' in the host example.com. This is described in '#{Ops::CONTAINERS_DIR}/example.com.yml' like:\n    #      www:\n    #        detach: true\n    #        image: jlebrijo/prun\n    #        ports:\n    #          - '2222:22'\n    #          - '80:80'", 'ops ship example.com'
   c.action do |args, options|
     host = args[0]
-    user = Ops::get_user_for(host) unless host == "localhost"
+    user = Ops::get_user_for(host) unless host.include? "localhost"
 
     Docker::containers_for(host).each do |container_name, config|
       ports = config["ports"].map{|port| "-p #{port}"}.join(" ")
@@ -15,12 +15,11 @@ command :ship do |c|
       end
       say "Container '#{container_name}' loading on #{host}, please wait ....\n"
       command = "docker run #{options.join(" ")} --name #{container_name} #{ports} #{config["image"]} #{config["command"]}"
-      if host == "localhost"
+      say "Docker CMD: #{command}\n"
+      if host.include? "localhost"
         system command
       else
         Net::SSH.start(host, user) do |ssh|
-
-          say "Docker CMD: #{command}\n"
           ssh.exec command
         end
       end

data/lib/open-dock/docker.rb

@@ -3,6 +3,7 @@ require 'yaml'
 
 module Docker
   SPECIAL_OPTS = ["image", "ports", "command", "post-conditions"]
+  DEFAULT_USER = "root"
 
   def self.containers_for(host_name)
     config_file = "#{Ops::CONTAINERS_DIR}/#{host_name}.yml"

data/lib/open-dock/ops.rb

@@ -4,6 +4,7 @@ require 'net/ssh'
 require 'open-dock/base'
 require 'open-dock/providers'
 require 'open-dock/docker'
+require 'open-dock/chef'
 require 'open-dock/version'
 
 program :name, 'ops'

data/lib/open-dock/version.rb

@@ -1,3 +1,3 @@
 module OpenDock
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Juan Lebrijo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,6 +113,8 @@ files:
 - bin/ops
 - lib/open-dock.rb
 - lib/open-dock/base.rb
+- lib/open-dock/chef.rb
+- lib/open-dock/commands/configure_host.rb
 - lib/open-dock/commands/create_host.rb
 - lib/open-dock/commands/delete_host.rb
 - lib/open-dock/commands/exec_host.rb