vagrant-openshift 1.0.12 → 1.0.13

data/lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml

@@ -1,54 +1,48 @@
 ---
-:centos6:
+:centos7:
   :os:
     :virtualbox:
-      :box_name: centos_65_virtualbox_base
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_virtualbox_base.box
+      :box_name: centos_7_virtualbox_base
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_7_virtualbox_base.box
     :vmware:
-      :box_name: centos_65_vmware_base
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_vmware_base.box
+      :box_name: n/a
+      :box_url: n/a
     :aws:
-      :ami: ami-8f9d81e6
+      :ami: <AMI_ID>
       :ami_region: us-east-1
-      :ssh_user: root
-      :machine_name: origin-centos-65-base
+      :ssh_user: centos
+      :machine_name: origin-centos-7-base
       :ebs_volume_size: 25
-    :openstack:
-      :image: centos-6.5-20140117.0.x86_64
-      :ssh_username: cloud-user
+      :ami_tag_prefix: openshift-centos7_
   :deps:
     :virtualbox:
-      :box_name: centos_65_virtualbox_deps
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_virtualbox_deps.box
+      :box_name: centos_7_virtualbox_deps
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_7_virtualbox_deps.box
     :vmware:
-      :box_name: centos_65_vmware_deps
-      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_vmware_deps.box
+      :box_name: n/a
+      :box_url: n/a
     :aws:
-      :ami: ami-100ec478
-      :ami_tag_prefix: origin-centos-65-deps_
+      :ami: <AMI_ID>
+      :ami_tag_prefix: origin-centos-7-deps_
       :ami_region: us-east-1
-      :ssh_user: root
-      :machine_name: origin-centos-65-deps
+      :ssh_user: centos
+      :machine_name: origin-centos-7-deps
       :ebs_volume_size: 25
-    :openstack:
-      :image: n/a
-      :ssh_username: cloud-user
+      :ami_tag_prefix: devenv-centos7-base_
   :inst:
     :virtualbox:
-      :box_name: n/a
-      :box_url: n/a
+      :box_name: centos_7_virtualbox_inst
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_7_virtualbox_inst.box
     :vmware:
       :box_name: n/a
       :box_url: n/a
     :aws:
       :ami: <AMI_ID>
       :ami_region: us-east-1
-      :ssh_user: root
+      :ssh_user: centos
       :machine_name: <AMI_NAME>
       :ebs_volume_size: 25
-    :openstack:
-      :image: n/a
-      :ssh_username: cloud-user
+      :ami_tag_prefix: devenv-centos7_
 :fedora:
   :os:
     :virtualbox:
@@ -57,16 +51,16 @@
     :vmware:
       :box_name: fedora_base
       :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_vmware_os.box
+    :libvirt:
+      :box_name: fedora_base
+      :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_libvirt_os.box
     :aws:
-      :ami: ami-9c9376f4
+      :ami: <AMI_ID>
       :ami_region: us-east-1
       :ssh_user: fedora
       :machine_name: openshift-fedora
       :ebs_volume_size: 25
       :ami_tag_prefix: openshift-fedora_
-    :openstack:
-      :image: "Fedora 20 official release"
-      :ssh_username: fedora
   :deps:
     :virtualbox:
       :box_name: fedora_deps
@@ -74,16 +68,16 @@
     :vmware:
       :box_name: fedora_deps
       :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_vmware_deps.box
+    :libvirt:
+      :box_name: fedora_deps
+      :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_libvirt_deps.box
     :aws:
-      :ami: ami-a8a94fc0
+      :ami: <AMI_ID>
       :ami_region: us-east-1
       :ssh_user: fedora
       :machine_name: devenv-fedora-base
       :ebs_volume_size: 25
       :ami_tag_prefix: devenv-fedora-base_
-    :openstack:
-      :image: n/a
-      :ssh_username: fedora
   :inst:
     :virtualbox:
       :box_name: fedora_inst
@@ -91,6 +85,9 @@
     :vmware:
       :box_name: fedora_inst
       :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_vmware_inst.box
+    :libvirt:
+      :box_name: fedora_inst
+      :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_libvirt_inst.box
     :aws:
       :ami: <AMI_ID>
       :ami_region: us-east-1
@@ -98,10 +95,7 @@
       :machine_name: <AMI_NAME>
       :ebs_volume_size: 25
       :ami_tag_prefix: devenv-fedora_
-    :openstack:
-      :image: n/a
-      :ssh_username: fedora
-:rhel6:
+:rhel7:
   :os:
     :virtualbox:
       :box_name: n/a
@@ -115,9 +109,6 @@
       :ssh_user: root
       :machine_name: <AMI_NAME>
       :ebs_volume_size: 25
-    :openstack:
-      :image: rhel-guest-image-6.5-20140603.0
-      :ssh_username: cloud-user
   :deps:
     :virtualbox:
       :box_name: n/a
@@ -131,9 +122,6 @@
       :ssh_user: root
       :machine_name: <AMI_NAME>
       :ebs_volume_size: 25
-    :openstack:
-      :image: n/a
-      :ssh_username: cloud-user
   :inst:
     :virtualbox:
       :box_name: n/a
@@ -147,6 +135,3 @@
       :ssh_user: root
       :machine_name: <AMI_NAME>
       :ebs_volume_size: 25
-    :openstack:
-      :image: n/a
-      :ssh_username: cloud-user

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vagrant-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant plugin to manage OpenShift Origin environments
@@ -114,76 +114,65 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitattributes
-- .gitignore
+- ".gitattributes"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.asciidoc
 - Rakefile
 - lib/vagrant-openshift.rb
 - lib/vagrant-openshift/action.rb
-- lib/vagrant-openshift/action/build_openshift2.rb
 - lib/vagrant-openshift/action/build_openshift3.rb
-- lib/vagrant-openshift/action/build_openshift3_images.rb
-- lib/vagrant-openshift/action/build_openshift3_infrastructure_images.rb
-- lib/vagrant-openshift/action/checkout_openshift2_tests.rb
+- lib/vagrant-openshift/action/build_openshift3_base_images.rb
+- lib/vagrant-openshift/action/build_sti.rb
 - lib/vagrant-openshift/action/checkout_repositories.rb
 - lib/vagrant-openshift/action/clean.rb
 - lib/vagrant-openshift/action/clean_network_setup.rb
 - lib/vagrant-openshift/action/clone_upstream_repositories.rb
 - lib/vagrant-openshift/action/create_ami.rb
 - lib/vagrant-openshift/action/create_bare_repo_placeholders.rb
-- lib/vagrant-openshift/action/create_openshift2_puppet_file.rb
-- lib/vagrant-openshift/action/create_openshift2_test_users.rb
 - lib/vagrant-openshift/action/create_yum_repositories.rb
-- lib/vagrant-openshift/action/download_artifacts_openshift2.rb
 - lib/vagrant-openshift/action/download_artifacts_openshift3.rb
+- lib/vagrant-openshift/action/download_artifacts_sti.rb
 - lib/vagrant-openshift/action/generate_template.rb
-- lib/vagrant-openshift/action/idle_all_gears_openshift2.rb
-- lib/vagrant-openshift/action/install_openshift2_base_dependencies.rb
-- lib/vagrant-openshift/action/install_openshift2_build_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift3.rb
+- lib/vagrant-openshift/action/install_openshift3_asset_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift3_images.rb
-- lib/vagrant-openshift/action/install_rhc.rb
-- lib/vagrant-openshift/action/local_openshift2_checkout.rb
 - lib/vagrant-openshift/action/local_openshift3_checkout.rb
 - lib/vagrant-openshift/action/modify_ami.rb
 - lib/vagrant-openshift/action/modify_instance.rb
 - lib/vagrant-openshift/action/prepare_ssh_config.rb
-- lib/vagrant-openshift/action/preserve_mcollective_logs.rb
-- lib/vagrant-openshift/action/run_openshift2_tests.rb
+- lib/vagrant-openshift/action/push_openshift3_release.rb
 - lib/vagrant-openshift/action/run_openshift3_tests.rb
+- lib/vagrant-openshift/action/run_sti_tests.rb
 - lib/vagrant-openshift/action/set_host_name.rb
 - lib/vagrant-openshift/action/setup_bind_dns_key.rb
 - lib/vagrant-openshift/action/setup_bind_host.rb
-- lib/vagrant-openshift/action/setup_builder_files.rb
 - lib/vagrant-openshift/action/sync_local_repository.rb
 - lib/vagrant-openshift/action/sync_upstream_repository.rb
 - lib/vagrant-openshift/action/test_exit_code.rb
 - lib/vagrant-openshift/action/try_restart_openshift3.rb
-- lib/vagrant-openshift/action/uninstall_openshift2_rpms.rb
 - lib/vagrant-openshift/action/yum_update.rb
-- lib/vagrant-openshift/command/build_openshift2_base.rb
 - lib/vagrant-openshift/command/build_openshift3.rb
 - lib/vagrant-openshift/command/build_openshift3_base.rb
-- lib/vagrant-openshift/command/build_openshift3_images.rb
-- lib/vagrant-openshift/command/build_openshift3_infrastructure_images.rb
+- lib/vagrant-openshift/command/build_openshift3_base_images.rb
+- lib/vagrant-openshift/command/build_sti.rb
 - lib/vagrant-openshift/command/checkout_repositories.rb
 - lib/vagrant-openshift/command/clone_upstream_repositories.rb
 - lib/vagrant-openshift/command/create_ami.rb
 - lib/vagrant-openshift/command/install_openshift3.rb
-- lib/vagrant-openshift/command/install_rhc.rb
-- lib/vagrant-openshift/command/local_openshift2_setup.rb
+- lib/vagrant-openshift/command/install_openshift3_assets_base.rb
 - lib/vagrant-openshift/command/local_openshift3_setup.rb
 - lib/vagrant-openshift/command/modify_ami.rb
 - lib/vagrant-openshift/command/modify_instance.rb
 - lib/vagrant-openshift/command/openshift_init.rb
-- lib/vagrant-openshift/command/repo_sync_openshift2.rb
+- lib/vagrant-openshift/command/push_openshift3_release.rb
 - lib/vagrant-openshift/command/repo_sync_openshift3.rb
-- lib/vagrant-openshift/command/test_openshift2.rb
+- lib/vagrant-openshift/command/repo_sync_sti.rb
 - lib/vagrant-openshift/command/test_openshift3.rb
 - lib/vagrant-openshift/command/test_openshift3_image.rb
+- lib/vagrant-openshift/command/test_sti.rb
 - lib/vagrant-openshift/command/try_restart_openshift3.rb
 - lib/vagrant-openshift/config.rb
 - lib/vagrant-openshift/constants.rb
@@ -192,10 +181,6 @@ files:
 - lib/vagrant-openshift/provisioner.rb
 - lib/vagrant-openshift/templates/builder/Rakefile
 - lib/vagrant-openshift/templates/builder/lib/.gitkeep
-- lib/vagrant-openshift/templates/builder/lib/rpm.rb
-- lib/vagrant-openshift/templates/builder/lib/test.rb
-- lib/vagrant-openshift/templates/builder/yum-listbuilddep
-- lib/vagrant-openshift/templates/command/init-openshift/Vagrantfile.erb
 - lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml
 - lib/vagrant-openshift/version.rb
 - vagrant-openshift.gemspec
@@ -208,17 +193,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to manage OpenShift Origin environments

data/lib/vagrant-openshift/action/build_openshift3_images.rb

@@ -1,54 +0,0 @@
-#--
-# Copyright 2014 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class BuildOpenshift3Images
-        include CommandHelper
-
-        def initialize(app, env, options)
-          @app = app
-          @env = env
-          @options = options
-        end
-
-        def call(env)
-          # FIXME: Measure what would be the appropriate timeout here as the
-          #        docker build command can take quite a long time...
-          #
-          @options[:openshift3_images].each do |openshift3_image, _|
-            docker_image_name = "openshift/#{openshift3_image}"
-            docker_file_path = "#{Constants.build_dir}#{openshift3_image}"
-            build_cmd = %{
-echo "Building #{docker_image_name} image"
-pushd #{docker_file_path}
-  docker build --rm #{@options[:force] ? "--no-cache" : ""} -t #{docker_image_name} .
-popd
-            }
-            if @options[:force]
-              sudo(env[:machine], build_cmd, { :timeout => 60*20, :verbose => false })
-            else
-              sudo(env[:machine], sync_bash_command(openshift3_image, build_cmd), { :timeout => 60*20, :verbose => false })
-            end
-          end
-          @app.call(env)
-        end
-
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/build_openshift3_infrastructure_images.rb

@@ -1,50 +0,0 @@
-#--
-# Copyright 2014 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class BuildOpenshift3InfrastructureImages
-        include CommandHelper
-
-        def initialize(app, env, options)
-          @app = app
-          @env = env
-          @options = options
-        end
-
-        def call(env)
-          # FIXME: Measure what would be the appropriate timeout here as the
-          #        docker build command can take quite a long time...
-          #
-          @options[:openshift3_infrastructure_images].each do |openshift3_image, _|
-            docker_image_name = "openshift/#{openshift3_image}"
-            docker_file_path = "#{Constants.build_dir}#{Vagrant::Openshift::Constants.openshift3_infrastructure_images[openshift3_image]}"
-            build_cmd = %{
-echo "Building #{docker_image_name} image"
-pushd #{docker_file_path}
-  docker build --rm #{@options[:force] ? "--no-cache" : ""} -t #{docker_image_name} .
-popd
-            }
-            sudo(env[:machine], build_cmd, { :timeout => 60*20, :verbose => false })
-          end
-          @app.call(env)
-        end
-
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/checkout_openshift2_tests.rb

@@ -1,57 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class CheckoutOpenshift2Tests
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
-          sudo env[:machine], "cd #{Constants.build_dir}/builder; #{scl_wrapper(is_fedora,'rake checkout_tests')}"
-
-          sudo env[:machine], "mkdir -p /var/www/html/binaryartifacts"
-          sudo env[:machine], "restorecon /var/www/html/binaryartifacts"
-
-          remote_write(env[:machine], "/etc/httpd/conf.d/binaryartifacts.conf", "root:root", "0644") {
-            %{#
-# This configuration is to host the binary artifacts for use during testing.
-# Currently the apache only hosts on https and with a cert that is not signed
-# so curl requires -k.  To get around this in testing just host it over non-ssl
-# and test test copies the tgz file to the /var/www/html/binaryartifacts folder.
-#
-
-Listen 81
-
-<VirtualHost *:81>
-  ServerName localhost
-  ServerAdmin root@localhost
-  DocumentRoot /var/www/html/binaryartifacts
-</VirtualHost>}}
-          sudo env[:machine], "restorecon -v /etc/httpd/conf.d/binaryartifacts.conf"
-          sudo env[:machine], "service httpd restart"
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/create_openshift2_puppet_file.rb

@@ -1,84 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class CreateOpenshift2PuppetFile
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          hostname = env[:machine].config.vm.hostname
-          domain = env[:machine].config.openshift.cloud_domain
-          key,_ = sudo(env[:machine], "cat /var/named/K#{domain}.*.key")
-          key = key.first.strip.split(' ')
-          key = "#{key[6]}#{key[7]}"
-
-          links,_ = sudo(env[:machine], "ip link")
-          links = links.map!{ |l| l.split("\n") }.flatten
-
-          links.map! do |link|
-            m = link.match(/[0-9]+: ([a-z0-9]+):/)
-            m.nil?? "lo" : m[1]
-          end
-          links.delete "lo"
-
-          remote_write(env[:machine], "#{Constants.build_dir}/configure_origin.pp") {
-            config = "
-class { 'openshift_origin' :
-  domain                             => '#{domain}',
-  broker_hostname                    => '#{hostname}',
-  node_hostname                      => '#{hostname}',
-  nameserver_hostname                => '#{hostname}',
-  datastore_hostname                 => '#{hostname}',
-  msgserver_hostname                 => '#{hostname}',
-  openshift_user1                    => 'admin',
-  openshift_password1                => 'admin',
-  bind_key                           => '#{key}',
-  override_install_repo              => 'file://#{Constants.build_dir}/origin-rpms',
-  development_mode                   => true,
-  conf_node_external_eth_dev         => '#{links.first}',
-  register_host_with_nameserver      => true,
-  broker_auth_plugin                 => 'htpasswd',
-  conf_broker_auth_salt              => 'salt salt salt',
-  conf_broker_multi_haproxy_per_node => true,
-  conf_valid_gear_sizes              => ['small','medium'],
-  node_frontend_plugins              => ['apache-mod-rewrite','nodejs-websocket','haproxy-sni-proxy'],
-  node_unmanaged_users               => ['#{env[:machine].ssh_info[:username]}'],
-  node_container_plugin              => '#{env[:machine].config.openshift.container}',"
-            env[:machine].config.openshift.advanced_puppet_values.each do |k,v|
-              config += %{  #{k} => '#{v}',\n}
-            end
-            config += "\n  repos_base => '#{env[:machine].config.openshift.repos_base}'," unless env[:machine].config.openshift.repos_base.nil?
-            config += "\n  os_repo => '#{env[:machine].config.openshift.os_repo}'," unless env[:machine].config.openshift.os_repo.nil?
-            config += "\n  os_updates_repo => '#{env[:machine].config.openshift.os_updates_repo}'," unless env[:machine].config.openshift.os_updates_repo.nil?
-            config += "\n  jenkins_repo_base => '#{env[:machine].config.openshift.jenkins_repo_base }'," unless env[:machine].config.openshift.jenkins_repo_base.nil?
-            config += "\n  optional_repo => '#{env[:machine].config.openshift.optional_repo}'," unless env[:machine].config.openshift.optional_repo.nil?
-            config += "\n}\n"
-            config
-          }
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end