vagrant-openshift 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f10e8a7d582a7d3de2d771057e2f8c8c3f696a
-  data.tar.gz: 3309a1e0bd0efab822d6a49b4946f4a75f70b9dc
+  metadata.gz: 60035a28df487a9fc63926339b7f19161411cb70
+  data.tar.gz: 4ccdb3969ae2604e6eef000a99ddd154bde499e2
 SHA512:
-  metadata.gz: 59f13973cc51e11d6e36338dbe908aed8e4ce62c1f22056fe37c83653d6dd86b59034538017e661e8c37526524e83def4f4cd0ac22fe6b433ee9624837af95ba
-  data.tar.gz: 40b1a7b34795e788c055b5648202021d6549dc3edaa8edaa167e8186b15d4c4e514b7f53ef259b7bb2d54e6127990f96748c639d7f1ecf6e53a5d9cb3e281706
+  metadata.gz: 73f1007e3131c3b4c32b61394282ba9cfeb704ae429ecff80f91e95dfb9f3e7d2491de49619936ffc31d9e982c5f267a9a4ef4df2e579504b5e5bd597b29c0ce
+  data.tar.gz: f1c801666864c63cee90ebbbcd2a51067f1c8ef4c57e523d47b1c2feab10f29c968b685f504d6d6d9fd80eb5be3e6a7a38dcb107a70ca08476552b3392a3c417

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

@@ -44,43 +44,13 @@ module Vagrant
           is_centos = env[:machine].communicate.test("test -e /etc/centos-release")
           is_rhel   = env[:machine].communicate.test("test -e /etc/redhat-release") && !is_centos && !is_fedora
 
-          sudo(env[:machine], "yum install -y augeas")
+          sudo(env[:machine], "yum -y install deltarpm", {fail_on_error: false})
+          sudo(env[:machine], "yum -y install augeas")
           if is_centos
             sudo(env[:machine], "yum install -y centos-release-SCL.x86_64 http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm")
-            set_yum_repo(env, "/etc/yum.repos.d/CentOS-Base.repo", "base", options.os_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/CentOS-Base.repo", "updates", options.os_updates_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/CentOS-Base.repo", "extras", options.os_extras_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/epel.repo", "epel", options.optional_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/CentOS-SCL.repo", "scl", options.os_scl_repo)
+            set_yum_repo(env, "/etc/yum.repos.d/openshift-deps.repo", "openshift", "https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/")
           end
 
-          if is_rhel
-            set_yum_repo(env, "/etc/yum.repos.d/RHEL-Base.repo", "base", options.os_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/RHEL-Base.repo", "updates", options.os_updates_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/epel.repo", "epel", options.optional_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/RHEL-SCL.repo", "scl", options.os_scl_repo)
-
-          end
-
-          if is_fedora
-            set_yum_repo(env, "/etc/yum.repos.d/fedora.repo", "fedora", options.os_repo)
-            set_yum_repo(env, "/etc/yum.repos.d/fedora.repo", "updates", options.os_updates_repo)
-          end
-
-          #if options.repos_base == nil
-            #if is_fedora
-                #options.repos_base = "http://mirror.openshift.com/pub/openshift-origin/nightly/fedora-19/"
-            #elsif is_centos or is_rhel
-                #options.repos_base = "http://mirror.openshift.com/pub/openshift-origin/nightly/rhel-6/"
-            #end
-
-            #dependencies = "#{options.repos_base}/dependencies/x86_64"
-          #else
-            #dependencies = "#{options.repos_base}/dependencies/x86_64"
-          #end
-
-          #set_yum_repo(env, "/etc/yum.repos.d/openshift-deps.repo", "openshift-deps", dependencies)
-
           sudo(env[:machine], "yum clean all")
 
           unless is_fedora

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

@@ -41,6 +41,7 @@ module Vagrant
 
             "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
             "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/",
+            "/data/src/github.com/openshift/origin/assets/phantomjsdriver.log" => artifacts_dir + "e2e/phantomjsdriver.log",
           }
 
           download_map.each do |source,target|

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

@@ -42,7 +42,7 @@ cat > /etc/profile.d/openshift.sh <<DELIM
 export GOPATH=/data
 export PATH=$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/local/go/bin/:$GOPATH/bin:$PATH
 #export KUBERNETES_MASTER=http://localhost:8080
-export KUBECONFIG=/openshift.local.certificates/admin/.kubeconfig
+export OPENSHIFTCONFIG=/openshift.local.config/master/admin.kubeconfig
 DELIM
 
 cat > /etc/sysconfig/openshift <<DELIM
@@ -80,9 +80,9 @@ Documentation=https://github.com/openshift/origin
 Type=simple
 EnvironmentFile=-/etc/sysconfig/openshift
 ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://\\${HOST}:8443
-ExecStartPost=/usr/bin/timeout 60 bash -c 'while [ ! -d /openshift.local.certificates/admin ] ; do sleep 1; done'
+ExecStartPost=/usr/bin/timeout 60 bash -c 'while [ ! -f /openshift.local.config/master/admin.kubeconfig ] ; do sleep 1; done'
 ExecStartPost=/bin/sleep 1
-ExecStartPost=/bin/chmod a+r -R /openshift.local.certificates/admin
+ExecStartPost=/bin/chmod a+r /openshift.local.config/master/admin*
 
 [Install]
 WantedBy=multi-user.target

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

@@ -30,17 +30,17 @@ module Vagrant
           # FIXME: Move 'openshift/centos-mongodb' into openshift org and then
           #        add the image into 'repositories' constants
           #
-          sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 ntp screen java-1.?.0-openjdk bind-utils socat")
-          sudo(env[:machine], "yum install -y facter", {fail_on_error: false})
+          sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 ntp screen java-1.?.0-openjdk bind-utils socat", {:timeout=>60*10})
+          sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*5})
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
           #        installed. See BZ#1101508
           #
-          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src")
+          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src", {:timeout=>60*5})
           #
           sudo(env[:machine], %{
 
-set -x
+set -ex
 # TODO Remove me ASAP
 sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
 setenforce 0
@@ -48,11 +48,13 @@ setenforce 0
 systemctl enable ntpd
 
 groupadd docker
-chown root:docker /var/run/docker.sock
 usermod -a -G docker #{ssh_user}
 
-sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.17.0/24 \\1'," /etc/sysconfig/docker
-sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=172.30.17.0/24 -\\1'," /etc/sysconfig/docker
+sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.0.0/16 \\1'," /etc/sysconfig/docker
+sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=172.30.0.0/16 -\\1'," /etc/sysconfig/docker
+
+sed -i "s,^ADD_REGISTRY='\\(.*\\)',#ADD_REGISTRY='--add-registry=docker.io \\1'," /etc/sysconfig/docker
+
 cat /etc/sysconfig/docker
 
 # Force socket reuse
@@ -61,7 +63,16 @@ echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
 mkdir -p /data/src
 mkdir -p /data/pkg
 mkdir -p /data/bin
-GOPATH=/data go get code.google.com/p/go.tools/cmd/cover
+
+GO_VERSION=($(go version))
+echo "Detected go version: $(go version)"
+
+if [[ ${GO_VERSION[2]} == "go1.4"* ]]; then
+  GOPATH=/data go get golang.org/x/tools/cmd/cover
+else
+  GOPATH=/data go get code.google.com/p/go.tools/cmd/cover
+fi
+
 chown -R #{ssh_user}:#{ssh_user} /data
 
 systemctl daemon-reload
@@ -71,7 +82,7 @@ systemctl start docker
 docker pull openshift/docker-registry
 docker pull openshift/origin-sti-builder
 docker pull openshift/origin-deployer
-          }, {:timeout=>60*20})
+          }, {:timeout=>60*30})
           @app.call(env)
         end
       end

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

@@ -44,7 +44,7 @@ cp /etc/yum.repos.d/* $contextdir/repos
 
 # create Dockerfile
 cat <<EOF > $contextdir/Dockerfile
-FROM rhel7:latest
+FROM registry.access.redhat.com/rhel7:latest
 
 RUN yum remove -y subscription-manager
 

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

@@ -30,7 +30,7 @@ module Vagrant
           sudo(env[:machine], '
 ROUTER_EXISTS=$(openshift ex router 2>&1 | grep "does not exist")
 OS_RUNNING=$(systemctl status openshift | grep "(running)")
-CMD="openshift ex router --create --credentials=${KUBECONFIG}"
+CMD="openshift ex router --create --credentials=${OPENSHIFTCONFIG}"
 
 if [[ $OS_RUNNING ]]; then
   if [[ -n $ROUTER_EXISTS ]]; then

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

@@ -39,6 +39,7 @@ systemctl restart docker
 
         def build_image(image_name, git_ref, repo_url, registry)
           %{
+set -e
 dest_dir="/data/src/github/openshift/#{image_name}"
 rm -rf ${dest_dir}; mkdir -p ${dest_dir}
 if git clone #{repo_url} ${dest_dir}; then
@@ -48,23 +49,25 @@ if git clone #{repo_url} ${dest_dir}; then
     echo "Building #{image_name}:$git_ref"
 
     if make build TARGET=centos7; then
-      docker tag #{image_name}-centos7 #{registry}#{image_name}-centos7:$git_ref
-      docker tag #{image_name}-centos7 #{registry}#{image_name}-centos7:latest
-      docker tag #{image_name}-centos7 #{image_name}-centos7:latest
-      docker push #{registry}#{image_name}-centos7:$git_ref
-      docker push #{registry}#{image_name}-centos7:latest
-      docker push #{image_name}-centos7:latest
+      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 #{image_name}-centos7:latest
+      docker push -f #{registry}#{image_name}-centos7:$git_ref
+      docker push -f #{registry}#{image_name}-centos7:latest
+      docker push -f #{image_name}-centos7:latest
     else
       echo "ERROR: Failed to build #{image_name}-centos7"
+      exit 1
     fi
 
     if make build TARGET=rhel7; then
-      docker tag #{image_name}-rhel7 #{registry}#{image_name}-rhel7:$git_ref
-      docker tag #{image_name}-rhel7 #{registry}#{image_name}-rhel7:latest
-      docker push #{registry}#{image_name}-rhel7:$git_ref
-      docker push #{registry}#{image_name}-rhel7:latest
+      docker tag -f #{image_name}-rhel7 #{registry}#{image_name}-rhel7:$git_ref
+      docker tag -f #{image_name}-rhel7 #{registry}#{image_name}-rhel7:latest
+      docker push -f #{registry}#{image_name}-rhel7:$git_ref
+      docker push -f #{registry}#{image_name}-rhel7:latest
     else
       echo "ERROR: Failed to build #{image_name}-rhel7"
+      exit 1
     fi
   popd
 fi
@@ -77,6 +80,7 @@ rm -rf ~/latest_images ; touch ~/latest_images
           }
           Vagrant::Openshift::Constants.openshift3_images.each do |name, git_url|
             cmd += %{
+set +e
 git_ref=$(git ls-remote #{git_url} -h refs/heads/master | cut -c1-7)
 curl -s http://#{registry}v1/repositories/#{name}-rhel7/tags/${git_ref} | grep -q "error"
 if [[ "$?" != "0" ]]; then
@@ -114,7 +118,7 @@ docker pull #{@options[:registry]}openshift/base-rhel7
             name, git_ref = image.split(':')
             repo_url = Vagrant::Openshift::Constants.openshift3_images[name]
             if repo_url == nil
-              puts "Unregistred image: #{name}, skipping"
+              puts "Unregistered image: #{name}, skipping"
               next
             end
             cmd += build_image(name, git_ref, repo_url, @options[:registry])

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

@@ -27,8 +27,9 @@ module Vagrant
 
         def call(env)
           sudo env[:machine], "rm -rf /etc/yum.repos.d/openshift-origin.repo"
-          sudo env[:machine], "yum clean all;"
+          sudo env[:machine], "yum clean all"
           sudo env[:machine], "yum -y update --skip-broken --exclude=kernel*", {fail_on_error: false, :timeout=>60*10}
+          sudo env[:machine], "yum list installed"
 
           env[:machine].ui.warn "Increasing YUM cache timeout to 9999999. You will need manually clear cache to get additional updates."
           remote_write(env[:machine], "/etc/yum.conf") {
@@ -64,4 +65,4 @@ metadata_expire=9999999
       end
     end
   end
-end
+end

data/lib/vagrant-openshift/config.rb

@@ -17,26 +17,18 @@
 module Vagrant
   module Openshift
     class Config < Vagrant.plugin(2, :config)
-      attr_accessor :cloud_domain, :repos_base, :os_repo, :os_updates_repo,
-                    :optional_repo, :os_extras_repo, :os_scl_repo
+      attr_accessor :cloud_domain
 
       def initialize
         super
 
         @cloud_domain         = UNSET_VALUE
-        @repos_base           = UNSET_VALUE
-        @os_repo              = nil
-        @os_updates_repo      = nil
-        @os_extras_repo       = nil
-        @optional_repo        = nil
-        @os_scl_repo          = nil
       end
 
       def finalize!
         super
 
         @cloud_domain    = "example.com"  if @cloud_domain    == UNSET_VALUE
-        @repos_base = nil         if @repos_base == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-openshift/constants.rb

@@ -35,6 +35,8 @@ module Vagrant
           'openshift/base'          => 'https://github.com/openshift/sti-base.git',
           'openshift/ruby-20'       => 'https://github.com/openshift/sti-ruby.git',
           'openshift/nodejs-010'    => 'https://github.com/openshift/sti-nodejs.git',
+          'openshift/python-33'     => 'https://github.com/openshift/sti-python.git',
+          'openshift/perl-516'      => 'https://github.com/openshift/sti-perl.git',
           'openshift/mysql-55'      => 'https://github.com/openshift/mysql.git',
           'openshift/mongodb-24'    => 'https://github.com/openshift/mongodb.git',
           'openshift/postgresql-92' => 'https://github.com/openshift/postgresql.git'

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "1.0.19"
+    VERSION = "1.0.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake