vagrant-service-manager 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d986d92937e542b815d38f6d34bd7911ca12d887
-  data.tar.gz: 3fde086dabca156fd5a958edf3832b77909545fe
+  metadata.gz: 931ed28213feec845263c099a965a747c85891ae
+  data.tar.gz: bf8447ff4ce1f42b9a0b460db37bff7d561cc468
 SHA512:
-  metadata.gz: ba9588c35837fc5f063a92186459fb11d6d7fccdfeb38ff10bb894c2659c6d5b21b78d40a2f4c105a0b29142ab84ab6a3483091bea04a3e027d5b4294f6f71e1
-  data.tar.gz: 8130ab6f386b595a102de50d81be20c7777d4ee4d40548a5e25f6ae37e0ec17afd98f543b21ac5dd52b97d25bd66e1395dbc2defc26e55422ce912bfb6f61b76
+  metadata.gz: 072cfd5bf2882444c43eaa9bc869954117d141228d6997d049e618a5aab38640b8322bba26771a68641167399fc9897bb1c2a6559041c36f04bb7da3567885f8
+  data.tar.gz: 23c23b006585fc65760762f49823474bebc637419a2b4aecfdec17cb8db4eb81703749b59aa7e6c3c60e54d0ffcb2ad8567e6dd1df4023f193c1a7f37f6e2d61

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## v1.0.2 May 09, 2016
+- Add --script-readable to env and env docker @bexelbie
+- Fix #178: Add status command and separate status from env @bexelbie
+- Fix#173: Shows if kubernetes services is running in the box @navidshaikh
+- Fix #169: Adds command for displaying box routable IP address @navidshaikh
+- Fix message for box command on default help @budhrg
+- Fix #184: Make env headers comments for vagrant service-manager env @bexelbie
+- Fix #135: Refactor command.rb to make commands easier to add/maintain @budhrg
+- Adds @budhrg as co-maintainer for the plugin @navidshaikh
+- Fix #191: 'vagrant service-manager restart' not handled correctly @budhrg
+- Fixes #187, Updated commands in the Available Commands section @preeticp
+- Fix #200: Simplify the eval hint for `vagrant service-manager env` command @budhrg
+- Add environment variables for Openshift env output @bexelbie
+- Fix #181: vagrant-service-manager version 1.0.2 release @navidshaikh
+
 ## v1.0.1 Apr 12, 2016
 - Updated SPEC (v1.0.0) for url, date and format @budhrg
 - Added Table of Contents for README @bexelbie

data/CONTRIBUTING.md

@@ -1,26 +1,32 @@
 # 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 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 the
-[`container-tools@redhat.com`](https://www.redhat.com/mailman/listinfo/container-tools)
+[container-tools@redhat.com](https://www.redhat.com/mailman/listinfo/container-tools)
 mailing list they will be added to this document.
 
-## Pull Requests
+
+## Submitting Issues
+
+You can submit issues with respect to the vagrant-service-manager plugin [here](https://github.com/projectatomic/vagrant-service-manager/issues/new).Make sure you include all the relevant details pertaining the issue.
+
+Before submitting new issues, it is suggested to check [all existing issues](https://github.com/projectatomic/vagrant-service-manager/issues) in order to avoid duplication.The vagrant-service-manager plugin works closely with the [ADB](https://github.com/projectatomic/adb-atomic-developer-bundle/issues) and the [adb-utils](https://github.com/projectatomic/adb-utils/issues) RPM. You may wish to review the issues in both the repositories as well.
+
+
+## Submitting Pull Requests
 
 * All changes will be made by pull request (PR), even from core
   committers/maintainers.
 
 * All changes must include appropriate documentation updates.
 
-* All changes must include an entry in the `CHANGELOG.md` in the
-  *unreleased* section describing the change.  Your new entry should be
-  the first entry after *unreleased.*
+* All changes must include an entry in the [Changelog document](https://github.com/projectatomic/vagrant-service-manager/blob/master/CHANGELOG.md) in the *Unreleased* section describing the change. Your new entry should be the last entry in the *Unreleased* section and should include your GitHub userid.
 
 * 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
@@ -30,3 +36,42 @@ mailing list they will be added to this document.
   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.
+
+
+## How to Develop/Test
+
+1. Install the Atomic Developer Bundle (ADB), as
+[documented](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst)
+in the ADB project.  Do not start the box yet.
+
+2. Fork and clone the vagrant-service-manager repository
+
+        git clone https://github.com/projectatomic/vagrant-service-manager
+
+3. Change the directory to vagrant-service-manager `cd vagrant-service-manager`
+
+4. Run `bundle install`
+
+5. Start the box with `bundle exec vagrant up
+
+6. Develop the plugin and test by running `bundle exec vagrant service-manager`
+
+7. When you are ready to build the release, get one of the [repository maintainers](https://github.com/projectatomic/vagrant-service-manager/blob/master/MAINTAINERS) to release the plugin.
+
+
+### How to build the Vagrant plugin using Bundler
+
+You can also use Bundler to build the plugin and install it manually in
+your Vagrant environment
+
+1. Run the commands below inside of the repository:
+
+```
+$ bundle install
+$ bundle exec rake build
+````
+
+2. Install the plugin using:
+
+    vagrant plugin install pkg/<gem name>
+

data/MAINTAINERS

@@ -1,3 +1,17 @@
 Brian Exelbierd <bexelbie@redhat.com> @bexelbie
 Navid Shaikh <nshaikh@redhat.com> @navidshaikh
 Lalatendu Mohanty <lmohanty@redhat.com> @LalatenduMohanty
+Budh Ram Gurung <bgurung@redhat.com> @budhrg
+
+## How to release the vagrant-service-manager plugin
+
+1. Create gemfile in `pkg` directory by running `rake build`
+
+2. Increment the Version Number.
+
+3. Release the plugin by running `rake release`
+
+4. Tag the release commit with a vX.Y.Z tag.
+
+5. Create a Github release.
+

data/README.md

@@ -1,154 +1,120 @@
 # vagrant-service-manager
 
 * [Objective](#objective)
-* [Quick Start](#quick_start)
+* [Example Execution of the Plugin](#example_execution)
+* [Available Commands](#commands)
 * [Exit codes](#exit_codes)
 * [IP Address Detection](#ip_addr)
-* [Get Involved/Contact Us](#involved)
-* [How to Develop/Test](#develop)
-  * [How to build the Vagrant plugin using Bundler](#bundler)
+* [Getting Involved with the Project](#Contributing)
 * [Builds](#builds)
 
-This plugin provides setup information, including environment variables and certificates, required to access services provided by an [Atomic Developer Bundle (ADB)](https://github.com/projectatomic/adb-atomic-developer-bundle).  This plugin makes it easier to use the ADB with host-based tools such as Eclipse and the docker and kubernetes CLI commands.  Details on this usage pattern can be found in the [ADB Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst).
 
-## Objective <a name="objective"></a>
-
-* To provide the user a CLI to configure the
-[ADB](https://github.com/projectatomic/adb-atomic-developer-bundle)
-for different use cases and to provide glue between ADB and the user's
-development environment.
-
-*  Provide users a tool to control and configure the ADB from the
-developer's workstation without having to `ssh` into it.
+The vagrant-service-manager plugin is designed to enable easier access to the features and services provided by the [Atomic Developer Bundle (ADB)](https://github.com/projectatomic/adb-atomic-developer-bundle). It provides setup information, including environment variables and certificates, required to access services provided by the ADB and is a must have for most ADB users.
 
-The [Atomic Developer
-Bundle](https://github.com/projectatomic/adb-atomic-developer-bundle)
-is  Vagrant box that provides a ready-to-use development environment
-for container applications. With ADB, developers can dive right into
-producing complex, multi-container applications.
+This plugin makes it easier to use the ADB with host-based tools such as Eclipse and the docker and kubernetes CLI commands. Details on how to use ADB with this plugin can be found in the [ADB Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst).
 
-## Quick Start <a name="quick_start"></a>
-
-1. Install `vagrant-service-manager` plugin:
-
-        vagrant plugin install vagrant-service-manager
 
-2. Get a Vagrantfile for your box. Users of the
-[Atomic Developer Bundle (ADB)](https://github.com/projectatomic/adb-atomic-developer-bundle) should download a [Vagrantfile from the repository](https://github.com/projectatomic/adb-atomic-developer-bundle/tree/master/components).
-
-3. Enable your desired service(s) in [Vagrantfile](Vagrantfile) as:
-
-        config.servicemanager.services = 'openshift'
+## Objective <a name="objective"></a>
 
-   *Note*
+The [ADB](https://github.com/projectatomic/adb-atomic-developer-bundle) provides a ready-to-use development environment for container applications. With ADB, developers can dive right into 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'
+The vagrant-service-manager provides the user with:
 
-4. Enable any specific options for the services you have selected:
+* A CLI to configure the ADB for different use cases and to provide an interface between ADB and the user's development environment.
+* A tool to control and configure the ADB from the
+developer's workstation without having to `ssh` directly into the ADB virtual machine.
 
-    * OpenShift
 
-        Specific versions can be specified using the following variables:
+## Example Execution of the Plugin <a name="example_execution"></a>
 
-        `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
+1. Install vagrant-service-manager plugin:
+ 
+        vagrant plugin install vagrant-service-manager
 
+2. Download the relevant Vagrantfile for your [ADB](https://github.com/projectatomic/adb-atomic-developer-bundle) vagrant box, from the [repository](https://github.com/projectatomic/adb-atomic-developer-bundle/tree/master/components/centos). For further details on the usage of custom Vagrantfiles designed for specific use cases, refer to the [Usage Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst).
 
-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).
+3. Start the ADB vagrant box using `vagrant up`. For detailed instructions consult the [Installation Documentation](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst).
 
-6. Run the plugin to get environment variables and certificates:
+	**Note:** When the vagrant-service-manager plugin is loaded and a box is started using the VirtualBox provider, the user needs to add a routable non NAT network interface declaration in the Vagrantfile. If the user does not provide a network declaration in the Vagrantfile, a private DHCP network is added by default and a warning is displayed.
 
-        $ vagrant service-manager env docker
+4. Run the plugin to get environment variables and certificates:
 
-        # Copying TLS certificates to /home/nshaikh/vagrant/adb1.7/.vagrant/machines/default/virtualbox/docker
+        $ vagrant service-manager env docker       
         # Set the following environment variables to enable access to the
         # docker daemon running inside of the vagrant virtual machine:
         export DOCKER_HOST=tcp://172.28.128.4:2376
-        export DOCKER_CERT_PATH=/home/nshaikh/vagrant/adb1.7/.vagrant/machines/default/virtualbox/docker
+        export DOCKER_CERT_PATH=/foo/bar/.vagrant/machines/default/virtualbox/docker
         export DOCKER_TLS_VERIFY=1
-        export DOCKER_MACHINE_NAME=868622f
+        export DOCKER_API_VERSION=1.21
         # run following command to configure your shell:
         # eval "$(vagrant service-manager env docker)"
 
-7. Begin using your host-based tools.
+	**Note:** The required TLS certificates are copied to the host machine at the time of `vagrant up` itself. Every run of `vagrant service-manager env docker` checks for the validity of the certificates on the host machine by matching the certificates inside the box. If the certificates on the host machine are invalid, this command will also re-download the certificates onto the host machine.
 
-## Exit codes <a name="exit_codes"></a>
 
-The following table lists the plugin's exit codes and their meaning:
+## Available Commands <a name="commands"></a>
 
-Exit Code Number | Meaning
----------------  |-------------------------------------------------------------------------
-0                | No error
-1                | Catch all for general errors / Wrong sub-command or option given
-3                | Vagrant box is not running and must be before this command can succeed
-126              | A service inside the box is not running / Command invoked cannot execute
+The following section lists the available commands for the plugin and their explanation:
 
-## IP Address Detection <a name="ip_addr"></a>
+1. `vagrant service-manager env [service] [--script-readable]` 
 
-There is no standarized way of detection Vagrant box IP addresses.
-This code uses the last IPv4 address available from the set of configured
-addresses that are *up*.  i.e. if eth0, eth1, and eth2 are all up and
-have IPv4 addresses, the address on eth2 is used.
+   Displays connection information for all active services in the box in a manner that can be evaluated in a shell. If a `service` is specified, only the information for that service is displayed. When `--script-readable` is specified the output is in `key=value` format. The supported services are: Docker; OpenShift.
 
-## Get Involved/Contact Us <a name="involved"></a>
+2. `vagrant service-manager box [command]`
 
-  * IRC: #atomic and #nulecule on freenode
-  * Mailing List: container-tools@redhat.com
+   Displays box related information like release version, IP etc. 
+
+3. `vagrant service-manager box version [--script-readable]`
 
-## How to Develop/Test <a name="develop"></a>
+   Displays the version and release information of the running VM. When `--script-readable` is specified the output is in `key=value` format.
 
-1. Install the Atomic Developer Bundle (ADB), as
-[documented](https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/installing.rst)
-in the ADB project.  Do not start the box yet.
+4. `vagrant service-manager box ip` 
 
-2. Git clone repo
+   Displays the routable IP address of the running VM. 
 
-        git clone https://github.com/projectatomic/vagrant-service-manager
+5. `vagrant service-manager status [service]` 
 
-3. `cd vagrant-service-manager`
+   Lists services and their running state. If a `service` is specified only the status of that service is displayed. If no service is provided then only supported orchestrators are reported.
 
-4. Run `bundle install`
+6. `vagrant service-manager restart [service]` 
 
-5. Start the box with `bundle exec vagrant up`
+   Restarts the given service in the box.
 
-6. Review the [Contribution Guidelines](CONTRIBUTING.md).
+7. `vagrant service-manager [command] [--help | -h]`
 
-7. Develop the plugin and test by running `bundle exec vagrant service-manager`
+   Displays the possible commands, options and other relevant information for the vagrant-service-manager plugin. If a `command` is specified, only the help relevant to that command is displayed.
 
-8. When you are ready to build the release, get a repo maintainer to:
 
-  1. Put the gemfile in pkg/ with `rake build`
 
-  2. Increment the Version Number
+## Exit codes <a name="exit_codes"></a>
 
-  3. Release the plugin with `rake release`
+The following table lists the plugin's exit codes and their meaning:
 
-  4. Tag the release commit with a vX.Y.Z tag
+Exit Code Number   | Meaning
+-------------------|-------------------------------------------------------------------------
+`0`                | No error
+`1`                | Catch all for general errors / Wrong sub-command or option given
+`3`                | Vagrant box is not running and should be running for this command to succeed
+`126`              | A service inside the box is not running / Command invoked cannot execute
 
-  5. Create a Github release
 
-### How to build the Vagrant plugin using Bundler <a name="bundler"></a>
+## IP Address Detection <a name="ip_addr"></a>
 
-You can also use Bundler to build the plugin and install it manually in
-your Vagrant environment
+There is no standardized way of detecting Vagrant box IP addresses.
+This code uses the last IPv4 address available from the set of configured addresses that are *up*.  i.e. if eth0, eth1, and eth2 are all up and have IPv4 addresses, the address on eth2 is used.
 
-Run the commands below inside of the repository:
 
-```
-$ bundle install
-$ bundle exec rake build
-````
+## Getting Involved with the Project <a name="Contributing"></a>
 
-Install the plugin using:
+We welcome your input. You can submit issues or pull requests with respect to the vagrant-service-manager plugin. Refer to the [contributing guidelines](https://github.com/projectatomic/vagrant-service-manager/blob/master/CONTRIBUTING.md) for detailed information on how to contribute to this plugin.
 
-    vagrant plugin install pkg/<gem name>
+You can contact us on:
+  * IRC: #atomic and #nulecule on freenode
+  * Mailing List: container-tools@redhat.com
 
 
 ## Builds <a name="builds"></a>
 
-- Gemfile: https://rubygems.org/gems/vagrant-service-manager
+- Gem: https://rubygems.org/gems/vagrant-service-manager
 
-- copr build: https://copr.fedorainfracloud.org/coprs/nshaikh/vagrant-service-manager/builds/
+- Copr build: https://copr.fedorainfracloud.org/coprs/nshaikh/vagrant-service-manager/builds/

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

@@ -1,11 +1,23 @@
 require_relative 'os'
 require 'digest'
+require_relative 'plugin_util'
 
 module Vagrant
   module ServiceManager
     DOCKER_PATH = '/home/vagrant/.docker'
     SUPPORTED_SERVICES = ['docker', 'openshift', 'kubernetes']
     SCCLI_SERVICES = ['openshift', 'k8s']
+    KUBE_NAMES = ['kubernetes', 'k8s']
+    KUBE_SERVICES = [
+      'etcd', 'kube-apiserver', 'kube-controller-manager', 'kube-scheduler',
+      'kubelet', 'kube-proxy', 'docker'
+    ]
+    # NOTE: SERVICES_MAP[<service>] will give fully-qualified service class name
+    # Eg: SERVICES_MAP['docker'] gives Vagrant::ServiceManager::Docker
+    SERVICES_MAP = {
+      'docker' => Docker, 'openshift' => OpenShift,
+      'kubernetes' => Kubernetes
+    }
 
     class Command < Vagrant.plugin(2, :command)
       OS_RELEASE_FILE = '/etc/os-release'
@@ -16,8 +28,8 @@ module Vagrant
 
       def exit_if_machine_not_running
         # Exit from plugin with status 3 if machine is not running
-        with_target_vms(nil, {:single_target=>true}) do |machine|
-          if machine.state.id != :running then
+        with_target_vms(nil, single_target: true) do |machine|
+          if machine.state.id != :running
             @env.ui.error I18n.t('servicemanager.machine_should_running')
             exit 3
           end
@@ -31,21 +43,12 @@ module Vagrant
         when 'env'
           exit_if_machine_not_running
           case subcommand
-          when 'docker'
+          when 'docker', 'openshift'
             case option
             when nil
-              execute_docker_info
-            when '--help', '-h'
-              print_help(type: command)
-            else
-              print_help(type: command, exit_status: 1)
-            end
-          when 'openshift'
-            case option
-            when nil
-              execute_openshift_info
+              execute_service(subcommand)
             when '--script-readable'
-              execute_openshift_info(true)
+              execute_service(subcommand, script_readable: true)
             when '--help', '-h'
               print_help(type: command)
             else
@@ -54,11 +57,23 @@ module Vagrant
           when nil
             # display information about all the providers inside ADB/CDK
             print_all_provider_info
+          when '--script-readable'
+            print_all_provider_info(script_readable: true)
           when '--help', '-h'
             print_help(type: command)
           else
             print_help(type: command, exit_status: 1)
           end
+        when 'status'
+          exit_if_machine_not_running
+          case subcommand
+          when nil
+            execute_status_display
+          when '--help', '-h'
+            print_help(type: command)
+          else
+            execute_status_display(subcommand)
+          end
         when 'box'
           exit_if_machine_not_running
           case subcommand
@@ -68,6 +83,17 @@ module Vagrant
               print_vagrant_box_version
             when '--script-readable'
               print_vagrant_box_version(true)
+            when '--help', '-h'
+              print_help(type: command)
+            else
+              print_help(type: command, exit_status: 1)
+            end
+          when 'ip'
+            case option
+            when nil
+              display_box_ip
+            when '--help', '-h'
+              print_help(type: command)
             else
               print_help(type: command, exit_status: 1)
             end
@@ -76,23 +102,27 @@ module Vagrant
           else
             print_help(type: command, exit_status: 1)
           end
-        when '--help', '-h'
-          print_help
-        when "restart"
-          self.exit_if_machine_not_running
+        when 'restart'
+          exit_if_machine_not_running
           case subcommand
           when '--help', '-h'
             print_help(type: command)
           else
             restart_service(subcommand)
           end
-        when "help"
-            self.print_help
+        when '--help', '-h', 'help'
+          print_help
         else
           print_help(exit_status: 1)
         end
       end
 
+      def execute_service(name, options = {})
+        with_target_vms(nil, single_target: true) do |machine|
+          PluginUtil.service_class(name).info(machine, @env.ui, options)
+        end
+      end
+
       def print_help(config = {})
         config[:type] ||= 'default'
         config[:exit_status] ||= 0
@@ -101,192 +131,71 @@ module Vagrant
         exit config[:exit_status]
       end
 
-      def check_if_a_service_is_running?(service)
-        command = "systemctl status #{service}"
-        with_target_vms(nil, {:single_target=>true}) do |machine|
-          return machine.communicate.test(command)
-        end
-      end
-
-      def print_all_provider_info
-        @env.ui.info I18n.t('servicemanager.commands.env.nil')
-
-        running_services = []
-        SUPPORTED_SERVICES.each do |service|
-          status = if check_if_a_service_is_running?(service)
-                     running_services << service
-                     I18n.t('servicemanager.commands.env.status.running')
-                    else
-                     I18n.t('servicemanager.commands.env.status.stopped')
-                    end
-          @env.ui.info("#{service} - #{status}")
-        end
-
-        running_services.each do |e|
-          @env.ui.info("\n#{e} env:")
-          public_send("execute_#{e}_info")
-        end
-      end
-
-      def execute_openshift_info(script_readable = false)
-        @@OPENSHIFT_PORT = 8443
-        if self.check_if_a_service_is_running?("openshift") then
-          # Find the guest IP
-          guest_ip = self.find_machine_ip
-          openshift_url = "https://#{guest_ip}:#@@OPENSHIFT_PORT"
-          openshift_console_url = "#{openshift_url}/console"
-          self.print_openshift_info(
-            openshift_url,
-            openshift_console_url,
-            script_readable)
-        else
-          @env.ui.error I18n.t('servicemanager.commands.env.service_not_running',
-                               name: 'OpenShift')
-          exit 126
-        end
-      end
-
-      def print_openshift_info(url, console_url, script_readable = false)
-        if script_readable
-          message = I18n.t('servicemanager.commands.env.openshift.script_readable',
-                           openshift_url: url, openshift_console_url: console_url)
-        else
-          message = I18n.t('servicemanager.commands.env.openshift.default',
-                           openshift_url: url, openshift_console_url: console_url)
-        end
-
-        @env.ui.info(message)
-      end
-
-      def find_machine_ip
-        with_target_vms(nil, {:single_target=>true}) do |machine|
-          # Find the guest IP
-          command = "ip -o -4 addr show up |egrep -v ': docker|: lo' |tail -1 | awk '{print $4}' |cut -f1 -d\/"
-          guest_ip = ""
-          machine.communicate.execute(command) do |type, data|
-            guest_ip << data.chomp if type == :stdout
+      def execute_status_display(service = nil)
+        with_target_vms(nil, single_target: true) do |machine|
+          if service
+            PluginUtil.service_class(service).status(machine, @env.ui, service)
+          else
+            @env.ui.info I18n.t('servicemanager.commands.status.nil')
+            SUPPORTED_SERVICES.each do |s|
+              PluginUtil.service_class(s).status(machine, @env.ui, s)
+            end
           end
-          return guest_ip
-        end
-      end
-
-      def sha_id(file_data)
-        Digest::SHA256.hexdigest file_data
-      end
-
-      def certs_present_and_valid?(path, machine)
-        return false if Dir["#{path}/*"].empty?
-
-        # check validity of certs
-        Dir[path + "/*"].each do |f|
-          guest_file_path = "#{DOCKER_PATH}/#{File.basename(f)}"
-          guest_sha = machine.guest.capability(:sha_id, guest_file_path)
-          return false if sha_id(File.read(f)) != guest_sha
         end
-
-        true
       end
 
-      def execute_docker_info
-        # this execute the operations needed to print the docker env info
-        with_target_vms(nil, {:single_target=>true}) do |machine|
-          secrets_path = PluginUtil.host_docker_path(machine)
-          # Hard Code the Docker port because it is fixed on the VM
-          # This also makes it easier for the plugin to be cross-provider
-          port = 2376
-
-          # Verify valid certs and copy if invalid
-          unless certs_present_and_valid?(secrets_path, machine)
-            # Log the message prefixed by #
-            PluginUtil.copy_certs_to_host(machine, secrets_path, @env.ui, true)
-          end
-
-          api_version = ""
-          docker_api_version = "docker version --format '{{.Server.APIVersion}}'"
-          unless machine.communicate.test(docker_api_version)
-            # fix for issue #152: Fallback to older Docker version (< 1.9.1)
-            docker_api_version.gsub!(/APIVersion/, 'ApiVersion')
-          end
+      def print_all_provider_info(options = {})
+        with_target_vms(nil, single_target: true) do |machine|
+          options[:all] = true # flag to mark all providers
+          running_service_classes = PluginUtil.running_services(machine, class: true)
 
-          machine.communicate.execute(docker_api_version) do |type, data|
-            api_version << data.chomp if type ==:stdout
+          running_service_classes.each do |service_class|
+            service = service_class.to_s.split('::').last.downcase
+            unless options[:script_readable] || KUBE_NAMES.include?(service)
+              @env.ui.info("\n# #{service} env:")
+            end
+            # since we do not have feature to show the Kube connection information
+            unless KUBE_NAMES.include? service
+              service_class.info(machine, @env.ui, options)
+            end
           end
 
-          # display the information, irrespective of the copy operation
-          self.print_docker_env_info(find_machine_ip, port, secrets_path, api_version)
-        end
-      end
-
-      def print_docker_env_info(guest_ip, port, secrets_path, api_version)
-        # Print configuration information for accesing the docker daemon
-
-        if !OS.windows? then
-          message = I18n.t('servicemanager.commands.env.docker.non_windows',
-                           ip: guest_ip, port: port, path: secrets_path,
-                           api_version: api_version)
-          @env.ui.info(message)
-        elsif OS.windows_cygwin? then
-          # replace / with \ for path in Cygwin Windows - which uses export
-          secrets_path = secrets_path.split('/').join('\\') + '\\'
-          message = I18n.t('servicemanager.commands.env.docker.windows_cygwin',
-                           ip: guest_ip, port: port, path: secrets_path,
-                           api_version: api_version)
-          @env.ui.info(message)
-        else
-          # replace / with \ for path in Windows
-          secrets_path = secrets_path.split('/').join('\\') + '\\'
-          message = I18n.t('servicemanager.commands.env.docker.windows',
-                           ip: guest_ip, port: port, path: secrets_path,
-                           api_version: api_version)
-          # puts is used here to escape and render the back slashes in Windows path
-          @env.ui.info(puts(message))
+          PluginUtil.print_shell_configure_info(@env.ui) unless options[:script_readable]
         end
       end
 
       def print_vagrant_box_version(script_readable = false)
-        # Prints the version of the vagrant box, parses /etc/os-release for version
-        with_target_vms(nil, { single_target: true}) do |machine|
-          command = "cat #{OS_RELEASE_FILE} | grep VARIANT"
-
-          machine.communicate.execute(command) do |type, data|
-            if type == :stderr
-              @env.ui.error(data)
-              exit 126
-            end
-
-            if !script_readable
-              info = Hash[data.gsub('"', '').split("\n").map {|e| e.split("=") }]
-              version = "#{info['VARIANT']} #{info['VARIANT_VERSION']}"
-              @env.ui.info(version)
-            else
-              @env.ui.info(data.chomp)
-            end
-          end
+        with_target_vms(nil, single_target: true) do |machine|
+          @env.ui.info machine.guest.capability(:box_version, script_readable)
         end
       end
 
       def restart_service(service)
-        errors = []
+        if service.nil?
+          help_msg = I18n.t('servicemanager.commands.help.restart')
+          service_missing_msg = I18n.t('servicemanager.commands.restart.service_missing')
+          @env.ui.error help_msg.gsub(/Restarts the service/, service_missing_msg)
+          exit 126
+        end
+
         command = if SCCLI_SERVICES.include? service
                     # TODO : Handle the case where user wants to pass extra arguments
                     # to OpenShift service
                     "sccli #{service}"
                   else
                     "systemctl restart #{service}"
-                   end
+                  end
 
         with_target_vms(nil, single_target: true) do |machine|
-          exit_code = machine.communicate.sudo(command) do |type, error|
-            errors << error if type == :stderr
-          end
-          unless exit_code.zero?
-            @env.ui.error errors.join("\n")
-            exit exit_code
-          end
-          exit_code
+          PluginUtil.execute_and_exit_on_fail(machine, @env.ui, command)
         end
       end
 
+      def display_box_ip
+        with_target_vms(nil, single_target: true) do |machine|
+          @env.ui.info machine.guest.capability(:machine_ip)
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,10 @@
 module Vagrant
   module ServiceManager
     module PluginUtil
+      def self.service_class(service)
+        SERVICES_MAP[service]
+      end
+
       def self.copy_certs_to_host(machine, path, ui, commented_message = false)
         Dir.mkdir(path) unless Dir.exist?(path)
 
@@ -15,7 +19,100 @@ module Vagrant
 
       def self.host_docker_path(machine)
         # Path to the private_key and where we will store the TLS Certificates
-        File.expand_path("docker", machine.data_dir)
+        File.expand_path('docker', machine.data_dir)
+      end
+
+      def self.machine_ip(machine)
+        machine.guest.capability(:machine_ip)
+      end
+
+      def self.sha_id(file_data)
+        Digest::SHA256.hexdigest file_data
+      end
+
+      def self.certs_present_and_valid?(path, machine)
+        return false if Dir["#{path}/*"].empty?
+
+        # check validity of certs
+        Dir[path + "/*"].each do |f|
+          guest_file_path = "#{DOCKER_PATH}/#{File.basename(f)}"
+          guest_sha = machine.guest.capability(:sha_id, guest_file_path)
+          return false if sha_id(File.read(f)) != guest_sha
+        end
+
+        true
+      end
+
+      def self.print_service_status(ui, machine, service)
+        status = I18n.t('servicemanager.commands.status.status.stopped')
+        if service_running?(machine, service)
+          status = I18n.t('servicemanager.commands.status.status.running')
+        end
+        ui.info("#{service} - #{status}")
+      end
+
+      # If 'class' option is true then return the class name of running services
+      def self.running_services(machine, options = {})
+        running_services = []
+
+        SUPPORTED_SERVICES.each do |service|
+          next unless service_running?(machine, service)
+          running_services << (options[:class] ? SERVICES_MAP[service] : service)
+        end
+        running_services
+      end
+
+      def self.kube_running?(machine)
+        KUBE_SERVICES.each do |service|
+          return false unless service_running?(machine, service)
+        end
+        true
+      end
+
+      def self.service_running?(machine, service)
+        return kube_running?(machine) if KUBE_NAMES.include? service
+        command = "systemctl status #{service}"
+        machine.communicate.test(command)
+      end
+
+      def self.windows_path(path)
+        # Replace / with \ for path in Windows
+        path.split('/').join('\\') + '\\'
+      end
+
+      def self.execute_and_exit_on_fail(machine, ui, command)
+        exit_code = machine.communicate.sudo(command) do |type, error|
+          errors << error if type == :stderr
+        end
+        unless exit_code.zero?
+          ui.error errors.join("\n")
+          exit exit_code
+        end
+        exit_code
+      end
+
+      def self.print_shell_configure_info(ui, command = '')
+        label = if OS.unix?
+                  'unix_configure_info'
+                elsif OS.windows_cygwin?
+                  'windows_cygwin_configure_info'
+                end
+
+        unless label.nil?
+          ui.info "\n" + I18n.t("servicemanager.commands.env.#{label}", command: command)
+        end
+      end
+
+      def self.env_label(script_readable)
+        if script_readable
+          'script_readable'
+        elsif OS.unix?
+          'non_windows'
+        elsif OS.windows_cygwin?
+          'windows_cygwin'
+        else
+          'windows'
+        end
       end
     end
   end

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

@@ -1,25 +1,72 @@
-require_relative '../plugin_util'
-
 module Vagrant
   module ServiceManager
     class Docker
+      # Hard Code the Docker port because it is fixed on the VM
+      # This also makes it easier for the plugin to be cross-provider
+      PORT = 2376
+
       def initialize(machine, ui)
         @machine = machine
         @ui = ui
       end
 
       def execute
-        command = "sudo rm /etc/docker/ca.pem && sudo systemctl restart docker"
+        command = 'sudo rm /etc/docker/ca.pem && sudo systemctl restart docker'
+
+        exit_code = PluginUtil.execute_and_exit_on_fail(@machine, @ui, command)
+        # Copy certs on command execution success
+        if exit_code
+          secrets_path = PluginUtil.host_docker_path(@machine)
+          PluginUtil.copy_certs_to_host(@machine, secrets_path, @ui)
+        end
+      end
+
+      def self.status(machine, ui, service)
+        PluginUtil.print_service_status(ui, machine, service)
+      end
+
+      def self.info(machine, ui, options = {})
+        if PluginUtil.service_running?(machine, 'docker')
+          options[:secrets_path] = PluginUtil.host_docker_path(machine)
+          options[:guest_ip] = PluginUtil.machine_ip(machine)
 
-        @machine.communicate.execute(command) do |type, data|
-          if type == :stderr
-            @ui.error(data)
-            exit 126
+          # Verify valid certs and copy if invalid
+          unless PluginUtil.certs_present_and_valid?(options[:secrets_path], machine)
+            # Log the message prefixed by #
+            PluginUtil.copy_certs_to_host(machine, options[:secrets_path], ui, true)
           end
+
+          docker_api_version_cmd = "docker version --format '{{.Server.APIVersion}}'"
+          unless machine.communicate.test(docker_api_version_cmd)
+            # fix for issue #152: Fallback to older Docker version (< 1.9.1)
+            docker_api_version_cmd.gsub!(/APIVersion/, 'ApiVersion')
+          end
+
+          machine.communicate.execute(docker_api_version_cmd) do |type, data|
+            options[:api_version] = data.chomp if type == :stdout
+          end
+
+          # Display the information, irrespective of the copy operation
+          print_env_info(ui, options)
+        else
+          ui.error I18n.t('servicemanager.commands.env.service_not_running',
+                          name: 'Docker')
+          exit 126
         end
+      end
 
-        secrets_path = PluginUtil.host_docker_path(@machine)
-        PluginUtil.copy_certs_to_host(@machine, secrets_path, @ui)
+      def self.print_env_info(ui, options)
+        label = PluginUtil.env_label(options[:script_readable])
+        options[:secrets_path] = PluginUtil.windows_path(options[:secrets_path]) unless OS.unix?
+        message = I18n.t("servicemanager.commands.env.docker.#{label}",
+                         ip: options[:guest_ip], port: PORT, path: options[:secrets_path],
+                         api_version: options[:api_version])
+        # Puts is used to escape and render the back slashes in Windows path
+        message = puts(message) if OS.windows?
+        ui.info(message)
+        unless options[:script_readable] || options[:all]
+          PluginUtil.print_shell_configure_info(ui, ' docker')
+        end
       end
     end
   end

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

@@ -0,0 +1,22 @@
+module Vagrant
+  module ServiceManager
+    class Kubernetes
+      def initialize(machine, ui)
+        @machine = machine
+        @ui = ui
+      end
+
+      def execute
+        # TODO: Implement execute method
+      end
+
+      def self.status(machine, ui, service)
+        PluginUtil.print_service_status(ui, machine, service)
+      end
+
+      def self.info(machine, ui, options = {})
+        # TODO: Implement info method
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 module Vagrant
   module ServiceManager
     class OpenShift
+      OPENSHIFT_PORT = 8443
+
       def initialize(machine, ui)
         @machine = machine
         @ui = ui
@@ -8,17 +10,37 @@ module Vagrant
       end
 
       def execute
-        errors = []
-        full_cmd = "#{@extra_cmd} sccli openshift"
+        command = "#{@extra_cmd} sccli openshift"
+        Plugin.execute_and_exit_on_fail(@machine, @ui, command)
+      end
+
+      def self.status(machine, ui, service)
+        PluginUtil.print_service_status(ui, machine, service)
+      end
 
-        exit_code = @machine.communicate.sudo(full_cmd) do |type, error|
-          errors << error if type == :stderr
+      def self.info(machine, ui, options = {})
+        options[:script_readable] ||= false
+
+        if PluginUtil.service_running?(machine, 'openshift')
+          options[:url] = "https://#{PluginUtil.machine_ip(machine)}:#{OPENSHIFT_PORT}"
+          options[:console_url] = "#{options[:url]}/console"
+          print_info(ui, options)
+        else
+          ui.error I18n.t('servicemanager.commands.env.service_not_running',
+                          name: 'OpenShift')
+          exit 126
         end
-        unless exit_code.zero?
-          @env.ui.error errors.join("\n")
-          exit exit_code
+      end
+
+      def self.print_info(ui, options)
+        label = PluginUtil.env_label(options[:script_readable])
+        message = I18n.t("servicemanager.commands.env.openshift.#{label}",
+                         openshift_url: options[:url],
+                         openshift_console_url: options[:console_url])
+        ui.info(message)
+        unless options[:script_readable] || options[:all]
+          PluginUtil.print_shell_configure_info(ui, ' openshift')
         end
-        exit_code
       end
 
       private

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

@@ -1,5 +1,5 @@
 module Vagrant
   module ServiceManager
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/locales/en.yml

@@ -23,8 +23,9 @@ en:
 
           Commands:
                env          displays connection information for services in the box
-               box          displays version and release information for the box
+               box          displays box related information like version, release, IP etc
                restart      restarts the given systemd service in the box
+               status       list services and their running state
 
           Options:
                -h, --help   print this help
@@ -37,30 +38,44 @@ en:
                 docker      display information and environment variables for docker
                 openshift   display information and environment variables for openshift
 
-          If OBJECT is ommitted, display the status of all services and information
-          for all active services
+          If OBJECT is ommitted, display the information for all active services
 
           Options:
                 --script-readable  display information in a script readable format.
-                                   Only supported by the openshift object.
                 -h, --help         print this help
         box: |-
           Usage: vagrant service-manager box <sub-command> [options]
 
           Sub-Command:
                 version    display version and release information about the running VM
+                ip         display routable IP address of the running VM
 
           Options:
                 --script-readable  display information in a script readable format
                 -h, --help         print this help
 
+        status: |-
+          Usage: vagrant service-manager status [service] [options]
+
+          Options:
+                -h, --help         print this help
+
+          If a service is provided, only that service is reported.
+          If no service is provided only supported orchestrators are reported.
+
+          Examples:
+                vagrant service-manager box version
+                vagrant service-manager box ip
+                vagrant service-manager box version --script-readable
+
         restart: |-
           Restarts the service
 
-          Usage: vagrant service-manager restart <object> [options]
+          Usage: vagrant service-manager restart <service> [options]
 
-          Object:
-              Object is a service provided via sccli or systemd. For example: docker, k8s, or openshift etc.
+          Service:
+              A service provided by sccli or systemd. For example:
+               docker, k8s, or openshift etc.
 
           Options:
                 -h, --help         print this help
@@ -84,8 +99,6 @@ en:
             export DOCKER_CERT_PATH=%{path}
             export DOCKER_TLS_VERIFY=1
             export DOCKER_API_VERSION=%{api_version}
-            # run following command to configure your shell:
-            # eval "$(vagrant service-manager env docker)"
           windows_cygwin: |-
             # Set the following environment variables to enable access to the
             # docker daemon running inside of the vagrant virtual machine:
@@ -93,17 +106,42 @@ en:
             export DOCKER_CERT_PATH='%{path}'
             export DOCKER_TLS_VERIFY=1
             export DOCKER_API_VERSION=%{api_version}
-            # run following command to configure your shell:
-            # eval "$(VAGRANT_NO_COLOR=1 vagrant service-manager env docker | tr -d '\r')"
+          script_readable: |-
+            DOCKER_HOST=tcp://%{ip}:%{port}
+            DOCKER_CERT_PATH='%{path}'
+            DOCKER_TLS_VERIFY=1
+            DOCKER_API_VERSION=%{api_version}
         openshift:
-          default: |-
-            You can access the OpenShift console on: %{openshift_console_url}
-            To use OpenShift CLI, run: oc login %{openshift_url}
+          windows: |-
+            # You can access the OpenShift console on: %{openshift_console_url}
+            # To use OpenShift CLI, run: oc login %{openshift_url}
+            setx OPENSHIFT_URL %{openshift_url}
+            setx OPENSHIFT_WEB_CONSOLE %{openshift_console_url}
+          non_windows: |-
+            # You can access the OpenShift console on: %{openshift_console_url}
+            # To use OpenShift CLI, run: oc login %{openshift_url}
+            export OPENSHIFT_URL=%{openshift_url}
+            export OPENSHIFT_WEB_CONSOLE=%{openshift_console_url}
+          windows_cygwin: |-
+            # You can access the OpenShift console on: %{openshift_console_url}
+            # To use OpenShift CLI, run: oc login %{openshift_url}
+            export OPENSHIFT_URL=%{openshift_url}
+            export OPENSHIFT_WEB_CONSOLE=%{openshift_console_url}
           script_readable: |-
             OPENSHIFT_URL=%{openshift_url}
             OPENSHIFT_WEB_CONSOLE=%{openshift_console_url}
+        windows_cygwin_configure_info: |-
+            # run following command to configure your shell:
+            # eval "$(VAGRANT_NO_COLOR=1 vagrant service-manager env%{command} | tr -d '\r')"
+        unix_configure_info: |-
+          # run following command to configure your shell:
+          # eval "$(vagrant service-manager env%{command})"
         service_not_running: |-
           # %{name} service is not running in the vagrant box.
+      restart:
+        service_missing: 'Service name missing'
+
+      status:
         nil: |-
           Configured services:
         status:

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

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class BoxVersion
+        # Prints the version of the vagrant box, parses /etc/os-release for version
+        def self.box_version(machine, script_readable)
+          command = "cat #{OS_RELEASE_FILE} | grep VARIANT"
+          # 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|
+              if type == :stderr
+                @env.ui.error(data)
+                exit 126
+              end
+
+              return data.chomp if script_readable
+              info = Hash[data.delete('"').split("\n").map { |e| e.split('=') }]
+              return "#{info['VARIANT']} #{info['VARIANT_VERSION']}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class MachineIP
+        def self.machine_ip(machine)
+          # Find the guest IP
+          command = "ip -o -4 addr show up |egrep -v ': docker|: lo' |tail -1 | awk '{print $4}' |cut -f1 -d\/"
+          ip = ''
+          machine.communicate.execute(command) do |type, data|
+            ip << data.chomp if type == :stdout
+          end
+          ip
+        end
+      end
+    end
+  end
+end

data/plugins/guests/redhat/cap/{osvariant.rb → os_variant.rb}

@@ -3,11 +3,11 @@ module VagrantPlugins
     module Cap
       class OsVariant
         def self.os_variant(machine)
-          command = "grep VARIANT_ID /etc/os-release"
+          command = "grep VARIANT_ID #{OS_RELEASE_FILE}"
           # 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
+            machine.communicate.execute(command) do |_, data|
+              return data.chomp.delete('"').split('=').last
             end
           end
         end

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

@@ -6,7 +6,7 @@ module VagrantPlugins
           command = "sha256sum #{path}"
 
           if machine.communicate.test(command)
-            machine.communicate.execute(command) do |type, data|
+            machine.communicate.execute(command) do |_, data|
               # sha256sum results in "sha_id path"
               return data.split.first
             end

data/plugins/guests/redhat/plugin.rb

@@ -1,17 +1,29 @@
 require 'vagrant'
 
 module VagrantPlugins
+  OS_RELEASE_FILE = '/etc/os-release'
+
   module GuestRedHat
     class Plugin < Vagrant.plugin('2')
       guest_capability('redhat', 'os_variant') do
-        require_relative 'cap/osvariant'
+        require_relative 'cap/os_variant'
         Cap::OsVariant
       end
 
+      guest_capability('redhat', 'box_version') do
+        require_relative 'cap/box_version'
+        Cap::BoxVersion
+      end
+
       guest_capability('redhat', 'sha_id') do
         require_relative 'cap/sha_id'
         Cap::ShaID
       end
+
+      guest_capability('redhat', 'machine_ip') do
+        require_relative 'cap/machine_ip'
+        Cap::MachineIP
+      end
     end
   end
 end

data/vagrant-service-manager.spec

@@ -2,7 +2,7 @@
 %global vagrant_plugin_name vagrant-service-manager
 
 Name: %{vagrant_plugin_name}
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 Summary: To provide the user a CLI to configure the ADB/CDK for different use cases and to provide glue between ADB/CDK and the user's developer environment.
 Group: Development/Languages
@@ -88,6 +88,22 @@ popd
 %{vagrant_plugin_instdir}/.gitattributes
 
 %changelog
+* Mon May 09 2016 Navid Shaikh - 1.0.2-1
+- Add --script-readable to env and env docker @bexelbie
+- Fix #178: Add status command and separate status from env @bexelbie
+- Fix#173: Shows if kubernetes services is running in the box @navidshaikh
+- Fix #169: Adds command for displaying box routable IP address @navidshaikh
+- Fix message for box command on default help @budhrg
+- Fix #184: Make env headers comments for vagrant service-manager env @bexelbie
+- Fix #135: Refactor command.rb to make commands easier to add/maintain @budhrg
+- Adds @budhrg as co-maintainer for the plugin @navidshaikh
+- Fix #191: 'vagrant service-manager restart' not handled correctly @budhrg
+- Fixes #187, Updated commands in the Available Commands section @preeticp
+- Fix #200: Simplify the eval hint for `vagrant service-manager env` command @budhrg
+- Add environment variables for Openshift env output @bexelbie
+- Fix #181: vagrant-service-manager version 1.0.2 release @navidshaikh
+
+
 * Tue Apr 12 2016 Navid Shaikh - 1.0.1-1
 - Updated SPEC (v1.0.0) for url, date and format @budhrg
 - Added Table of Contents for README @bexelbie

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-service-manager
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies: []
 description: Provides setup information, including environment variables and certificates,
   required to access services provided by ADB/CDK.
@@ -40,10 +40,13 @@ files:
 - lib/vagrant-service-manager/plugin_util.rb
 - lib/vagrant-service-manager/service.rb
 - lib/vagrant-service-manager/services/docker.rb
+- lib/vagrant-service-manager/services/kubernetes.rb
 - lib/vagrant-service-manager/services/open_shift.rb
 - lib/vagrant-service-manager/version.rb
 - locales/en.yml
-- plugins/guests/redhat/cap/osvariant.rb
+- plugins/guests/redhat/cap/box_version.rb
+- plugins/guests/redhat/cap/machine_ip.rb
+- plugins/guests/redhat/cap/os_variant.rb
 - plugins/guests/redhat/cap/sha_id.rb
 - plugins/guests/redhat/plugin.rb
 - vagrant-service-manager.gemspec