vagrant-openshift 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f50f81d496445d7c7ff530ebbb98b6d1734a8f
-  data.tar.gz: d0601c6912e1dea1acadb9959c3ca2e0e93dad1b
+  metadata.gz: c4f10e8a7d582a7d3de2d771057e2f8c8c3f696a
+  data.tar.gz: 3309a1e0bd0efab822d6a49b4946f4a75f70b9dc
 SHA512:
-  metadata.gz: f8f6c74bd4528eebfc10e70c6ab4f1c99a0e052fd8b21075ed2330a404cfa2d7c1303afa86ebb1ef40f7da1e8b77a45ead66e0d774f949e4b6156cc917d2b2da
-  data.tar.gz: a87ed5e5469411c4026f5bb8cd4bdad123069b550fc234545d6a778f1a2c1fa50866dc6aa5c328bc84a7f6de180ab0f2d32c3ca5d72024673d547f826028579e
+  metadata.gz: 59f13973cc51e11d6e36338dbe908aed8e4ce62c1f22056fe37c83653d6dd86b59034538017e661e8c37526524e83def4f4cd0ac22fe6b433ee9624837af95ba
+  data.tar.gz: 40b1a7b34795e788c055b5648202021d6549dc3edaa8edaa167e8186b15d4c4e514b7f53ef259b7bb2d54e6127990f96748c639d7f1ecf6e53a5d9cb3e281706

data/README.asciidoc

@@ -256,7 +256,7 @@ NOTE: Requires latest link:https://github.com/cloudbau/vagrant-openstack-plugin[
 
 [source, sh]
 ----
-yum install libxslt-devel libxml2-devel libvirt-devel
+yum install libxslt-devel libxml2-devel libvirt-devel ruby-devel rubygems
 ----
 
 * Install the vagrant-libvirt plugin

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

@@ -80,7 +80,8 @@ 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=/bin/sleep 8
+ExecStartPost=/usr/bin/timeout 60 bash -c 'while [ ! -d /openshift.local.certificates/admin ] ; do sleep 1; done'
+ExecStartPost=/bin/sleep 1
 ExecStartPost=/bin/chmod a+r -R /openshift.local.certificates/admin
 
 [Install]

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

@@ -30,7 +30,7 @@ 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 screen java-1.?.0-openjdk")
+          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})
           #
           # FIXME: Need to install golang packages 'after' the 'gcc' is
@@ -45,6 +45,8 @@ set -x
 sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
 setenforce 0
 
+systemctl enable ntpd
+
 groupadd docker
 chown root:docker /var/run/docker.sock
 usermod -a -G docker #{ssh_user}
@@ -67,7 +69,8 @@ systemctl enable docker
 systemctl start docker
 
 docker pull openshift/docker-registry
-docker pull openshift/origin-docker-registry
+docker pull openshift/origin-sti-builder
+docker pull openshift/origin-deployer
           }, {:timeout=>60*20})
           @app.call(env)
         end

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

@@ -31,7 +31,7 @@ module Vagrant
         def fix_insecure_registry_cmd(registry_url)
           %{
 cat <<EOF > /etc/sysconfig/docker
-OPTIONS='--insecure-registry #{registry_url} --selinux-enabled -H fd://'
+OPTIONS='--insecure-registry #{registry_url} --selinux-enabled'
 EOF
 systemctl restart docker
           }

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

@@ -102,7 +102,7 @@ set -x
 # NOTE: This is only for rhel7
 if [ -n "#{registry}" -a -f /etc/sysconfig/docker ]; then
   cat <<EOF > /etc/sysconfig/docker
-OPTIONS='--insecure-registry #{registry} --selinux-enabled -H fd://'
+OPTIONS='--insecure-registry #{registry} --selinux-enabled'
 EOF
   systemctl restart docker
 fi
@@ -164,7 +164,7 @@ if [ $status -eq 0 -a -f Dockerfile.rhel7 ]; then
   status=$?
 
   # Run the STI image test framework
-  if [ $status -eq 0 -a -f Dockerfile.rhel7 ]; then
+  if [ $status -eq 0 ]; then
     IMAGE_NAME=${IMAGE_NAME}-candidate ./test/run
     status=$?
   fi

data/lib/vagrant-openshift/constants.rb

@@ -32,10 +32,12 @@ module Vagrant
 
       def self.openshift3_images
         {
-          '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/mysql-55'   => 'https://github.com/openshift/mysql.git',
+          '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/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'
         }
       end
 

data/lib/vagrant-openshift/version.rb

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

metadata

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