vagrant-service-manager 1.1.0.beta.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d72420be6d3f4e17f9e649cfe9236ac0b8709ef
-  data.tar.gz: 7f65631baa320c7602742c9fac835183bbe64810
+  metadata.gz: a07e2bb53c36d17f60301f92f65614e1ad0a0a53
+  data.tar.gz: 74b02d8dc2bdcdc63097538aca9de66de0169f04
 SHA512:
-  metadata.gz: b7edeefe39c4841c208b050c3d775302bfe803b03567037466eba8cc9969db1540719f495c5b24e0116e1c19abd5189999ab2937d805ed076b5a404fd1631e0b
-  data.tar.gz: c90cf6b537f209728e1cae6e3a08aaf6c1eb884449064f0e018debacb816e878a698aa9d47998431bb18bb8a38e87588752b569d2b62c95ade5ac69ee4c9b38a
+  metadata.gz: 6992490bc94977e327eab53a6feda53715e3df022a18e443340f7be9601d560ab257a4941f2982eee52672609a59c517f156c96f58316ce5eef74185fbb66351
+  data.tar.gz: 25d843b9d45177b669eb8764c0e95366b83576bee53e03fceedc7deaf0c6af37d1da59e0f5b40091cf54fe8e6737f7b305f777349b0a3deaeac51708adbcb6cc

data/.ci/ansible/roles/centos/tasks/main.yml

@@ -0,0 +1,38 @@
+- name: Enable centos-release-scl repo
+  yum: name=centos-release-scl state=latest
+
+- name: Setup Vagrant
+  yum: name={{item}} state=latest
+  with_items:
+      - sclo-vagrant1
+      - rsync
+
+- name: Setup libvirt
+  yum: name={{item}} state=latest
+  with_items:
+      - qemu-kvm
+      - sclo-vagrant1-vagrant-libvirt
+
+- name: Setup VirtualBox dependencies
+  yum: name={{item}} state=latest
+  with_items:
+      - gcc
+      - kernel-devel
+
+- name: Install VirtualBox
+  yum: name=http://download.virtualbox.org/virtualbox/rpm/rhel/7/x86_64/VirtualBox-5.0-5.0.8_103449_el7-1.x86_64.rpm state=present
+
+- name: start-enable-libvirtd
+  service: name=libvirtd state=started enabled=yes
+
+- name: Setup Ruby dev environment
+  yum: name={{item}} state=latest
+  with_items:
+      - zlib-devel
+      - ruby-devel
+      - rh-ruby22-ruby-devel
+      - libvirt-devel
+
+- name: Install Development Tools
+  yum: name="@Development tools" state=present
+

data/.ci/ansible/roles/centos/vars/main.yml

@@ -0,0 +1,3 @@
+---
+
+

data/.ci/ansible/site.yml

@@ -0,0 +1,4 @@
+- hosts: localhost
+  connection: local
+  roles:
+      - { role: centos,  when: ansible_distribution == "CentOS" }

data/.ci/jenkins-execute-script.py

@@ -0,0 +1,79 @@
+#!/usr/bin/python
+
+import os
+import json
+import urllib
+import subprocess
+import sys
+
+url_base = "http://admin.ci.centos.org:8080"
+api_key = os.environ['API_KEY']
+count = os.environ['MACHINE_COUNT'] if os.environ.get('MACHINE_COUNT') != None else "1"
+ver = "7"
+arch = "x86_64"
+req_url = "%s/Node/get?key=%s&ver=%s&arch=%s&count=%s" %  (url_base, api_key, ver, arch, count)
+
+jsondata = urllib.urlopen(req_url).read()
+data = json.loads(jsondata)
+
+# Setup some variables. Can be passed as env variables via the job config. Otherwise defaults apply
+repo_url = os.environ['REPO_URL']  if os.environ.get('REPO_URL') != None else 'https://github.com/projectatomic/vagrant-service-manager.git'
+branch = os.environ['BRANCH']  if os.environ.get('BRANCH') != None else 'master'
+
+def execute_on_host( host, cmd, error_message ):
+    # build command to execute install and test commands via ssh
+    ssh_cmd  = "ssh -t -t "
+    ssh_cmd += "-o UserKnownHostsFile=/dev/null "
+    ssh_cmd += "-o StrictHostKeyChecking=no "
+    ssh_cmd += "root@%s " % (host)
+
+    cmd = '%s "%s"' % (ssh_cmd, cmd)
+    print "Executing: %s" % (cmd)
+    exit_code = subprocess.call(cmd, shell=True)
+    if exit_code != 0 : sys.exit(error_message)
+    return
+
+def prepare_pull_request_build(host):
+    pr_branch = os.environ['ghprbSourceBranch']
+    pr_author_repo = os.environ['ghprbAuthorRepoGitUrl']
+
+    branch_cmd  = 'cd vagrant-service-manager && '
+    branch_cmd += "git checkout -b %s" % (pr_branch)
+    execute_on_host(host, branch_cmd, "Unable to create branch for pull request build")
+
+    pull_cmd  = 'cd vagrant-service-manager && '
+    pull_cmd += "git pull --no-edit %s %s " % (pr_author_repo, pr_branch)
+    execute_on_host(host, pull_cmd, "Unable to pull pull request")
+    return
+
+for host in data['hosts']:
+
+    # run the Ansible playbook
+    ansible_cmd  = 'yum -y install git epel-release ansible1.9 && '
+    ansible_cmd += 'yum -y install ansible1.9 && '
+    ansible_cmd += 'git clone %s && ' % repo_url
+    ansible_cmd += 'cd vagrant-service-manager && '
+    ansible_cmd += 'git checkout %s && ' % branch
+    ansible_cmd += 'cd .ci/ansible && '
+    ansible_cmd += 'ANSIBLE_NOCOLOR=1 ansible-playbook site.yml'
+    execute_on_host(host, ansible_cmd, "Ansible playbook failed")
+
+    # if we deal with a pull request build we need to prepare the source
+    if os.environ.get('ghprbPullId') != None:
+        prepare_pull_request_build(host)
+
+    # setup the environment
+    setup_cmd  = 'cd vagrant-service-manager && '
+    setup_cmd += 'gem install bundler -v 1.10.0 && '
+    setup_cmd += 'bundle install --no-color'
+    execute_on_host(host, setup_cmd, "Unable to setup Ruby environment")
+
+    # run build and features
+    build_cmd  = 'cd vagrant-service-manager && '
+    build_cmd += 'bundle exec rake build && '
+    build_cmd += 'bundle exec rake get_adb[\'libvirt\'] && '
+    build_cmd += 'bundle exec rake features CUCUMBER_OPTS=\'-p ci\' PROVIDER=libvirt'
+    execute_on_host(host, build_cmd, "Tests failures")
+
+    done_nodes_url = "%s/Node/done?key=%s&sside=%s" % (url_base, api_key, data['ssid'])
+    print urllib.urlopen(done_nodes_url)

data/.config/cucumber.yml

@@ -5,6 +5,7 @@ default: --profile html
 
 pretty: --format pretty -b
 html: --format progress --format html --out=build/features_report.html -b
+ci: --format pretty --format html --out=build/features_report.html --no-color -b
 
 help: --tags @help --profile html
 box: --tags @box --profile html

data/CHANGELOG.md

@@ -1,15 +1,31 @@
 # Changelog
 
 ## Unreleased
+
+## v1.1.0 Jun 08, 2016
 - Updated README to make Installation Instructions clearer @bexelbie
-- Fix #195 Adding Cucumber and Aruba based acceptance tests @hferentschik
+- Fix #195: Adding Cucumber and Aruba based acceptance tests @hferentschik
 - CHANGELOG fix and README update for OS support for tests @budhrg
+- Fix #220: Bypass hook if no supported guest/box found @budhrg
+- Issue #212 Updating the CONTRIBUTING page with latest guidelines @hferentschik
 - Fix #188: Name of k8s service not consistent @budhrg
 - Fix #225: service-manager env throws NameError @budhrg
 - Fix #168: Extend --debug flag to show plugin activity @budhrg
+- Fixed help messages for box and status commands @budhrg
 - Don't set private network for unsupported box @budhrg
 - Convert CONTRIBUTING and README docs to AsciiDoc @bexelbie
+- Fix #235: Unable to access docker daemon from host @budhrg
 - Fix #172: Implement "start/enable" service command @budhrg
+- Issue #172 Modifying Rake CDK download task to allow downloading latest nightly build @hferentschik
+- Pre-release v1.1.0.beta.1 @navidshaikh
+- Fix #237: README and CONTRIBUTING should make use of Asciidoc's :toc: feature @hferentschik
+- Fix #230: Improve acceptance test run time @hferentschik
+- Fix #214: Update acceptance tests to support Mac OS without installing Libvirt @hferentschik
+- Fix #247: Moved status test into service-operation @hferentschik
+- Issue #211 Adding configuration for CI build @hferentschik
+- Fix #210: Adds docker registry URL in openshift env info @navidshaikh
+- Fix #250: status throws error with invalid service name @budhrg
+- vagrant-service-manager release=1.1.0 version=1 @navidshaikh
 
 ## v1.0.2 May 09, 2016
 - Add --script-readable to env and env docker @bexelbie

data/CONTRIBUTING.adoc

@@ -1,22 +1,16 @@
-[[contributing-to-vagrant-service-manager]]
-== Contributing to vagrant-service-manager
-
-* link:#submitting-issues[Submitting issues]
-* link:#submitting-pull-requests[Submitting pull requests]
-** link:#get-started[Get Started]
-** link:#create-a-topic-branch[Create a topic branch]
-** link:#code[Code]
-** link:#commit[Commit]
-** link:#submit[Submit]
-* link:#merging-pull-requests[Merging pull requests]
+= Contributing to vagrant-service-manager
+:toc:
+:toc-placement!:
 
 The following is a set of guidelines for contributing to the
-vagrant-service-manager plugin.
+vagrant-service-manager plugin. These are guidelines, please use your best
+judgment and feel free to propose changes to this document.
 
-These are guidelines, please use your best judgment and feel free to
-propose changes to this document.
+'''
+toc::[]
+'''
 
-=== Submitting issues
+== Submitting issues
 
 You can submit issues with respect to the vagrant-service-manager plugin
 https://github.com/projectatomic/vagrant-service-manager/issues/new[here].
@@ -31,9 +25,9 @@ Developer Bundle] and the
 https://github.com/projectatomic/adb-utils/issues[adb-utils] RPM. You
 may wish to review the issues in both these repositories as well.
 
-=== Submitting pull requests
+== Submitting pull requests
 
-==== Get Started
+=== Get Started
 
 If you are just getting started with Git and GitHub there are a few
 prerequisite steps.
@@ -46,7 +40,7 @@ this also includes:
 git install.
 ** Cloning your fork.
 
-==== Create a topic branch
+=== Create a topic branch
 
 Create a
 http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches[topic
@@ -57,12 +51,12 @@ link:#submitting-issues[submitting issues]). Assuming for example you
 will be working from the master branch and working on the GitHub issue
 123 : `git checkout -b issue-123 master`
 
-==== Code
+=== Code
 
 Do your work! Refer to the link:README.md#development[development]
 section in the link:README.md[README] to get started.
 
-==== Commit
+=== Commit
 
 * Make commits of logical units.
 * Be sure to use the GitHub issue key in the commit message, eg
@@ -71,7 +65,7 @@ section in the link:README.md[README] to get started.
 * Make sure you have added appropriate documentation updates.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
-==== Submit
+=== Submit
 
 * Push your changes to the topic branch in your fork of the repository.
 * Initiate a https://help.github.com/articles/using-pull-requests/[pull
@@ -82,7 +76,7 @@ considered to be the first ACK. Therefore, pull requests from
 maintainers only need one additional ACK. By "2 ACKs" we mean that two
 maintainers must acknowledge that the change is a good one.
 
-=== Merging pull requests
+== Merging pull requests
 
 A project maintainer will merge the pull request. He should avoid using
 the GitHub UI for the merge and prefer merges over the the command line

data/Gemfile

@@ -5,8 +5,8 @@ gemspec
 group :development do
   gem 'vagrant',      git: 'https://github.com/mitchellh/vagrant.git'
   gem 'rake'
-  gem 'vagrant-libvirt'
-  gem 'fog-libvirt', '0.0.3' # https://github.com/pradels/vagrant-libvirt/issues/568
+  gem 'vagrant-libvirt'  if RUBY_PLATFORM =~ /linux/i
+  gem 'fog-libvirt', '0.0.3'  if RUBY_PLATFORM =~ /linux/i # https://github.com/pradels/vagrant-libvirt/issues/568
   gem 'mechanize'
   gem 'json'
   gem 'cucumber', '~> 2.1'

data/README.adoc

@@ -1,21 +1,8 @@
-[[vagrant-service-manager]]
-== vagrant-service-manager
-
-* link:#objective[Objective]
-* link:#installation[Installation]
-** link:#installing-from-a-rubygems[Installing from a RubyGems]
-** link:#installing-from-rpm[Installing from RPM]
-* link:#usage[Usage]
-** link:#example-execution-of-the-plugin[Example execution of the plugin]
-** link:#available-commands[Available commands]
-** link:#exit-codes[Exit codes]
-** link:#ip-address-detection[IP address detection]
-* link:#development[Development]
-** link:#setup[Setup]
-** link:#acceptance-tests[Acceptance tests]
-* link:#getting-involved[Getting involved]
-
-== Objective The vagrant-service-manager plugin is designed to enable
+= vagrant-service-manager
+:toc:
+:toc-placement!:
+
+The vagrant-service-manager plugin is designed to enable
 easier access to the features and services provided by the
 https://github.com/projectatomic/adb-atomic-developer-bundle[Atomic
 Developer Bundle (ADB)]. It provides setup information, including
@@ -28,6 +15,10 @@ use ADB with this plugin can be found in the
 https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/docs/using.rst[ADB
 Documentation].
 
+'''
+toc::[]
+'''
+
 == Installation
 
 The plugin is distributed as both a Ruby Gem and via RPM using the

data/Rakefile

@@ -19,12 +19,15 @@ CLEAN.include('build')
 
 task :init do
   FileUtils.mkdir_p 'build'
-  puts ENV['FOO']
+end
+
+task :clean_for_testing do
+  FileUtils.rm_rf ['build/aruba', 'build/vagrant.d', 'build/features_report.html']
 end
 
 # Cucumber acceptance test tasks
 Cucumber::Rake::Task.new(:features)
-task :features => :init
+task :features => [:init, :clean_for_testing]
 
 namespace :features do
   desc 'Opens the HTML Cucumber test report'

data/features/box-command.feature

@@ -7,7 +7,11 @@ Feature: Command output from box command
     And provider is <provider>
     And a file named "Vagrantfile" with:
     """
-    require 'vagrant-libvirt'
+    begin
+      require 'vagrant-libvirt'
+    rescue LoadError
+      # NOOP
+    end
 
     Vagrant.configure('2') do |config|
       config.vm.box = '<box>'

data/features/env-command.feature

@@ -7,7 +7,11 @@ Feature: Command output from env command
     And provider is <provider>
     And a file named "Vagrantfile" with:
     """
-    require 'vagrant-libvirt'
+    begin
+      require 'vagrant-libvirt'
+    rescue LoadError
+      # NOOP
+    end
 
     Vagrant.configure('2') do |config|
       config.vm.box = '<box>'
@@ -43,6 +47,9 @@ Feature: Command output from env command
     # OpenShift service is not running in the vagrant box.
     """
 
+    When I successfully run `bundle exec vagrant service-manager env --debug`
+    Then stdout from "bundle exec vagrant service-manager env --debug" should match /DEBUG command: [ service-manager: env ]/
+
     Examples:
       | box   | provider   | ip          |
       | cdk   | virtualbox | 10.10.10.42 |

data/features/help-command.feature

@@ -7,7 +7,11 @@ Feature: Command output from help command
     And provider is <provider>
     And a file named "Vagrantfile" with:
     """
-    require 'vagrant-libvirt'
+    begin
+      require 'vagrant-libvirt'
+    rescue LoadError
+      # NOOP
+    end
 
     Vagrant.configure('2') do |config|
       config.vm.box = '<box>'

data/features/openshift.feature

@@ -7,7 +7,11 @@ Feature: Command output from various OpenShift related commands
     And provider is <provider>
     And a file named "Vagrantfile" with:
     """
-    require 'vagrant-libvirt'
+    begin
+      require 'vagrant-libvirt'
+    rescue LoadError
+      # NOOP
+    end
 
     Vagrant.configure('2') do |config|
       config.vm.box = '<box>'
@@ -32,6 +36,7 @@ Feature: Command output from various OpenShift related commands
     # To use OpenShift CLI, run: oc login https://<ip>:8443
     export OPENSHIFT_URL=https://<ip>:8443
     export OPENSHIFT_WEB_CONSOLE=https://<ip>:8443/console
+    export DOCKER_REGISTRY=hub.openshift.rhel-cdk.<ip>.xip.io
 
     # run following command to configure your shell:
     # eval "$(vagrant service-manager env openshift)"
@@ -43,9 +48,28 @@ Feature: Command output from various OpenShift related commands
     """
     OPENSHIFT_URL=https://<ip>:8443
     OPENSHIFT_WEB_CONSOLE=https://<ip>:8443/console
+    DOCKER_REGISTRY=hub.openshift.rhel-cdk.<ip>.xip.io
+    """
+
+    When I successfully run `bundle exec vagrant service-manager env`
+    Then stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_HOST=tcp://<ip>:2376"
+    And stdout from "bundle exec vagrant service-manager env" should match /export DOCKER_CERT_PATH=.*\/.vagrant\/machines\/cdk\/virtualbox\/docker/
+    And stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_TLS_VERIFY=1"
+    And stdout from "bundle exec vagrant service-manager env" should contain "export DOCKER_API_VERSION=1.21"
+    And stdout from "bundle exec vagrant service-manager env" should match /# eval "\$\(vagrant service-manager env\)"/
+    And stdout from "bundle exec vagrant service-manager env" should contain:
+    """
+    # openshift env:
+    # You can access the OpenShift console on: https://<ip>:8443/console
+    # To use OpenShift CLI, run: oc login https://<ip>:8443
+    export OPENSHIFT_URL=https://<ip>:8443
+    export OPENSHIFT_WEB_CONSOLE=https://<ip>:8443/console
+    export DOCKER_REGISTRY=hub.openshift.rhel-cdk.<ip>.xip.io
+    # run following command to configure your shell:
+    # eval "$(vagrant service-manager env)"
     """
 
     Examples:
       | box   | provider   | ip          |
       | cdk   | virtualbox | 10.10.10.42 |
-      | cdk   | libvirt    | 10.10.10.42 |
+      | cdk   | libvirt    | 10.10.10.42 |

data/features/service-operation.feature

@@ -7,7 +7,11 @@ Feature: Command output from service operations like stop/start/restart
     And provider is <provider>
     And a file named "Vagrantfile" with:
     """
-    require 'vagrant-libvirt'
+    begin
+      require 'vagrant-libvirt'
+    rescue LoadError
+      # NOOP
+    end
 
     Vagrant.configure('2') do |config|
       config.vm.box = '<box>'
@@ -19,7 +23,23 @@ Feature: Command output from service operations like stop/start/restart
     """
 
     When I successfully run `bundle exec vagrant up --provider <provider>`
-    And the "docker" service is running
+    And I successfully run `bundle exec vagrant service-manager status`
+    Then stdout from "bundle exec vagrant service-manager status" should contain "docker - running"
+    Then stdout from "bundle exec vagrant service-manager status" should contain "openshift - stopped"
+    Then stdout from "bundle exec vagrant service-manager status" should contain "kubernetes - stopped"
+
+    When I successfully run `bundle exec vagrant service-manager status docker`
+    Then stdout from "bundle exec vagrant service-manager status" should contain "docker - running"
+
+    When I run `bundle exec vagrant service-manager status abcd`
+    Then the exit status should be 126
+    And stderr from "bundle exec vagrant service-manager status abcd" should contain:
+    """
+    Unkown service 'abcd'.
+    Supported services are docker, openshift, kubernetes etc.
+    """
+
+    When the "docker" service is running
     And I successfully run `bundle exec vagrant service-manager stop docker`
     Then the service "docker" should be stopped
 

data/features/support/env.rb

@@ -11,6 +11,11 @@ Aruba.configure do |config|
   config.working_directory = 'build/aruba'
 end
 
+Before do |scenario|
+  @scenario_name = scenario.name
+  ENV['VAGRANT_HOME'] = File.join(File.dirname(__FILE__), '..', '..', 'build', 'vagrant.d')
+end
+
 After do |_scenario|
   if File.exist?(File.join(aruba.config.working_directory, 'Vagrantfile'))
     Komenda.run('bundle exec vagrant destroy -f', cwd: aruba.config.working_directory, fail_on_fail: true)
@@ -22,10 +27,6 @@ After do |_scenario|
   end
 end
 
-Before do |scenario|
-  @scenario_name = scenario.name
-end
-
 ###############################################################################
 # Some helper functions
 ###############################################################################

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

@@ -141,13 +141,18 @@ module VagrantPlugins
 
       def execute_status_display(service = nil)
         with_target_vms(nil, single_target: true) do |machine|
-          if service
+          if service && SUPPORTED_SERVICES.include?(service)
             PluginUtil.service_class(service).status(machine, @env.ui, service)
-          else
+          elsif service.nil?
             @env.ui.info I18n.t('servicemanager.commands.status.nil')
             SUPPORTED_SERVICES.each do |s|
               PluginUtil.service_class(s).status(machine, @env.ui, s)
             end
+          else
+            @env.ui.error I18n.t('servicemanager.commands.status.unsupported_service',
+                                  service: service,
+                                  services: SUPPORTED_SERVICES.join(', ') + ' etc')
+            exit 126
           end
         end
       end

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

@@ -18,12 +18,26 @@ module VagrantPlugins
         PluginUtil.print_service_status(ui, machine, service)
       end
 
+      def self.docker_registry_host(machine)
+        url = ''
+        PluginLogger.debug
+        command = \
+          "sudo oc --config=/var/lib/openshift/openshift.local." +
+          "config/master/admin.kubeconfig get route/docker-registry " +
+          "-o template --template={{.spec.host}}"
+        machine.communicate.execute(command) do |type, data|
+          url << data.chomp if type == :stdout
+        end
+        url
+      end
+
       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"
+          options[:docker_registry] = docker_registry_host(machine)
           print_info(ui, options)
         else
           ui.error I18n.t('servicemanager.commands.env.service_not_running',
@@ -38,7 +52,8 @@ module VagrantPlugins
         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])
+                         openshift_console_url: options[:console_url],
+                         docker_registry: options[:docker_registry])
         ui.info(message)
         unless options[:script_readable] || options[:all]
           PluginUtil.print_shell_configure_info(ui, ' openshift')

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServiceManager
-    VERSION = "1.1.0.beta.1"
+    VERSION = "1.1.0"
   end
 end

data/locales/en.yml

@@ -120,19 +120,23 @@ en:
             # To use OpenShift CLI, run: oc login %{openshift_url}
             setx OPENSHIFT_URL %{openshift_url}
             setx OPENSHIFT_WEB_CONSOLE %{openshift_console_url}
+            setx DOCKER_REGISTRY %{docker_registry}
           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}
+            export DOCKER_REGISTRY=%{docker_registry}
           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}
+            export DOCKER_REGISTRY=%{docker_registry}
           script_readable: |-
             OPENSHIFT_URL=%{openshift_url}
             OPENSHIFT_WEB_CONSOLE=%{openshift_console_url}
+            DOCKER_REGISTRY=%{docker_registry}
         windows_cygwin_configure_info: |-
             # run following command to configure your shell:
             # eval "$(VAGRANT_NO_COLOR=1 vagrant service-manager env%{command} | tr -d '\r')"
@@ -153,3 +157,6 @@ en:
         status:
           running: running
           stopped: stopped
+        unsupported_service: |-
+          Unkown service '%{service}'.
+          Supported services are %{services}.

data/vagrant-service-manager.spec

@@ -2,7 +2,7 @@
 %global vagrant_plugin_name vagrant-service-manager
 
 Name: %{vagrant_plugin_name}
-Version: 1.0.2
+Version: 1.1.0
 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
@@ -71,14 +71,16 @@ popd
 %{vagrant_plugin_spec}
 %{vagrant_plugin_instdir}/plugins/guests/
 %{vagrant_plugin_instdir}/locales/
+%exclude %{vagrant_plugin_instdir}/.ci
+%exclude %{vagrant_plugin_instdir}/.config
 
 %files doc
 %doc %{vagrant_plugin_docdir}
 %{vagrant_plugin_instdir}/Gemfile
-%doc %{vagrant_plugin_instdir}/README.md
+%doc %{vagrant_plugin_instdir}/README.adoc
 %{vagrant_plugin_instdir}/Rakefile
 %{vagrant_plugin_instdir}/Vagrantfile
-%{vagrant_plugin_instdir}/CONTRIBUTING.md
+%{vagrant_plugin_instdir}/CONTRIBUTING.adoc
 %{vagrant_plugin_instdir}/LICENSE
 %{vagrant_plugin_instdir}/MAINTAINERS
 %{vagrant_plugin_instdir}/vagrant-service-manager.gemspec
@@ -86,8 +88,35 @@ popd
 %{vagrant_plugin_instdir}/CHANGELOG.md
 %{vagrant_plugin_instdir}/TODO
 %{vagrant_plugin_instdir}/.gitattributes
+%{vagrant_plugin_instdir}/features
 
 %changelog
+* Wed Jun 08 2016 Navid Shaikh - 1.1.0-1
+- Bumps verison to 1.1.0
+- Updated README to make Installation Instructions clearer @bexelbie
+- Fix #195: Adding Cucumber and Aruba based acceptance tests @hferentschik
+- CHANGELOG fix and README update for OS support for tests @budhrg
+- Fix #220: Bypass hook if no supported guest/box found @budhrg
+- Issue #212 Updating the CONTRIBUTING page with latest guidelines @hferentschik
+- Fix #188: Name of k8s service not consistent @budhrg
+- Fix #225: service-manager env throws NameError @budhrg
+- Fix #168: Extend --debug flag to show plugin activity @budhrg
+- Fixed help messages for box and status commands @budhrg
+- Don't set private network for unsupported box @budhrg
+- Convert CONTRIBUTING and README docs to AsciiDoc @bexelbie
+- Fix #235: Unable to access docker daemon from host @navidshaikh
+- Fix #172: Implement "start/enable" service command @budhrg
+- Issue #172 Modifying Rake CDK download task to allow downloading latest nightly build @hferentschik
+- Pre-release v1.1.0.beta.1 @navidshaikh
+- Fix #237: README and CONTRIBUTING should make use of Asciidoc's :toc: feature @hferentschik
+- Fix #230: Improve acceptance test run time @hferentschik
+- Fix #214: Update acceptance tests to support Mac OS without installing Libvirt @hferentschik
+- Fix #247: Moved status test into service-operation @hferentschik
+- Issue #211 Adding configuration for CI build @hferentschik
+- Fix #210: Adds docker registry URL in openshift env info @navidshaikh
+- Fix #250: status throws error with invalid service name @budhrg
+- vagrant-service-manager release=1.1.0 version=1 @navidshaikh
+
 * 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
@@ -103,7 +132,6 @@ popd
 - 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.1.0.beta.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies: []
 description: Provides setup information, including environment variables and certificates,
   required to access services provided by ADB/CDK.
@@ -20,6 +20,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ci/ansible/roles/centos/tasks/main.yml"
+- ".ci/ansible/roles/centos/vars/main.yml"
+- ".ci/ansible/site.yml"
+- ".ci/jenkins-execute-script.py"
 - ".config/cucumber.yml"
 - ".gitattributes"
 - ".gitignore"
@@ -33,12 +37,10 @@ files:
 - TODO
 - Vagrantfile
 - features/box-command.feature
-- features/debug-flag.feature
 - features/env-command.feature
 - features/help-command.feature
 - features/openshift.feature
 - features/service-operation.feature
-- features/status-command.feature
 - features/support/env.rb
 - lib/vagrant-service-manager.rb
 - lib/vagrant-service-manager/action/setup_network.rb
@@ -76,9 +78,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/features/debug-flag.feature

@@ -1,30 +0,0 @@
-Feature: Command output from --debug flag
-  service-manager should print the debug logs along with native logs
-
-  @status
-  Scenario Outline: Boot and execute simple env command with debug logs
-    Given box is <box>
-    And provider is <provider>
-    And a file named "Vagrantfile" with:
-    """
-    require 'vagrant-libvirt'
-
-    Vagrant.configure('2') do |config|
-      config.vm.box = '<box>'
-      config.vm.box_url = 'file://../boxes/<box>-<provider>.box'
-      config.vm.network :private_network, ip: '<ip>'
-      config.vm.synced_folder '.', '/vagrant', disabled: true
-      config.servicemanager.services = 'docker'
-    end
-    """
-
-    When I successfully run `bundle exec vagrant up --provider <provider>`
-    And I successfully run `bundle exec vagrant service-manager env --debug`
-    Then stdout from "bundle exec vagrant service-manager env --debug" should match /DEBUG command: [ service-manager: env ]/
-
-    Examples:
-      | box   | provider   | ip          |
-      | cdk   | virtualbox | 10.10.10.42 |
-      | adb   | virtualbox | 10.10.10.42 |
-      | cdk   | libvirt    | 10.10.10.42 |
-      | adb   | libvirt    | 10.10.10.42 |

data/features/status-command.feature

@@ -1,31 +0,0 @@
-Feature: Command output from status command
-  service-manager should return the correct output from status command
-
-  @status
-  Scenario Outline: Boot and execute status command
-    Given box is <box>
-    And provider is <provider>
-    And a file named "Vagrantfile" with:
-    """
-    require 'vagrant-libvirt'
-
-    Vagrant.configure('2') do |config|
-      config.vm.box = '<box>'
-      config.vm.box_url = 'file://../boxes/<box>-<provider>.box'
-      config.vm.network :private_network, ip: '<ip>'
-      config.vm.synced_folder '.', '/vagrant', disabled: true
-      config.servicemanager.services = 'docker'
-    end
-    """
-
-    When I successfully run `bundle exec vagrant up --provider <provider>`
-    And I successfully run `bundle exec vagrant service-manager status`
-    Then stdout from "bundle exec vagrant service-manager status" should contain "docker - running"
-    Then stdout from "bundle exec vagrant service-manager status" should contain "openshift - stopped"
-
-    Examples:
-      | box   | provider   | ip          |
-      | cdk   | virtualbox | 10.10.10.42 |
-      | adb   | virtualbox | 10.10.10.42 |
-      | cdk   | libvirt    | 10.10.10.42 |
-      | adb   | libvirt    | 10.10.10.42 |