vagrant-service-manager 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9070fa23f07f07325ec792a696c40845b1dc03d5
-  data.tar.gz: c14f7fdad39e74f9e6845fe136b35d5d37344b5a
+  metadata.gz: dc29eabc39c834f0e04c2edfc3efe61179e88085
+  data.tar.gz: fc8f1062197a8cb676a88449839721c6a836dcc8
 SHA512:
-  metadata.gz: 7bfa1be7abe7a5510474d4bb9d049d3caf1dee84662e3bde346f38d02818c470302ba1557b8977c3bdc9c21eb44e0a0903d4c3204fe1c11fba68d1d630bc3dc6
-  data.tar.gz: b7e5916946a877a765ca304a38de86c16bee28c97b046bf69216edfcb801bd35e89d21cc5e72e73d1dab99743ee63f880ee5f7647e13cd99083b21edea114ffd
+  metadata.gz: ce3218c6d2edefe64db604656e494cb65eaa8b3dc154243b26f029b435eca8ca17c07c326e41f5166265c4665f3079a5fb1f16d3073d3d7909b1743df7846f15
+  data.tar.gz: 2ec3abebad4070c80af5bcfe078977ec1fe49b650271a544163cf04ca77f85e4f4b447ece26706addcfe1662204b5066b540376c4fcc53620f56cb797c04d46b

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v0.0.4 Mar 14, 2016
+- Fix #101: vagrant-service-manager version 0.0.4 release @navidshaikh
+- Remove manually scp for TLS keys and use machine.communicate.download @bexelbie
+- Fix #87 #83: Supports starting OpenShift service as part of config @budhrg @bexelbie @navidshaikh
+- Fix #95: Update hook code to call other middleware first @bexelbie
+- Fix #94: Do not exit if box is not supported @navidshaikh
+- Fixed missing word for plugin installation in README @budhrg
+- Fix #91: Renaming the method name flavor to os_variant @lalatendumohanty
+- Fix links, typos, formatting in CONTRIBUTING.md @budhrg
+- Fix #16 and #72: Enable private networking for VirtualBox if not set @budhrg
+
 ## v0.0.3 Mar 01, 2016
 - Fix #74: vagrant-service-manager plugin version 0.0.3 release @navidshaikh
 - Fix #12 and #21: Restart docker service on 'vagrant up' @budhrg

data/CONTRIBUTING.md

@@ -1,16 +1,15 @@
 # Contributing to vagrant-service-manager Plugin
 
 The following is a set of guidelines for contributing to the
-vagrant-service-manager plugin, which is hosted in the `Project Atomic
-Organization <https://github.com/projectatomic>`_ on GitHub.
+`vagrant-service-manager` plugin, which is hosted in the [`Project Atomic
+Organization`](https://github.com/projectatomic) on GitHub.
 
-These are just guidelines, please use your best judgment and feel free
+These are just guidelines, please use your best judgement and feel free
 to propose changes to this document in a pull request.
 
-At this point, this document is not complete, but
-as decisions are made on `container-tools@redhat.com
-<https://www.redhat.com/mailman/listinfo/container-tools>`_ mailing list
-they will be added to this document.
+At this point, this document is not complete, but as decisions are made on the
+[`container-tools@redhat.com`](https://www.redhat.com/mailman/listinfo/container-tools)
+mailing list they will be added to this document.
 
 ## Pull Requests
 
@@ -22,11 +21,11 @@ they will be added to this document.
 * All changes must include an entry in the `CHANGELOG.md` in the
   *unreleased* section describing the change
 
-* All changes need 2 ACKs from maintainers before they will be merged. If
+* All changes need at least 2 ACKs from maintainers before they will be merged. If
   the author of the PR is a maintainer, their submission is considered
-  to be the first ACK.  Therefore PRs from maintainers only need one
+  to be the first ACK.  Therefore, PRs from maintainers only need one
   additional ACK.
 
-  By "2 ACKs" we mean that 2 maintainers must acknowledge that the change
-  is a good one. The 2nd person to ACK the PR should merge the PR with
+  By "2 ACKs" we mean that two maintainers must acknowledge that the change
+  is a good one. The 2<sup>nd</sup> person to ACK the PR should merge the PR with
   a comment including their agreement.

data/README.md

@@ -36,6 +36,17 @@ producing complex, multi-container applications.
    * `docker` is default service and does not require above configuration.
    * Enable multiple services as comma separated list. Eg: 'docker, openshift'
 
+4. Enable any specific options for the services you have selected:
+
+    * OpenShift
+
+        Specific versions can be specified using the following variables:
+
+        `config.servicemanager.openshift_docker_registry = "docker.io"` - What registry should be pulled from
+        `config.servicemanager.openshift_image_name = "openshift/origin"` - What image should be used
+        `config.servicemanager.openshift_image_tag = "v1.1.1"` - What image version should be used
+
+
 5. Start the ADB using `vagrant up`. Users of the ADB may wish to consult the
 [Installation Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst).
 
@@ -118,7 +129,7 @@ $ bundle exec rake build
 
 Install the plugin using:
 
-    vagrant install pkg/<gem name>
+    vagrant plugin install pkg/<gem name>
 
 
 ## Builds

data/Vagrantfile

@@ -13,11 +13,14 @@ Vagrant.configure(2) do |config|
 
   config.vm.box = "projectatomic/adb"
 
-  config.vm.network "private_network", type: "dhcp"
-
   # This is the default setup
   # config.servicemanager.services = 'docker'
 
   # Enable multiple services as comma separated list.
   # config.servicemanager.services = 'docker, openshift'
+
+  # Specific versions can be specified using the following variables for OpenShift service:
+  # config.servicemanager.openshift_docker_registry = "docker.io"
+  # config.servicemanager.openshift_image_name = "openshift/origin"
+  # config.servicemanager.openshift_image_tag = "v1.1.1"
 end

data/lib/vagrant-service-manager/action/setup_network.rb

@@ -0,0 +1,38 @@
+module Vagrant
+  module ServiceManager
+    module Action
+      class SetupNetwork
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @ui = env[:ui]
+        end
+
+        def call(env)
+          add_private_network if virtualbox? && default_network_exists?
+          @app.call(env)
+        end
+
+        private
+
+        def virtualbox?
+          @machine.provider.instance_of?(VagrantPlugins::ProviderVirtualBox::Provider)
+        end
+
+        def default_network_exists?
+          @machine.config.vm.networks.length == 1
+        end
+
+        def add_private_network
+          @ui.info <<-MSG
+When using virtualbox, a non-NAT network interface is required.
+Adding a private network using DHCP
+          MSG
+          @machine.config.vm.network :private_network, type: :dhcp
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-service-manager/command.rb

@@ -1,8 +1,5 @@
 require_relative 'os'
 
-require 'net/scp'
-require 'net/ssh'
-
 module Vagrant
   module ServiceManager
     class Command < Vagrant.plugin(2, :command)
@@ -100,20 +97,6 @@ Verb:
         exit exit_status
       end
 
-      def copy_from_box(hIP, hport, husername, hprivate_key_path, source, destination)
-        # This method should be extended to take an option 'if recursive'
-
-        # read the private key
-        fp = File.open(hprivate_key_path)
-        pk_data = [fp.read]
-        fp.close
-
-        # create the ssh session
-        Net::SSH.start(hIP, husername, :port => hport, :key_data => pk_data, :keys_only => TRUE) do |ssh|
-          ssh.scp.download(source, destination, :recursive => TRUE)
-        end
-      end
-
       def check_if_a_service_is_running?(service)
         command = "systemctl status #{service}"
         with_target_vms(nil, {:single_target=>true}) do |machine|
@@ -192,14 +175,14 @@ Verb:
           # First, get the TLS Certificates, if needed
           if !File.directory?(secrets_path) then
 
-            # Get the private key
-            hprivate_key_path = machine.ssh_info[:private_key_path][0]
+            # Create the directory
+            Dir.mkdir(secrets_path)
 
             # copy the required client side certs from inside the box to host machine
             @env.ui.info("# Copying TLS certificates to #{secrets_path}")
-            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker/ca.pem", "#{secrets_path}")
-            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker/cert.pem", "#{secrets_path}")
-            self.copy_from_box(hIP, hport, husername, hprivate_key_path, "/home/vagrant/.docker/key.pem", "#{secrets_path}")
+            machine.communicate.download("/home/vagrant/.docker/ca.pem", "#{secrets_path}")
+            machine.communicate.download("/home/vagrant/.docker/cert.pem", "#{secrets_path}")
+            machine.communicate.download("/home/vagrant/.docker/key.pem", "#{secrets_path}")
           end
 
           # display the information, irrespective of the copy operation

data/lib/vagrant-service-manager/config.rb

@@ -3,9 +3,13 @@ require 'set'
 module Vagrant
   module ServiceManager
     SERVICES = ['docker', 'openshift']
+    CONFIG_KEYS  = [
+      :services, :openshift_docker_registry,
+      :openshift_image_name, :openshift_image_tag
+    ]
 
     class Config < Vagrant.plugin('2', :config)
-      attr_accessor :services
+      attr_accessor(*CONFIG_KEYS)
 
       DEFAULTS = {
         services: 'docker'

data/lib/vagrant-service-manager/plugin.rb

@@ -1,5 +1,6 @@
-# Loads all services
-Dir["#{File.dirname(__FILE__)}/services/*.rb"].each { |f| require_relative f }
+# Loads all actions
+Dir["#{File.dirname(__FILE__)}/action/*.rb"].each { |f| require_relative f }
+require_relative 'service'
 
 module Vagrant
   module ServiceManager
@@ -18,7 +19,14 @@ module Vagrant
       end
 
       action_hook(:servicemanager, :machine_action_up) do |hook|
-        hook.append(Service::Docker)
+        hook.before(VagrantPlugins::ProviderVirtualBox::Action::Network, setup_network)
+        hook.after(Vagrant::Action::Builtin::SyncedFolders, Service)
+      end
+
+      def self.setup_network
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Action::SetupNetwork
+        end
       end
     end
   end

data/lib/vagrant-service-manager/service.rb

@@ -0,0 +1,36 @@
+# Loads all services
+Dir["#{File.dirname(__FILE__)}/services/*.rb"].each { |f| require_relative f }
+
+module Vagrant
+  module ServiceManager
+    SUPPORTED_BOXES = ['adb', 'cdk']
+
+    class Service
+      def initialize(app, env)
+        @app = app
+        @machine = env[:machine]
+        @ui = env[:ui]
+        @services = @machine.config.servicemanager.services.split(',').map(&:strip)
+        @docker_hook = Docker.new(@machine, @ui)
+        @openshift_hook = OpenShift.new(@machine, @ui)
+      end
+
+      def call(env)
+        @app.call(env)
+
+        if SUPPORTED_BOXES.include? @machine.guest.capability(:os_variant)
+          @docker_hook.execute
+
+          if @machine.guest.capability(:os_variant) == "cdk" and @services.length == 0
+            # openshift to be started by default for CDK
+            @openshift_hook.execute
+          end
+          if @services.include? "openshift"
+            # Start OpenShift service if it is configured in Vagrantfile
+            @openshift_hook.execute
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-service-manager/services/docker.rb

@@ -1,27 +1,18 @@
 module Vagrant
   module ServiceManager
-    SUPPORTED_BOXES = ['adb', 'cdk']
-
-    module Service
-      class Docker
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @ui = env[:ui]
-        end
+    class Docker
+      def initialize(machine, ui)
+        @machine = machine
+        @ui = ui
+      end
 
-        def call(env)
-          if SUPPORTED_BOXES.include? @machine.guest.capability(:flavor)
-            command = "sudo rm /etc/docker/ca.pem && sudo systemctl restart docker"
-            @machine.communicate.execute(command) do |type, data|
-              if type == :stderr
-                @ui.error(data)
-                exit 126
-              end
-            end
+      def execute
+        command = "sudo rm /etc/docker/ca.pem && sudo systemctl restart docker"
+        @machine.communicate.execute(command) do |type, data|
+          if type == :stderr
+            @ui.error(data)
+            exit 126
           end
-
-          @app.call(env)
         end
       end
     end

data/lib/vagrant-service-manager/services/open_shift.rb

@@ -0,0 +1,35 @@
+module Vagrant
+  module ServiceManager
+    class OpenShift
+      def initialize(machine, ui)
+        @machine = machine
+        @ui = ui
+        @extra_cmd = build_extra_command
+      end
+
+      def execute
+        full_cmd = "#{@extra_cmd} sccli openshift"
+
+        @machine.communicate.sudo(full_cmd) do |type, data|
+          if type == :stderr
+            @ui.error(data)
+            exit 126
+          end
+        end
+      end
+
+      private
+
+      def build_extra_command
+        cmd = ''
+        CONFIG_KEYS.select {|e| e[/^openshift_/] }.each do |key|
+          unless @machine.config.servicemanager.send(key).nil?
+            env_name = key.to_s.gsub(/openshift_/,'').upcase
+            cmd += "#{env_name}='#{@machine.config.servicemanager.send(key)}' "
+          end
+        end
+        cmd.chop
+      end
+    end
+  end
+end

data/lib/vagrant-service-manager/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module ServiceManager
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/plugins/guests/redhat/cap/osvariant.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class OsVariant
+        def self.os_variant(machine)
+          command = "grep VARIANT_ID /etc/os-release"
+          # TODO: execute efficient command to solve this
+          if machine.communicate.test(command) # test if command is exits with code 0
+            machine.communicate.execute(command) do |type, data|
+              return data.chomp.gsub(/"/, '').split("=").last
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/redhat/plugin.rb

@@ -3,9 +3,9 @@ require 'vagrant'
 module VagrantPlugins
   module GuestRedHat
     class Plugin < Vagrant.plugin('2')
-      guest_capability('redhat', 'flavor') do
-        require_relative 'cap/flavor'
-        Cap::Flavor
+      guest_capability('redhat', 'os_variant') do
+        require_relative 'cap/osvariant'
+        Cap::OsVariant
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies: []
 description: Provides setup information, including environment variables and certificates,
   required to access services provided by ADB/CDK.
@@ -31,13 +31,16 @@ files:
 - TODO
 - Vagrantfile
 - lib/vagrant-service-manager.rb
+- lib/vagrant-service-manager/action/setup_network.rb
 - lib/vagrant-service-manager/command.rb
 - lib/vagrant-service-manager/config.rb
 - lib/vagrant-service-manager/os.rb
 - lib/vagrant-service-manager/plugin.rb
+- lib/vagrant-service-manager/service.rb
 - lib/vagrant-service-manager/services/docker.rb
+- lib/vagrant-service-manager/services/open_shift.rb
 - lib/vagrant-service-manager/version.rb
-- plugins/guests/redhat/cap/flavor.rb
+- plugins/guests/redhat/cap/osvariant.rb
 - plugins/guests/redhat/plugin.rb
 - vagrant-service-manager.gemspec
 - vagrant-service-manager.spec

data/plugins/guests/redhat/cap/flavor.rb

@@ -1,17 +0,0 @@
-module VagrantPlugins
-  module GuestRedHat
-    module Cap
-      class Flavor
-        def self.flavor(machine)
-          machine.communicate.sudo("grep VARIANT_ID /etc/os-release") do |type, data|
-            if type == :stderr
-              @env.ui.error(data)
-              exit 126
-            end
-            return data.chomp.gsub(/"/, '').split("=").last
-          end
-        end
-      end
-    end
-  end
-end