open-dock 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f95a46172f0a2194702ba0a6219e3b5c7a2102a
-  data.tar.gz: 129b68d7a9c44cf0d89ce8718f0bd46196247c7d
+  metadata.gz: bf46e7e6d4e8034a8e2b82180afa1923299c4c3d
+  data.tar.gz: 579744a86259e913c0c057cc0c13d73d7926167e
 SHA512:
-  metadata.gz: b3f5e9f131355747abb2abb46661fe5b5d381b8fdad3374b911f4e3e09bedf133b31806e5decd3048023d1b989c45772ed1b7f0c4c7fe0391a7687607aa165a5
-  data.tar.gz: e1f4836d8cdc76ac7e456b75886f931fcf36c073d95560de9415ed7fb41eae243891f3fc3947cd4aa946a1ad619c97d183d9534b0ad889ea1c2e11a234532922
+  metadata.gz: 50b3e6ad6360886cd94a2e0c69aa9eb9524e22007dc0996a8d9c3ab5b6d48dbca8bac733601a4e7b4eba657adf18bc288fca29e883558b479b82632b2153b1ff
+  data.tar.gz: 29386d1973a2ef2752e0d059908e0c074af16cba1aa58f3395894ac05e96a3daf43f8353d9e0b8d807e48790c5563dbc3480c6ef7364c27b52cbb2d78e9e0eed

data/README.md

@@ -175,8 +175,7 @@ Configuration with chef commands
 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].`
+* Each container configuration is defined in a Chef node: `nodes/[host_name]/[container_name].json`
 
 ## Commands
 
@@ -191,7 +190,7 @@ Create/delete domain names, create/delete hosts and ship/unship hosts:
 * `ops unship HOST_NAME`
 * TODO: `ops reship HOST_NAME` unship/ship all containers from host.
 * `ops configure HOST_NAME` configure all containers with chef.
-* TODO: `ops ssh [CONTAINER_NAME] HOST_NAME` ssh connection to host or container
+* `ops ssh HOST_NAME [CONTAINER_NAME]` ssh connection to host or container
 
 ## Create your infrastructure project (/ops)
 
@@ -269,4 +268,9 @@ Create command `ops configure [host_name]` this will cook all containers. By con
 
 ### v0.1.2
 
-* Delete post-conditions from containers files. By default host credentials are passed to conainers.
+* Delete post-conditions from containers files. By default host credentials are passed to conainers.
+
+### v0.1.3
+
+* Chef containers configuration files goes to nodes/[host_name]/[container_name].json
+* Create ssh connections commands: 'ops ssh [host_name] [container_name]'

data/lib/open-dock/chef.rb

@@ -1,7 +1,7 @@
 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}"
+    command = "knife solo cook #{user}@#{host} -p #{ssh_port} nodes/#{host}/#{container_name}.json"
     say "Chef CMD: #{command}\n"
     system command
   end

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

@@ -12,16 +12,12 @@ command :configure do |c|
 
     if options.container == "all"
       containers.each do |container_name, config|
-        ssh_port = get_port config
+        ssh_port = Docker::get_container_port config
         Chef::cook(user,container_name, host, ssh_port)
       end
     else
-      ssh_port = get_port containers[options.container]
+      ssh_port = Docker::get_container_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/ssh_host.rb

@@ -0,0 +1,23 @@
+command :ssh do |c|
+  c.summary = 'Connects to a host or a container with SSH'
+  c.syntax = 'ops ssh [host_name] [container_name]'
+  c.description = "SSH connection to host or one of its containers if write [container_name]"
+  c.example "Connects to host:", 'ops ssh example.com'
+  c.example "Connects to a container:", 'ops ssh example.com www'
+  c.action do |args, options|
+    host = args[0]
+    user = Docker::DEFAULT_USER
+
+    if args.count == 1
+      ssh_port = 22
+    else
+      container = args[1]
+      containers = Docker::containers_for(host)
+      ssh_port = Docker::get_container_port containers[container]
+    end
+    command = "ssh #{user}@#{host} -p #{ssh_port}"
+
+    puts "CMD: #{command}"
+    exec command
+  end
+end

data/lib/open-dock/docker.rb

@@ -19,7 +19,7 @@ module Docker
       # Container folder
       if sudo test -d "/var/lib/docker/aufs"; then
         CONTAINERS_DIR=/var/lib/docker/aufs/mnt
-      elif sudo test -d "/var/lib/docker/aufs"; then
+      elif sudo test -d "/var/lib/docker/btrfs"; then
         CONTAINERS_DIR=/var/lib/docker/btrfs/subvolumes
       fi
 
@@ -38,4 +38,9 @@ module Docker
     EOH
   end
 
+
+  def self.get_container_port(container_config)
+    container_config["ports"].select{|port| port.end_with? ":22"}[0].split(':')[0]
+  end
+
 end

data/lib/open-dock/version.rb

@@ -1,3 +1,3 @@
 module OpenDock
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Juan Lebrijo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - lib/open-dock/commands/list.rb
 - lib/open-dock/commands/provision_host.rb
 - lib/open-dock/commands/ship_host.rb
+- lib/open-dock/commands/ssh_host.rb
 - lib/open-dock/commands/unship_host.rb
 - lib/open-dock/docker.rb
 - lib/open-dock/ops.rb
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Encapsulates Provision and Configuration Operations commands needed for complex