vagrant-openshift 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99424d02a9d9cf48ecfe8b86623f866c41f67ae
-  data.tar.gz: a9394c7c854bd35e0a2b0b75486fa842469cdbff
+  metadata.gz: b3de362d4afaa7efa6b650d3afe95d5dc8fc1677
+  data.tar.gz: 7670a84d828f1971c5f5bef2f3cd26cf2d90a892
 SHA512:
-  metadata.gz: 586312d43c42cb95f7464e97ba75d9eb56638784038cbb8d7810fb837a145186e3119218e518977e2c3e31ab0b9f8caf13b489935c31c58e65c52587052f6b48
-  data.tar.gz: d5b882400527319a834c92ab70f9231e2fa643e198898dd6e5744758b2a14dbecf8e5e05c92b8178d89329d33d43de97321c9bb8e3de218bf095eee2200966d8
+  metadata.gz: 470481770849a482baeda76f06ce3a7d9910e63d2d0030193e8b66a9467c93e468f1f60f7cbd0c71f80690321852b9223f891f93521229666b0e908e59911370
+  data.tar.gz: 9b31993e2257e17083ca08ca8c56ebb19bc7227e7b4ed5022379b2431a1703e81a26db9b53087a35984dbc03ffc87b67603a49821a9f0c5015652d83e3de2365

data/.gitignore

@@ -22,3 +22,4 @@ test/origin-server
 test/puppet-openshift_origin
 test/rhc
 tmp
+vendor

data/README.asciidoc

@@ -43,7 +43,7 @@ $ echo "export GOPATH=~/code" >> ~/.bash_profile   # ~/code can be any dir
 $ source ~/.bash_profile
 $ cd $GOPATH
 $ vagrant openshift3-local-checkout -u <github username>
-$ cd github.com/src/openshift/origin
+$ cd src/github.com/openshift/origin
 ----
 
 
@@ -91,6 +91,8 @@ $ vagrant test-openshift3 --all
 
 === Getting started with Openshift v2
 
+Note: v2 (aka M4) is not longer supported on the master branch or in the published rubygems.org version of this plugin.  You must checkout the v2 branch of this repository in order to use the plugin with v2.
+
 ==== Clone the OpenShift Origin repositories
 
 [source, sh]
@@ -327,11 +329,11 @@ on the vagrant VM.
 === AWS Credentials
 
 Rather than have to add AWS credentials every time the Vagrantfile is created using origin-init command, you can
-specify your credentials in the '~/.awscreds' file and it will be automatically added to the Vagrantfile.
+specify your credentials in the '~/.awscred' file and it will be automatically added to the Vagrantfile.
 
 Example:
 
-.'~/.awscreds'
+.'~/.awscred'
 ----
 AWSAccessKeyId=<AWS API Key>
 AWSSecretKey=<AWS API Secret>

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

@@ -20,25 +20,50 @@ module Vagrant
       class BuildOpenshift3
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options)
           @app = app
           @env = env
+          @options = options
         end
 
         def call(env)
-          do_execute(env[:machine], sync_bash_command('origin', %{
+          if @options[:images]
+            cmd = %{
+echo "Performing openshift release build..."
+set -e
+hack/verify-gofmt.sh
+hack/build-release.sh
+hack/build-images.sh
+if [ ! -d _output/etcd ]
+then
+  hack/install-etcd.sh
+fi
+}
+          else
+            cmd = %{
 echo "Performing openshift build..."
 set -e
+hack/verify-gofmt.sh
 hack/build-go.sh
 if [ ! -d _output/etcd ]
 then
   hack/install-etcd.sh
 fi
-}))
-
+}
+          end
+          if @options[:force]
+            build_cmd = cmd
+            cmd = %{
+pushd /data/src/github.com/openshift/origin
+#{build_cmd}
+popd
+}
+          else
+            cmd = sync_bash_command('origin', cmd)
+          end
+          do_execute(env[:machine], cmd) 
           @app.call(env)
         end
-
       end
     end
   end

data/lib/vagrant-openshift/action/{install_rhc.rb → build_openshift3_base_images.rb}

@@ -17,26 +17,28 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallRhc
+      class BuildOpenshift3BaseImages
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options)
           @app = app
           @env = env
+          @options = options
         end
 
         def call(env)
-          do_execute(env[:machine], sync_bash_command('rhc', %{
-echo "Build and install rhc from local source"
-gem uninstall rhc -x -q
-rm -f rhc-*.gem
-gem build rhc.gemspec
-gem install $(find ./ -name 'rhc-*.gem')
-rm -f rhc-*.gem
-          }))
+          do_execute(env[:machine], %{
+echo "Building base images..."
+set -e
+pushd /data/src/github.com/openshift/origin
+  hack/build-base-images.sh
+popd
+},
+            { :timeout => 60*20, :verbose => false })
           @app.call(env)
         end
+
       end
     end
   end
-end
+end

data/lib/vagrant-openshift/action/{run_openshift2_tests.rb → build_sti.rb}

@@ -17,28 +17,45 @@
 module Vagrant
   module Openshift
     module Action
-      class RunOpenshift2Tests
+      class BuildSti
         include CommandHelper
 
-        @@SSH_TIMEOUT = 4800
-
         def initialize(app, env, options)
           @app = app
           @env = env
-          @options = options.clone
+          @options = options
         end
 
         def call(env)
-          is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
-          @options.delete :logs
+          if @options[:binary_only]
+
+            cmd = %{
+echo "Performing source-to-image build..."
+set -e
+hack/build-go.sh
+}
+          else
 
-          cmd_opts = ''
-          @options.each do |k,v|
-            cmd_opts += "#{k}=#{v} "
+            cmd = %{
+echo "Performing source-to-image build..."
+set -e
+hack/verify-gofmt.sh
+hack/build-go.sh
+hack/build-test-images.sh
+}
           end
-          cmd = "cd #{Constants.build_dir + 'builder'}; #{scl_wrapper(is_fedora,'rake run_tests ' + cmd_opts)} "
-          _,_,env[:test_exit_code] = sudo(env[:machine], cmd, {timeout: 0, fail_on_error: false})
 
+          if @options[:force]
+            build_cmd = cmd
+            cmd = %{
+pushd /data/src/github.com/openshift/source-to-image
+#{build_cmd}
+popd
+}
+          else
+            cmd = sync_bash_command('source-to-image', cmd)
+          end
+          do_execute(env[:machine], cmd)
           @app.call(env)
         end
       end

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

@@ -38,12 +38,9 @@ module Vagrant
           end
           do_execute env[:machine], git_clone_commands
 
-          sudo env[:machine], "rm -rf /etc/yum.repos.d/openshift-origin.repo"
-          sudo env[:machine], "rm -rf /var/cache/yum/x86_64/19/openshift-origin" #clear OpenShift package cache
-          sudo env[:machine], "rm -f /etc/openshift/.mongo-setup-complete"
           @app.call(env)
         end
       end
     end
   end
-end
+end

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

@@ -28,7 +28,7 @@ module Vagrant
         def call(env)
           is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
 
-          if !is_fedora
+          unless is_fedora
             if env[:machine].communicate.test("test -e /etc/udev/rules.d/70-persistent-net.rules")
               remote_write(env[:machine], "/etc/udev/rules.d/70-persistent-net.rules") do
 %{# This file was automatically generated by the /lib/udev/write_net_rules

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

@@ -36,7 +36,10 @@ module Vagrant
           download_map = {
             "/var/log/yum.log"                     => artifacts_dir + "yum.log",
             "/var/log/secure"                      => artifacts_dir + "secure",
-            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log"
+            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log",
+            "/tmp/origin/e2e/"                     => artifacts_dir + "e2e/",
+
+            "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
           }
 
           download_map.each do |source,target|

data/lib/vagrant-openshift/action/{download_artifacts_openshift2.rb → download_artifacts_sti.rb}

@@ -18,7 +18,7 @@ require 'pathname'
 module Vagrant
   module Openshift
     module Action
-      class DownloadArtifactsOpenshift2
+      class DownloadArtifactsSti
         include CommandHelper
 
         def initialize(app, env)
@@ -28,23 +28,15 @@ module Vagrant
 
         def call(env)
           machine = @env[:machine]
-          machine.ui.info "Downloading logs and rpms"
+          machine.ui.info "Downloading logs"
           ssh_info = machine.ssh_info
           private_key_path = ssh_info[:private_key_path].kind_of?(Array) ? ssh_info[:private_key_path][0] : ssh_info[:private_key_path]
 
           artifacts_dir = Pathname.new(File.expand_path(machine.env.root_path + "artifacts"))
           download_map = {
-            "/tmp/rhc/"                            => artifacts_dir + "test_runs/",
-            "/var/log/openshift/"                  => artifacts_dir + "openshift_logs/",
-            "/var/log/httpd/"                      => artifacts_dir + "node_httpd_logs/",
             "/var/log/yum.log"                     => artifacts_dir + "yum.log",
-            "/var/log/messages"                    => artifacts_dir + "messages",
             "/var/log/secure"                      => artifacts_dir + "secure",
-            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log",
-            #"/tmp/rhc/*_coverage"                  => artifacts_dir + "coverage/",
-            "/var/log/mcollective.*"               => artifacts_dir + "mcollective/",
-            "#{Constants.build_dir}/origin-rpms/"  => artifacts_dir + "rpms/",
-            "#{Constants.build_dir}/origin-srpms/" => artifacts_dir + "srpms/"
+            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log"
           }
 
           download_map.each do |source,target|

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

@@ -33,14 +33,13 @@ module Vagrant
           stage   = @options[:stage].to_sym
           inst_ts = Time.now.getutc.strftime('%Y%m%d_%H%M')
 
-          template_path = Pathname.new(File.expand_path("#{__FILE__}/../../templates/command/init-openshift/Vagrantfile.erb"))
           box_info_path = Pathname.new(File.expand_path("#{__FILE__}/../../templates/command/init-openshift/box_info.yaml"))
 
           box_info_data = YAML.load(File.new(box_info_path))
           box_info = box_info_data[os][stage]
           box_info[:instance_name] = @options[:name].nil? ? 'openshift_origin_' + inst_ts : @options[:name]
           box_info[:os] = os
-          box_info[:vagrant_guest] = [:centos6, :rhel6].include?(os) ? :redhat : os
+          box_info[:vagrant_guest] = [:centos7, :rhel7].include?(os) ? :redhat : os
           box_info[:port_mappings] = @options[:port_mappings]
 
           @openstack_creds_file = ENV['OPENSTACK_CREDS'].nil? || ENV['OPENSTACK_CREDS'] == '' ? "~/.openstackcred" : ENV['OPENSTACK_CREDS']
@@ -52,46 +51,44 @@ module Vagrant
           box_info[:aws_creds_file] = @aws_creds_file
           find_ami_from_tag(box_info)
 
-          if os == :fedora
-
-            gopath = nil
-            if ENV['GOPATH'] && !ENV['GOPATH'].empty?
-              gopath = File.expand_path(ENV['GOPATH'].split(/:/).last)
-            else
-              gopath = '.'
-            end
+          gopath = nil
+          if ENV['GOPATH'] && !ENV['GOPATH'].empty?
+            gopath = File.expand_path(ENV['GOPATH'].split(/:/).last)
+          else
+            gopath = '.'
+          end
 
-            vagrant_openshift_config = {
-              'instance_name' => box_info[:instance_name],
-              'os' => os,
-              'dev_cluster' => false,
-              'num_minions' => 2,
-              'rebuild_yum_cache' => false,
-              'sync_to' => '/data/src',
-              'sync_from' => "#{gopath}/src",
-              'virtualbox' => {
-                'box_name' => box_info[:virtualbox][:box_name],
-                'box_url' => box_info[:virtualbox][:box_url]
-              },
-              'vmware' => {
-                'box_name' => box_info[:vmware][:box_name],
-                'box_url' => box_info[:vmware][:box_url]
-              },
-              'aws' => {
-                  'ami' => box_info[:aws][:ami],
-                  'ami_region' => box_info[:aws][:ami_region],
-                  'ssh_user' => box_info[:aws][:ssh_user]
-              }
+          vagrant_openshift_config = {
+            'instance_name' => box_info[:instance_name],
+            'os' => os,
+            'dev_cluster' => false,
+            'num_minions' => 2,
+            'cpus' => 2,
+            'memory' => 1024,
+            'rebuild_yum_cache' => false,
+            'sync_to' => '/data/src',
+            'sync_from' => "#{gopath}/src",
+            'virtualbox' => {
+              'box_name' => box_info[:virtualbox][:box_name],
+              'box_url' => box_info[:virtualbox][:box_url]
+            },
+            'vmware' => {
+              'box_name' => box_info[:vmware][:box_name],
+              'box_url' => box_info[:vmware][:box_url]
+            },
+            'libvirt' => {
+              'box_name' => box_info[:libvirt][:box_name],
+              'box_url' => box_info[:libvirt][:box_url]
+            },
+            'aws' => {
+                'ami' => box_info[:aws][:ami],
+                'ami_region' => box_info[:aws][:ami_region],
+                'ssh_user' => box_info[:aws][:ssh_user]
             }
+          }
 
-            File.open(".vagrant-openshift.json","w") do |f|
-              f.write(JSON.pretty_generate(vagrant_openshift_config))
-            end
-          else
-            contents = Vagrant::Util::TemplateRenderer.render(template_path.to_s[0..-5], box_info: box_info)
-            File.open("Vagrantfile", "w+") do |f|
-              f.write(contents)
-            end
+          File.open(".vagrant-openshift.json","w") do |f|
+            f.write(JSON.pretty_generate(vagrant_openshift_config))
           end
 
           @app.call(env)
@@ -103,7 +100,8 @@ module Vagrant
           return if box_info[:aws][:ami_tag_prefix].nil?
           @env[:ui].info("Reading AWS credentials from #{@aws_creds_file.to_s}")
           if @aws_creds_file.exist?
-            aws_creds = @aws_creds_file.exist? ? Hash[*(File.open(@aws_creds_file.to_s).readlines.map{ |l| l.split('=') }.flatten.map{ |i| i.strip })] : {}
+            aws_creds = @aws_creds_file.exist? ? Hash[*(File.open(@aws_creds_file.to_s).readlines.map{ |l| l.strip!
+                                                          l.split('=') }.flatten)] : {}
 
             fog_config = {
                 :provider              => :aws,

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

@@ -28,33 +28,20 @@ module Vagrant
           ssh_user = env[:machine].ssh_info[:username]
           sudo(env[:machine], %{
 set -x
-# TODO Remove me ASAP
-sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
-setenforce 0
-usermod -a -G docker #{ssh_user}
 
 ORIGIN_PATH=/data/src/github.com/openshift/origin
-
 cat > /etc/profile.d/openshift.sh <<DELIM
 export GOPATH=/data
-export PATH=$GOPATH/bin:$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/go/bin:$PATH
-# Force using local images instead of always reaching docker hub when doing builds
-export USE_LOCAL_IMAGES=true
+export PATH=$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/local/go/bin/:$GOPATH/bin:$PATH
+export KUBERNETES_MASTER=http://localhost:8080
 DELIM
 
 source /etc/profile.d/openshift.sh
 
-go get code.google.com/p/go.tools/cmd/cover
-
 pushd $ORIGIN_PATH
   hack/install-etcd.sh
 popd
 
-# Force socket reuse
-echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
-
-chown -R #{ssh_user}:#{ssh_user} /data
-
 cat > /usr/lib/systemd/system/openshift.service <<DELIM
 [Unit]
 Description=OpenShift
@@ -65,13 +52,15 @@ Documentation=https://github.com/openshift/origin
 [Service]
 Type=simple
 EnvironmentFile=-/etc/profile.d/openshift.sh
-ExecStart=$ORIGIN_PATH/_output/go/bin/openshift start
+ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --listen=http://0.0.0.0:8080
 
 [Install]
 WantedBy=multi-user.target
 DELIM
 
 #systemctl enable openshift.service
+
+chown -R #{ssh_user}:#{ssh_user} /data
           })
 
           @app.call(env)

data/lib/vagrant-openshift/action/{build_openshift2.rb → install_openshift3_asset_dependencies.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildOpenshift2
+      class InstallOpenshift3AssetDependencies
         include CommandHelper
 
         def initialize(app, env)
@@ -26,11 +26,23 @@ module Vagrant
         end
 
         def call(env)
-          is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
-          hostname = env[:machine].config.vm.hostname
-          sudo(env[:machine],"echo #{hostname} > /proc/sys/kernel/hostname")
-          sudo(env[:machine], "cd #{Constants.build_dir + "builder"}; #{scl_wrapper(is_fedora,'rake update_packages')}", {timeout: 60*30})
+          ssh_user = env[:machine].ssh_info[:username]
+          do_execute(env[:machine], %{
 
+ORIGIN_PATH=/data/src/github.com/openshift/origin
+
+if ! which bundler > /dev/null 2>&1 ; then
+  gem install bundler
+fi
+
+if ! which npm > /dev/null 2>&1 ; then
+  sudo yum -y install npm
+fi
+
+pushd $ORIGIN_PATH
+  hack/install-assets.sh
+popd
+          }, {:timeout=>60*20})
           @app.call(env)
         end
       end

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

@@ -26,6 +26,7 @@ module Vagrant
         end
 
         def call(env)
+          ssh_user = env[:machine].ssh_info[:username]
           # FIXME: Move 'openshift/centos-mongodb' into openshift org and then
           #        add the image into 'repositories' constants
           #
@@ -34,18 +35,32 @@ module Vagrant
           # FIXME: Need to install golang packages 'after' the 'gcc' is
           #        installed. See BZ#1101508
           #
-          sudo(env[:machine], "yum install -y golang golang-pkg* golang-src")
+          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src")
           #
           sudo(env[:machine], %{
+
+set -x
+# TODO Remove me ASAP
+sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
+setenforce 0
+
+usermod -a -G docker #{ssh_user}
+
+sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.17.0/24 \\1'," /etc/sysconfig/docker
+cat /etc/sysconfig/docker
+
+# Force socket reuse
+echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
+
+mkdir /data
+GOPATH=/data go get code.google.com/p/go.tools/cmd/cover
+chown -R #{ssh_user}:#{ssh_user} /data
+
 systemctl daemon-reload
 systemctl enable docker
 systemctl start docker
 
 docker pull openshift/docker-registry
-docker pull openshift/docker-builder
-docker pull openshift/sti-builder
-
-touch #{Vagrant::Openshift::Constants.deps_marker}
           }, {:timeout=>60*20})
           @app.call(env)
         end

data/lib/vagrant-openshift/action/{local_openshift2_checkout.rb → push_openshift3_release.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013 Red Hat, Inc.
+# 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.
@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class LocalOpenshift2Checkout
+      class PushOpenshift3Release
         include CommandHelper
 
         def initialize(app, env, options)
@@ -27,20 +27,20 @@ module Vagrant
         end
 
         def call(env)
-          commands = "echo 'Waiting for the cloning process to finish'\n"
-          Constants.openshift2_repos.each do |repo, url|
-            commands += %{
-( #{repo_checkout_bash_command(repo, url)} ) &
-PIDS+=$!\" \";
-}
-          end
-
-          commands += "[ -n \"$PIDS\" ] && wait $PIDS\n"
-
-          system(commands)
-
+          registry_name = @options[:registry_name]
+          push_base = !!@options[:push_base_images]
+          env[:machine].config.ssh.pty = true
+          do_execute(env[:machine], %{
+echo "Pushing release images"
+set -e
+pushd /data/src/github.com/openshift/origin
+  OS_PUSH_BASE_IMAGES="#{push_base ? 'true' : ''}" OS_PUSH_BASE_REGISTRY="#{registry_name}" hack/push-release.sh
+popd
+},
+            { :timeout => 60*20, :verbose => false })
           @app.call(env)
         end
+
       end
     end
   end

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

@@ -28,17 +28,7 @@ module Vagrant
           @options = options.clone
         end
 
-        def call(env)
-          @options.delete :logs
-
-          cmds = ['hack/test-go.sh']
-
-          if @options[:all]
-            cmds << 'hack/test-cmd.sh'
-            cmds << 'hack/test-integration.sh'
-            cmds << 'hack/test-end-to-end.sh'
-          end
-
+        def run_tests(env, cmds, as_root=true)
           tests = ''
           cmds.each do |cmd|
             tests += "
@@ -49,14 +39,48 @@ echo 'Finished #{cmd}'
 echo '***************************************************'
 "
           end
-
-          _,_,env[:test_exit_code] = sudo(env[:machine], %{
+          cmd = %{
 set -e
 pushd #{Constants.build_dir}/origin >/dev/null
 export PATH=$GOPATH/bin:$PATH
 #{tests}
 popd >/dev/null
-          }, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
+        }
+          exit_code = 0
+          if as_root
+            _,_,exit_code = sudo(env[:machine], cmd, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
+          else
+            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
+          end
+          exit_code
+        end
+
+        def call(env)
+          @options.delete :logs
+
+          if @options[:report_coverage]
+            cmds = ['OUTPUT_COVERAGE=/tmp/origin/e2e/artifacts/coverage hack/test-go.sh']
+          else
+            cmds = ['hack/test-go.sh']
+          end
+
+          if @options[:all]
+            cmds << 'hack/test-integration.sh'
+            cmds << 'hack/test-cmd.sh'
+            if @options[:skip_image_cleanup]
+              cmds << 'SKIP_IMAGE_CLEANUP=1 ARTIFACT_DIR=/tmp/origin/e2e/artifacts LOG_DIR=/tmp/origin/e2e/logs hack/test-end-to-end.sh'
+            else
+              cmds << 'ARTIFACT_DIR=/tmp/origin/e2e/artifacts LOG_DIR=/tmp/origin/e2e/logs hack/test-end-to-end.sh'
+            end
+          end
+
+          env[:test_exit_code] = run_tests(env, cmds, true)
+
+          # any other tests that should not be run as sudo
+          if env[:test_exit_code] == 0 && @options[:all]
+            cmds = ['hack/test-assets.sh']
+            env[:test_exit_code] = run_tests(env, cmds, false)
+          end
 
           @app.call(env)
         end