vagrant-openshift 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1016fc5cb2140527ddf4ac73c2f635c460c471
-  data.tar.gz: d352b58cf8cc8d2a666a3a8e7bdb732c50f580b5
+  metadata.gz: ae6afb23aff38bb9c5e56876934f390f424b6120
+  data.tar.gz: 9d63ba4a151d314534c8a4eb9025fba51be2e281
 SHA512:
-  metadata.gz: aa8c92f03ceaddb2418e60692160bab0e5ff81f4fc5c7510c24d058dc1f7d2cb870b1d5b73bcc80bb508750f6f7760d60797a1d50d7715a567a9cd48c8797e0f
-  data.tar.gz: cf02fb45bbf8583a0a377fcd640034e6b8ce18f85c9e959fc98e89d5cd1b7f9f4cbdc225934aae92d2a634f1492ae5a79ab822633a9c8c0954ceac23b539270d
+  metadata.gz: be084f3f1c4dd7a4fb8af5419212e997efd55def06b483ba00fa8195d6ccf97fa392b82c9acd7a95869f2e9d8987b9232373f9b50a8858ab54465ed28b660472
+  data.tar.gz: 24752536ba60a84328c38554ff1c87d60d5f7eb100e8b2fcea4662f66db66f3a58b8ae34d4d6ad61e5d2b04d6e445c3d062dbbd6526328b2f4a1f5db4bcd06e5

data/README.asciidoc

@@ -215,16 +215,20 @@ Install plugin from rubygems:
 $ vagrant plugin install vagrant-openstack-plugin
 ----
 
+NOTE: On some systems (e.g. mac) doing `export NOKOGIRI_USE_SYSTEM_LIBRARIES=1` can help make the above command work.
+
 * Edit `~/.openstackcred` and update your OpenStack credentials, endpoint and tenant name.
 
 .'~/.openstackcred'
 ----
-OSEndpoint=<OpenStack Endpoint URL>
+OSEndpoint=<OpenStack Endpoint URL, e.g. http://openshift.example.com:5000/v2.0/tokens>
 OSUsername=<OpenStack Username>
 OSAPIKey=<OpenStack Password>
-OSKeyPairName=<Keypair name>
-OSPrivateKeyPath=<SSH Private key path>
-OSTenant=<OpenStack Tenant Name>
+OSKeyPairName=<Keypair name as registered in OpenStack>
+OSPrivateKeyPath=<path to that SSH Private key>
+OSTenant=<OpenStack Tenant/Project Name, see it at the top in OpenStack web UI>
+OSFloatingIP=<specific floating ip or ':auto' if floating ip is desired>
+OSFloatingIPPool=<specific pool or 'false' (to use first found) if floating ip is desired>
 ----
 
 * Edit `.vagrant-openshift.json` and update the openstack provider

data/lib/vagrant-openshift/action.rb

@@ -42,13 +42,13 @@ module Vagrant
           b.use SetHostName
           b.use InstallOpenshift
           b.use InstallOpenshiftRhel7
-          b.use InstallOpenshiftAssetDependencies
+          b.use InstallOpenshiftAssetDependencies, :restore_assets => true
         end
       end
 
       def self.install_openshift_assets_base(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use InstallOpenshiftAssetDependencies
+          b.use InstallOpenshiftAssetDependencies, :backup_assets => true
         end
       end
 
@@ -92,7 +92,7 @@ module Vagrant
             end
             b.use SyncLocalRepository
             b.use CheckoutRepositories
-            b.use InstallOpenshiftAssetDependencies
+            b.use InstallOpenshiftAssetDependencies, :restore_assets => true
           end
           if options[:build]
             b.use(BuildOpenshiftBaseImages, options) if options[:images]

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

@@ -84,7 +84,7 @@ Documentation=https://github.com/openshift/origin
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/openshift
-ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --cors-allowed-origins=.* --public-master=https://\\${HOST}:8443
+ExecStart=$ORIGIN_PATH/_output/local/bin/linux/amd64/openshift start --cors-allowed-origins=.* --public-master=https://\\${HOST}:8443
 LimitNOFILE=4096
 
 [Install]

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

@@ -20,29 +20,52 @@ module Vagrant
       class InstallOpenshiftAssetDependencies
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options)
           @app = app
           @env = env
+          @options = options.clone
         end
 
         def call(env)
           ssh_user = env[:machine].ssh_info[:username]
-          do_execute(env[:machine], %{
+          cmd = %{
 
 ORIGIN_PATH=/data/src/github.com/openshift/origin
-
-if ! which bundler > /dev/null 2>&1 ; then
-  gem install bundler
-fi
+ASSET_BACKUP_DIR=/data/asset_dependencies
 
 if ! which npm > /dev/null 2>&1 ; then
   sudo yum -y install npm
 fi
 
+}
+          if @options[:restore_assets]
+            cmd += %{
+  # make sure the dirs always exist
+  mkdir -p /data/asset_dependencies/node_modules
+  mkdir -p /data/asset_dependencies/bower_components
+  # copy them to the assets dir
+  cp -rf $ASSET_BACKUP_DIR/node_modules $ORIGIN_PATH/assets/node_modules
+  cp -rf $ASSET_BACKUP_DIR/bower_components $ORIGIN_PATH/assets/bower_components
+  
+}
+          end
+
+          cmd += %{
 pushd $ORIGIN_PATH
   hack/install-assets.sh
 popd
-          }, {:timeout=>60*20})
+
+}
+
+          if @options[:backup_assets]
+            cmd += %{
+  mkdir -p $ASSET_BACKUP_DIR
+  cp -rf $ORIGIN_PATH/assets/node_modules $ASSET_BACKUP_DIR/node_modules
+  cp -rf $ORIGIN_PATH/assets/bower_components $ASSET_BACKUP_DIR/bower_components
+}
+          end
+
+          do_execute(env[:machine], cmd, {:timeout=>60*20})
           @app.call(env)
         end
       end

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

@@ -42,7 +42,7 @@ fi
           # 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 unzip Xvfb", {:timeout=>60*20})
+          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 unzip Xvfb ethtool", {:timeout=>60*20})
           sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*10})
 
           # Install Chrome and chromedriver for headless UI testing
@@ -102,13 +102,20 @@ mkdir -p /data/bin
 GO_VERSION=($(go version))
 echo "Detected go version: $(go version)"
 
+# TODO: Remove for go1.5, go vet and go cover will be internal 
 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
 
-GOPATH=/data go get golang.org/x/tools/cmd/vet
+  GOPATH=/data go get golang.org/x/tools/cmd/vet
+
+  # Check out a stable commit for go vet in order to version lock it to something we can work with
+  pushd /data/src/golang.org/x/tools >/dev/null 2>&1
+    git checkout c262de870b618eed648983aa994b03bc04641c72 
+  popd >/dev/null 2>&1
+
+  # Re-install using this version of the tool
+  GOPATH=/data go install golang.org/x/tools/cmd/vet
+fi
 
 chown -R #{ssh_user}:#{ssh_user} /data
 

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

@@ -38,35 +38,29 @@ sudo systemctl restart docker
           }
         end
 
-        def push_image(image_name, git_ref, registry)
+        def push_image(centos_namespace,rhel_namespace,image_name, git_ref, registry)
+
           %{
 set -e
 pushd /tmp/images/#{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
+echo "Pushing image #{image_name}:#{git_ref}..."
 
-#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
+docker tag -f #{centos_namespace}/#{image_name}-centos7 #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}
+docker tag -f #{centos_namespace}/#{image_name}-centos7 #{registry}#{centos_namespace}/#{image_name}-centos7:latest
+docker tag -f #{centos_namespace}/#{image_name}-centos7 docker.io/#{centos_namespace}/#{image_name}-centos7:latest
+docker tag -f #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
+docker tag -f #{rhel_namespace}/#{image_name}-rhel7 #{registry}#{rhel_namespace}/#{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.
-
 # this one is failing in parallel for unknown reasons
-docker push -f #{registry}#{image_name}-rhel7:$git_ref
+docker push -f #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}
 
-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"
+procs[0]="docker push -f #{registry}#{centos_namespace}/#{image_name}-centos7:#{git_ref}"
+procs[1]="docker push -f docker.io/#{centos_namespace}/#{image_name}-centos7:latest"
+#procs[2]="docker push -f #{registry}#{rhel_namespace}/#{image_name}-rhel7:#{git_ref}"
 
 # Run pushes in parallel
 for i in {0..1}; do
@@ -82,8 +76,8 @@ for pid in ${pids[*]}; do
   wait $pid
 done
 
-procs[0]="docker push -f #{registry}#{image_name}-centos7:latest"
-procs[1]="docker push -f #{registry}#{image_name}-rhel7:latest"
+procs[0]="docker push -f #{registry}#{centos_namespace}/#{image_name}-centos7:latest"
+procs[1]="docker push -f #{registry}#{rhel_namespace}/#{image_name}-rhel7:latest"
 
 # Run pushes in parallel
 for i in {0..1}; do
@@ -125,20 +119,14 @@ set +e
           }
         end
 
-        def update_latest_image_cmd(registry)
+        def check_latest_image_cmd(registry,namespace,name,git_url)
           cmd = %{
-rm -rf ~/latest_images ; touch ~/latest_images
-          }
-          Vagrant::Openshift::Constants.openshift_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
-  echo "#{name};$git_ref" >> ~/latest_images
-fi
+        git_ref=$(git ls-remote #{git_url} -h refs/heads/master | cut -c1-7)
+        curl -s http://#{registry}v1/repositories/#{namespace}/#{name}-rhel7/tags/${git_ref} | grep -q "error"
+        if [[ "$?" != "0" ]]; then
+          echo "#{name};$git_ref" >> ~/latest_images
+        fi
             }
-          end
           return cmd
         end
 
@@ -159,33 +147,38 @@ docker pull #{@options[:registry]}openshift/base-rhel7
           }
 
           cmd += %{
-# so we can call sti
+# so we can call s2i
 export PATH=/data/src/github.com/openshift/source-to-image/_output/go/bin:/data/src/github.com/openshift/source-to-image/_output/local/go/bin:$PATH
           }
 
           # 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:1:master,#{@options[:build_images]}"
+          if !@options[:build_images].include?("base")
+            @options[:build_images] = "openshift;openshift;base;1;https://github.com/openshift/sti-base;master,#{@options[:build_images]}"
           end
 
           build_images = @options[:build_images].split(",").map { |i| i.strip }
 
           push_cmd = ""
+          update_cmd=""
           build_images.each do |image|
-            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
+            centos_namespace,rhel_namespace,name, version, repo_url, git_ref = image.split(';')
             cmd += build_image(name, version, git_ref, repo_url)
-            push_cmd += push_image(name, git_ref, @options[:registry])
+            push_cmd += push_image(centos_namespace,rhel_namespace,name, git_ref, @options[:registry])
           end
 
           # Push the final images **only** when they all build successfully
           cmd += push_cmd
-          cmd += update_latest_image_cmd(@options[:registry])
+
+          cmd += %{
+        set +e
+        rm -rf ~/latest_images ; touch ~/latest_images
+          }
+          check_images = @options[:check_images].split(",").map { |i| i.strip }
+          check_images.each do |image|
+            centos_namespace,rhel_namespace,name, version, repo_url, git_ref = image.split(';')
+            cmd+= check_latest_image_cmd(@options[:registry],rhel_namespace,name,repo_url)
+          end
 
           do_execute(env[:machine], cmd)
 

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

@@ -35,9 +35,12 @@ 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:VERSION:REF pairs, delimited by ','") do |i|
+            o.on("--build_images [list]", String, "List of CENTOS_NAMESPACE;RHEL_NAMESPACE;IMAGE;VERSION;GIT_REPO;REF pairs, delimited by ','") do |i|
               options[:build_images] = i
             end
+            o.on("--check_images [list]", String, "List of CENTOS_NAMESPACE;RHEL_NAMESPACE;IMAGE;VERSION;GIT_REPO;REF pairs, delimited by ','") do |ci|
+              options[:check_images] = ci
+            end
             o.separator ""
           end
 

data/lib/vagrant-openshift/constants.rb

@@ -30,30 +30,6 @@ module Vagrant
         }
       end
 
-      def self.openshift_images
-        {
-          'openshift/base'          => 'https://github.com/openshift/sti-base.git',
-          'openshift/jenkins-1'    => '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/php-56'        => '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',
-          'rhscl/mongodb-26'    => 'https://github.com/openshift/mongodb.git',
-          'openshift/postgresql-92' => 'https://github.com/openshift/postgresql.git',
-          'openshift/wildfly-81'     => 'https://github.com/openshift/sti-wildfly.git'
-        }
-      end
-
       def self.git_branch_current
         "$(git rev-parse --abbrev-ref HEAD)"
       end

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.9"
+    VERSION = "2.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake