vagrant-openshift 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06bbe8d087c19e8ec7af5e2c15ca9495f07f46d5
-  data.tar.gz: 7e7d2e3742731456fdcbbf85b347f2395ae0e12e
+  metadata.gz: 80ee00f5ae807ab4d43099a4149aba767a24af57
+  data.tar.gz: f3d4576d80700025f1cb85ef64abefba02d58670
 SHA512:
-  metadata.gz: 915e4260baa7ad853983df08219bb18036f5377b0e4efc658601d3a8edc8722c17700ca5316dc5e08a265bf5d05f1ae140825752c67926aeede01bd8fa57b52d
-  data.tar.gz: dafc1a2eb27802cce734dadaed9fe9b2cb327306165aea57bb6e27aba1ba6be8838b1ff5db75db9cfab57570afd8d355a8c89c666334d24ae1bbe32e0a316c2a
+  metadata.gz: 1441657e3ee502608b67b01e9a5cd6d92cbe97186857edb79f0151f5ab59ee12c616b33939e1764831ab0c62c36fa74cd2633304825a1d8bda63080e501f3d95
+  data.tar.gz: 4fd81093a3134cfb35c5632b8702942bb357edad6efaf076d6686d17c876edffd742ac63054249d57070fd69e6b702cec71409bf2c41cdb3c7fcd9add1d1c132

data/README.asciidoc

@@ -14,7 +14,7 @@ NOTE: Instructions below generally assume a Linux-like command line and may requ
   or link:https://github.com/tknerr/vagrant-managed-servers[managed] providers.
 * Provides commands to install build dependencies, sync repositories, and run tests
 
-===== Using with Openshift v2
+===== Using with OpenShift v2
 
 v2 (aka M4) is no longer supported on the master branch or in the
 published rubygems.org version of this plugin.  You must checkout the
@@ -51,7 +51,7 @@ Install the published version of this plugin:
 $ vagrant plugin install vagrant-openshift
 ----
 
-=== Getting started with Openshift v3
+=== Getting started with OpenShift v3
 
 This plugin works in concert with the
 link:https://github.com/openshift/origin/blob/master/Vagrantfile[OpenShift Origin Vagrantfile]
@@ -228,14 +228,13 @@ OSTenant=<OpenStack Tenant Name>
 ----
 
 * Edit `.vagrant-openshift.json` and update the openstack provider
-  section. You'll need to indicate at least the base image and host flavor
+  section. You'll need to indicate at least the base image
   you'd like to start, as well as the user to access with.
 
 .'.vagrant-openshift.json'
 ----
   "openstack": {
     "image": "Fedora-Cloud-Base-20141203-21.x86_64",
-    "flavor": "m1.small",
     "ssh_user": "fedora"
   }
 ----
@@ -397,7 +396,7 @@ these stages, as the rate of change and amount of time to create each
 is different.
 
 After using `vagrant up --provider=<provider>` to start a host with only
-a basic operating system on it (Fedora 20+ or CentOS 7 should suffice),
+a basic operating system on it (Fedora 21+ or CentOS 7 should suffice),
 you will need to install the build tools and other dependencies for
 building and running OpenShift. The following vagrant commands should
 help with this:

data/lib/vagrant-openshift/action.rb

@@ -201,7 +201,6 @@ module Vagrant
       autoload :CloneUpstreamRepositories, action_root.join("clone_upstream_repositories")
       autoload :CreateYumRepositories, action_root.join("create_yum_repositories")
       autoload :CheckoutRepositories, action_root.join("checkout_repositories")
-      autoload :SetupBindDnsKey, action_root.join("setup_bind_dns_key")
       autoload :SetHostName, action_root.join("set_host_name")
       autoload :YumUpdate, action_root.join("yum_update")
       autoload :InstallOpenshiftBaseDependencies, action_root.join("install_openshift_base_dependencies")
@@ -228,7 +227,6 @@ module Vagrant
       autoload :DownloadArtifactsSti, action_root.join("download_artifacts_sti")
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
-      autoload :SetupBindHost, action_root.join("setup_bind_host")
       autoload :RunSystemctl, action_root.join("run_systemctl")
     end
   end

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

@@ -31,6 +31,7 @@ module Vagrant
         def call(env)
           os      = @options[:os].to_sym
           stage   = @options[:stage].to_sym
+          instance_type   = @options[:instance_type].to_sym
           inst_ts = Time.now.getutc.strftime('%Y%m%d_%H%M')
 
           box_info_path = Pathname.new(File.expand_path("#{__FILE__}/../../templates/command/init-openshift/box_info.yaml"))
@@ -66,7 +67,8 @@ module Vagrant
             'num_minions' => 2,
             'cpus' => 2,
             'memory' => 2048,
-            'rebuild_yum_cache' => false
+            'rebuild_yum_cache' => false,
+            'instance_type' => instance_type
           }
 
           vagrant_openshift_config['no_synced_folders'] = @options[:no_synced_folders]
@@ -96,7 +98,6 @@ module Vagrant
           } if box_info[:aws]
           vagrant_openshift_config['openstack'] = {
             'image' => box_info[:openstack][:image],
-            'flavor' => box_info[:openstack][:flavor],
             'ssh_user' => box_info[:openstack][:ssh_user]
           } if box_info[:openstack]
 

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

@@ -85,6 +85,8 @@ else
   GOPATH=/data go get code.google.com/p/go.tools/cmd/cover
 fi
 
+GOPATH=/data go get golang.org/x/tools/cmd/vet
+
 chown -R #{ssh_user}:#{ssh_user} /data
 
 systemctl daemon-reload

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

@@ -44,23 +44,65 @@ pushd /data/src/github/openshift/#{image_name}
 git checkout #{git_ref}
 git_ref=$(git rev-parse --short HEAD)
 echo "Pushing image #{image_name}:$git_ref..."
+
 docker tag -f #{image_name}-centos7 #{registry}#{image_name}-centos7:$git_ref
 docker tag -f #{image_name}-centos7 #{registry}#{image_name}-centos7:latest
 docker tag -f #{image_name}-centos7 docker.io/#{image_name}-centos7:latest
 docker tag -f #{image_name}-rhel7 #{registry}#{image_name}-rhel7:$git_ref
 docker tag -f #{image_name}-rhel7 #{registry}#{image_name}-rhel7:latest
-# FIXME: Paralelize this
-docker push -f #{registry}#{image_name}-centos7:$git_ref
-docker push -f #{registry}#{image_name}-centos7:latest
-docker push -f docker.io/#{image_name}-centos7:latest
-docker push -f #{registry}#{image_name}-rhel7:$git_ref
-docker push -f #{registry}#{image_name}-rhel7:latest
+
+#docker push -f #{registry}#{image_name}-centos7:$git_ref
+#docker push -f docker.io/#{image_name}-centos7:latest
+#docker push -f #{registry}#{image_name}-rhel7:$git_ref
+#docker push -f #{registry}#{image_name}-centos7:latest
+#docker push -f #{registry}#{image_name}-rhel7:latest
+
+# We can't fully parallelize this because docker fails when you push to the same repo at the
+# same time (using different tags), so we do two groups of push operations.
+procs[0]="docker push -f #{registry}#{image_name}-centos7:$git_ref"
+procs[1]="docker push -f docker.io/#{image_name}-centos7:latest"
+procs[2]="docker push -f #{registry}#{image_name}-rhel7:$git_ref"
+
+# Run pushes in parallel
+for i in {0..2}; do
+  echo "pushing ${procs[${i}]}" 
+  ${procs[${i}]} & 
+  pids[${i}]=$!
+  echo "push ${procs[${i}]} is pid ${pids[${i}]}" 
+done 
+
+# Wait for all pushes.  "wait" will check the return code of each process also.
+for pid in ${pids[*]}; do
+  echo "checking $pid" 
+  wait $pid 
+done
+
+procs[0]="docker push -f #{registry}#{image_name}-centos7:latest"
+procs[1]="docker push -f #{registry}#{image_name}-rhel7:latest"
+
+# Run pushes in parallel
+for i in {0..1}; do 
+  ${procs[${i}]} & 
+  pids[${i}]=$!
+done 
+
+# Wait for all pushes.  "wait" will check the return code of each process also.
+for pid in ${pids[*]}; do
+  wait $pid 
+done
+
 popd
 set +e
           }
         end
 
-        def build_image(image_name, git_ref, repo_url, registry)
+# Note that this only invokes "make test" on the image, if the tests
+# succeed the candidate produced by "make test" will be pushed.  There
+# is an implicit assumption here that the image produced by make test
+# is identical to what would be produced by a subsequent "make build" 
+# call, so there's no point in explicitly calling "make build" after
+# "make test"
+        def build_image(image_name, version, git_ref, repo_url)
           %{
 dest_dir="/data/src/github/openshift/#{image_name}"
 rm -rf ${dest_dir}; mkdir -p ${dest_dir}
@@ -70,11 +112,9 @@ git init && git remote add -t master origin #{repo_url}
 git fetch && git checkout #{git_ref}
 git_ref=$(git rev-parse --short HEAD)
 echo "Building and testing #{image_name}-centos7:$git_ref ..."
-make test TARGET=centos7
-make build TARGET=centos7
+make test TARGET=centos7 VERSION=#{version} TAG_ON_SUCCESS=true
 echo "Building and testing #{image_name}-rhel7:$git_ref ..."
-make test TARGET=rhel7
-make build TARGET=rhel7
+make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
 popd
 set +e
           }
@@ -108,9 +148,9 @@ set -x
 set +e
 echo "Pre-pulling base images ..."
 docker pull #{@options[:registry]}openshift/base-centos7
-[[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-centos7 openshift/base-centos7
+[[ "$?" == "0" ]] && docker tag -f #{@options[:registry]}openshift/base-centos7 openshift/base-centos7
 docker pull #{@options[:registry]}openshift/base-rhel7
-[[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-rhel7 openshift/base-rhel7
+[[ "$?" == "0" ]] && docker tag -f #{@options[:registry]}openshift/base-rhel7 openshift/base-rhel7
           }
 
           cmd += %{
@@ -121,20 +161,20 @@ PATH=/data/src/github.com/openshift/source-to-image/_output/go/bin:/data/src/git
           # FIXME: We always need to make sure we have the latest base image
           # FIXME: This is because the internal registry is pruned once per month
           if !@options[:build_images].include?("openshift/base")
-            @options[:build_images] = "openshift/base:master,#{@options[:build_images]}"
+            @options[:build_images] = "openshift/base:1:master,#{@options[:build_images]}"
           end
 
           build_images = @options[:build_images].split(",").map { |i| i.strip }
 
           push_cmd = ""
           build_images.each do |image|
-            name, git_ref = image.split(':')
+            name, version, git_ref = image.split(':')
             repo_url = Vagrant::Openshift::Constants.openshift_images[name]
             if repo_url == nil
               puts "Unregistered image: #{name}, skipping"
               next
             end
-            cmd += build_image(name, git_ref, repo_url, @options[:registry])
+            cmd += build_image(name, version, git_ref, repo_url)
             push_cmd += push_image(name, git_ref, @options[:registry])
           end
 

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

@@ -92,6 +92,12 @@ popd >/dev/null
           cmd = cmd_env.join(' ') + ' ' + build_targets.join(' ')
           env[:test_exit_code] = run_tests(env, [cmd], true)
 
+          if env[:test_exit_code] == 0 && @options[:extended_test_packages].length > 0
+            extended_cmd = 'hack/test-extended.sh ' + Shellwords.escape(@options[:extended_test_packages])
+            env[:test_exit_code] = run_tests(env, [extended_cmd], true)
+          end
+
+
           # any other tests that should not be run as sudo
           if env[:test_exit_code] == 0 && @options[:all]
             cmds = ['hack/test-assets.sh']

data/lib/vagrant-openshift/command/openshift_init.rb

@@ -30,6 +30,7 @@ module Vagrant
             :no_base  => false,
             :os       => 'centos7',
             :stage    => 'inst',
+            :instance_type => 'c3.large',
             :port_mappings => [],
             :no_synced_folders => false,
             :no_insert_key => false
@@ -61,6 +62,10 @@ module Vagrant
             o.on('--no-insert-key', 'Insert a secure ssh key on vagrant up') do |f|
               options[:no_insert_key] = true
             end
+
+            o.on('--instance-type', "--instance-type [type]", String, "Specify what type of instance to launch") do |f|
+              options[:instance_type] = f
+            end
           end
 
           # Parse the options

data/lib/vagrant-openshift/command/push_openshift_images.rb

@@ -35,7 +35,7 @@ module Vagrant
             o.on("--registry [url]", String, "Docker Registry to push images to.") do |c|
               options[:registry] = c
             end
-            o.on("--build_images [list]", String, "List of IMAGE:REF pairs, delimited by ','") do |i|
+            o.on("--build_images [list]", String, "List of IMAGE:VERSION:REF pairs, delimited by ','") do |i|
               options[:build_images] = i
             end
             o.separator ""

data/lib/vagrant-openshift/command/test_openshift.rb

@@ -29,6 +29,7 @@ module Vagrant
           options = {}
           options[:download] = false
           options[:all] = false
+          options[:extended_test_packages] = ""
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant test-openshift [machine-name]"
@@ -38,6 +39,10 @@ module Vagrant
               options[:all] = true
             end
 
+            o.on("-e", "--extended TEST_BUCKETS", String, "Comma delimited list of extended test packages to run") do |f|
+              options[:extended_test_packages] = f
+            end
+
             o.on("-d","--artifacts", String, "Download logs") do |f|
               options[:download] = true
             end

data/lib/vagrant-openshift/config.rb

@@ -17,20 +17,14 @@
 module Vagrant
   module Openshift
     class Config < Vagrant.plugin(2, :config)
-      attr_accessor :cloud_domain
 
       def initialize
         super
-
-        @cloud_domain         = UNSET_VALUE
       end
 
       def finalize!
         super
-
-        @cloud_domain    = "example.com"  if @cloud_domain    == UNSET_VALUE
       end
     end
   end
-end
-
+end

data/lib/vagrant-openshift/constants.rb

@@ -33,14 +33,22 @@ module Vagrant
       def self.openshift_images
         {
           'openshift/base'          => 'https://github.com/openshift/sti-base.git',
+          'openshift/jenkins-16'    => 'https://github.com/openshift/jenkins.git',
           'openshift/nodejs-010'    => 'https://github.com/openshift/sti-nodejs.git',
+          'openshift/openldap-2441' => 'https://github.com/openshift/openldap.git',
           'openshift/perl-516'      => 'https://github.com/openshift/sti-perl.git',
+          'openshift/perl-520'      => 'https://github.com/openshift/sti-perl.git',
           'openshift/php-55'        => 'https://github.com/openshift/sti-php.git',
+          'openshift/python-27'     => 'https://github.com/openshift/sti-python.git',
           'openshift/python-33'     => 'https://github.com/openshift/sti-python.git',
+          'openshift/python-34'     => 'https://github.com/openshift/sti-python.git',
           'openshift/ruby-20'       => 'https://github.com/openshift/sti-ruby.git',
+          'openshift/ruby-22'       => 'https://github.com/openshift/sti-ruby.git',
           'openshift/mysql-55'      => 'https://github.com/openshift/mysql.git',
+          'openshift/mysql-56'      => 'https://github.com/openshift/mysql.git',
           'openshift/mongodb-24'    => 'https://github.com/openshift/mongodb.git',
-          'openshift/postgresql-92' => 'https://github.com/openshift/postgresql.git'
+          'openshift/postgresql-92' => 'https://github.com/openshift/postgresql.git',
+          'openshift/wildfly-81'     => 'https://github.com/openshift/sti-wildfly.git'
         }
       end
 

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

@@ -16,7 +16,6 @@
       :ami_tag_prefix: openshift-centos7_
     :openstack:
       :image: <CentOS 7>
-      :flavor: m1.small
       :ssh_user: centos
   :deps:
     :virtualbox:
@@ -34,7 +33,6 @@
       :ami_tag_prefix: devenv-centos7-base_
     :openstack:
       :image: <CentOS 7>
-      :flavor: m1.small
       :ssh_user: centos
   :inst:
     :virtualbox:
@@ -52,7 +50,6 @@
       :ami_tag_prefix: devenv-centos7_
     :openstack:
       :image: <CentOS 7>
-      :flavor: m1.small
       :ssh_user: centos
   :bootstrap:
     :virtualbox:
@@ -82,7 +79,6 @@
       :ami_tag_prefix: openshift-fedora_
     :openstack:
       :image: <Fedora>
-      :flavor: m1.small
       :ssh_user: fedora
     :libvirt:
       :box_name: fedora_base
@@ -100,7 +96,6 @@
       :ami_tag_prefix: devenv-fedora-base_
     :openstack:
       :image: <Fedora>
-      :flavor: m1.small
       :ssh_user: fedora
     :libvirt:
       :box_name: fedora_deps
@@ -118,7 +113,6 @@
       :ami_tag_prefix: devenv-fedora_
     :openstack:
       :image: <Fedora>
-      :flavor: m1.small
       :ssh_user: fedora
     :libvirt:
       :box_name: fedora_inst
@@ -148,7 +142,6 @@
       :ami_tag_prefix: openshift-rhel7_
     :openstack:
       :image: <RHEL 7>
-      :flavor: m1.small
       :ssh_user: root
   :deps:
     :aws:
@@ -160,7 +153,6 @@
       :ami_tag_prefix: devenv-rhel7-base_
     :openstack:
       :image: <RHEL 7>
-      :flavor: m1.small
       :ssh_user: root
   :inst:
     :aws:
@@ -172,7 +164,6 @@
       :ami_tag_prefix: devenv-rhel7_
     :openstack:
       :image: <RHEL 7>
-      :flavor: m1.small
       :ssh_user: root
   :bootstrap:
     :aws:
@@ -184,5 +175,4 @@
       :ami_tag_prefix: devenv-rhel7-bootstrap_
     :openstack:
       :image: <RHEL 7>
-      :flavor: m1.small
       :ssh_user: root

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.3"
+    VERSION = "2.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,8 +150,6 @@ files:
 - lib/vagrant-openshift/action/run_sti_tests.rb
 - lib/vagrant-openshift/action/run_systemctl.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/sync_local_repository.rb
 - lib/vagrant-openshift/action/sync_upstream_repository.rb
 - lib/vagrant-openshift/action/test_exit_code.rb
@@ -207,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to manage OpenShift Origin environments

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

@@ -1,38 +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 SetupBindDnsKey
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          domain = env[:machine].config.openshift.cloud_domain
-
-          sudo(env[:machine], "rm -rf /var/named/K*.*.*")
-          sudo(env[:machine], "/usr/sbin/dnssec-keygen -a HMAC-MD5 -b 512 -n USER -r /dev/urandom -K /var/named #{domain}")
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,141 +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 SetupBindHost
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          domain = env[:machine].config.openshift.cloud_domain
-          sudo(env[:machine], %{
-yum install -y bind bind-utils
-NAMESERVERS=$(cat /etc/resolv.conf | grep -w nameserver | cut -d' ' -f 2 )
-FORWARDERS=$(echo $NAMESERVERS | sed 's/ /; /g')
-pushd /var/named
-  rm -rf K*.*.*
-  /usr/sbin/dnssec-keygen -a HMAC-MD5 -b 512 -n USER -r /dev/urandom -K /var/named #{domain}
-  KEYSTRING=$(grep Key: K#{domain}.*.private | cut -d' ' -f 2)
-  echo 'forwarders { '$FORWARDERS'; };' > forwarders.conf
-  echo $'key #{domain} {\n algorithm HMAC-MD5;\n secret "'$KEYSTRING$'";\n};' > #{domain}.key
-  cat <<EOF> #{domain}.zones
-zone "#{domain}" IN {
-  type master;
-  file "dynamic/#{domain}.db";
-  allow-update { key #{domain}; };
-};
-EOF
-  touch dynamic/#{domain}.db
-  cat <<EOF> dynamic/#{domain}.db
-\\$ORIGIN .
-\\$TTL 1  ; 1 seconds (for testing only)
-#{domain} IN SOA  ns1.#{domain}. hostmaster.#{domain}. (
-        2011112904 ; serial
-        60         ; refresh (1 minute)
-        15         ; retry (15 seconds)
-        1800       ; expire (30 minutes)
-        10         ; minimum (10 seconds)
-        )
-      NS  ns1.#{domain}.
-      MX  10 mail.#{domain}.
-\\$ORIGIN #{domain}.
-mail      A 127.0.0.1
-master      A 192.168.1.1
-ns1     A 127.0.0.1
-node                    A       192.168.1.10
-; test records
-testns1     TXT "reserved namespace testns1"
-;testns2    TXT "to be added by tests"
-testns3                 TXT     "reserved to add apps"
-testns4                 TXT     "reserved to delete apps"
-testapp4-testns4        CNAME   node.#{domain}.com.
-EOF
-popd
-pushd /etc/
-mv named.conf named.conf.old
-cat <<EOF> named.conf
-options {
-  listen-on port 53 { 127.0.0.1; 172.17.42.1; };
-  listen-on-v6 port 53 { ::1; };
-  directory   "/var/named";
-  dump-file   "/var/named/data/cache_dump.db";
-  statistics-file "/var/named/data/named_stats.txt";
-  memstatistics-file "/var/named/data/named_mem_stats.txt";
-  allow-query     { any; };
-  recursion yes;
-  dnssec-enable yes;
-  dnssec-validation no;
-  dnssec-lookaside auto;
-  bindkeys-file "/etc/named.iscdlv.key";
-  managed-keys-directory "/var/named/dynamic";
-  pid-file "/run/named/named.pid";
-  session-keyfile "/run/named/session.key";
-  forward only;
-  include "forwarders.conf";
-};
-logging {
-        channel default_debug {
-                file "data/named.run";
-                severity dynamic;
-        };
-};
-include "/etc/named.rfc1912.zones";
-include "/etc/named.root.key";
-include "/var/named/#{domain}.zones";
-include "#{domain}.key";
-EOF
-if ! cat /etc/dhcp/dhclient.conf | grep 'prepend domain-name-servers 172.17.42.1;' 2>&1 > /dev/null ; then
-  echo "$(cat /etc/dhcp/dhclient.conf)\nprepend domain-name-servers 172.17.42.1;" > /etc/dhcp/dhclient.conf;
-fi
-systemctl enable named
-systemctl restart named
-service network restart
-systemctl restart docker
-BIND_CONF=#{Vagrant::Openshift::Constants.plugins_conf_dir}/dns/bind/conf
-mkdir -p $BIND_CONF
-pushd $BIND_CONF
-cat <<EOF> openshift-origin-dns-bind.conf
-# Settings related to the bind variant of an OpenShift DNS plugin
-
-# The DNS server
-BIND_SERVER="172.17.42.1"
-
-# The DNS server's port
-BIND_PORT=53
-
-# The key name for your zone
-BIND_KEYNAME="#{domain}"
-
-# base64-encoded key, most likely from /var/named/example.com.key.
-BIND_KEYVALUE="$KEYSTRING"
-
-# The base zone for the DNS server
-BIND_ZONE="#{domain}"
-EOF
-popd
-            })
-          @app.call(env)
-        end
-      end
-    end
-  end
-end