vagrant-openshift 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c1750fd41174a13573997e9f8237cd2e1345298
-  data.tar.gz: 8d477fbaad3c34dc70732eacaed89cefaa5f16be
+  metadata.gz: 40e78c1297ab90fde0f17d934350f42056d76894
+  data.tar.gz: 980f13e1b3b756609eef588d963d64e499c830d0
 SHA512:
-  metadata.gz: 49f56d0a750c5b113e2ce62d7b94b71c50afc53cad602840817d81926ab8c8e3efcac81e4271cd5b594ea9e7b3c332f78d39d07f1afde9847ce1cce5e7a6af07
-  data.tar.gz: 59862d1d48a8d743fd54d4f697e3b5879ba408e76de9897a3947deef156bb602516bf170a0622ff5d37ca75377c1909161bd749a6ecc9cc10370f5c412809612
+  metadata.gz: a9a31ebe5362163ca70c47978bb2b0d8eccd80916c009345569abfdf20a777418b17eb6340c63be9681b58b386ac61f626553daf1c1405d3ce49e8b2c2c46e6d
+  data.tar.gz: a11f6401a83fd85e2a5fa1155c22fe99d5201b1c3e633363f1cec743e34937c80199ab85223d8f5f0c6817df1ef27103d967c4f6b7a6367d4ea282f027ace256

data/README.asciidoc

@@ -88,7 +88,7 @@ you may modify later to match your vagrant requirements:
 
 [source, sh]
 ----
-$ vagrant origin-init --stage inst --os (fedora|centos7|rhel7) <instance name>
+$ vagrant origin-init --stage inst --os (fedora|centos7|rhel7|rhelatomic7) <instance name>
 ----
 
 ==== Start the machine
@@ -179,7 +179,7 @@ AWSPrivateKeyPath=<SSH Private key>
 
 [source, sh]
 ----
-$ vagrant origin-init --stage inst --os (fedora|centos7|rhel7) <instance name>
+$ vagrant origin-init --stage inst --os (fedora|centos7|rhel7|rhelatomic7) <instance name>
 ----
 
 The instance name will be applied as a tag and should generally be

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

@@ -31,7 +31,8 @@ module Vagrant
         def call(env)
           os      = @options[:os].to_sym
           stage   = @options[:stage].to_sym
-          instance_type   = @options[:instance_type].to_sym
+          instance_type   = @options[:instance_type]
+          volume_size   = @options[:volume_size]
           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"))
@@ -40,7 +41,7 @@ module Vagrant
           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] = [:centos7, :rhel7].include?(os) ? :redhat : os
+          box_info[:vagrant_guest] = [:centos7, :rhel7, :rhelatomic7].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']
@@ -68,7 +69,8 @@ module Vagrant
             'cpus' => 2,
             'memory' => 2048,
             'rebuild_yum_cache' => false,
-            'instance_type' => instance_type
+            'instance_type' => instance_type,
+            'volume_size' => volume_size
           }
 
           vagrant_openshift_config['no_synced_folders'] = @options[:no_synced_folders]

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

@@ -30,17 +30,18 @@ module Vagrant
         #        registry here already.
         def fix_insecure_registry_cmd(registry_url)
           %{
+sudo chmod a+rw /etc/sysconfig/docker
 cat <<EOF > /etc/sysconfig/docker
 OPTIONS='--insecure-registry #{registry_url} --selinux-enabled'
 EOF
-systemctl restart docker
+sudo systemctl restart docker
           }
         end
 
         def push_image(image_name, git_ref, registry)
           %{
 set -e
-pushd /data/src/github/openshift/#{image_name}
+pushd /tmp/images/#{image_name}
 git checkout #{git_ref}
 git_ref=$(git rev-parse --short HEAD)
 echo "Pushing image #{image_name}:$git_ref..."
@@ -59,36 +60,40 @@ docker tag -f #{image_name}-rhel7 #{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.
+
+# this one is failing in parallel for unknown reasons
+docker push -f #{registry}#{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[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}]} & 
+for i in {0..1}; do
+  echo "pushing ${procs[${i}]}"
+  ${procs[${i}]} &
   pids[${i}]=$!
-  echo "push ${procs[${i}]} is pid ${pids[${i}]}" 
-done 
+  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 
+  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}]} & 
+for i in {0..1}; do
+  ${procs[${i}]} &
   pids[${i}]=$!
-done 
+done
 
 # Wait for all pushes.  "wait" will check the return code of each process also.
 for pid in ${pids[*]}; do
-  wait $pid 
+  wait $pid
 done
 
 popd
@@ -99,12 +104,12 @@ set +e
 # 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" 
+# 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}"
+dest_dir=/tmp/images/#{image_name}
 rm -rf ${dest_dir}; mkdir -p ${dest_dir}
 set -e
 pushd ${dest_dir}
@@ -112,9 +117,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 VERSION=#{version} TAG_ON_SUCCESS=true
+sudo env "PATH=$PATH" make test TARGET=centos7 VERSION=#{version} TAG_ON_SUCCESS=true
 echo "Building and testing #{image_name}-rhel7:$git_ref ..."
-make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
+sudo env "PATH=$PATH" make test TARGET=rhel7 VERSION=#{version} TAG_ON_SUCCESS=true
 popd
 set +e
           }
@@ -155,7 +160,7 @@ docker pull #{@options[:registry]}openshift/base-rhel7
 
           cmd += %{
 # so we can call sti
-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
+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

data/lib/vagrant-openshift/action.rb

@@ -32,7 +32,7 @@ module Vagrant
 
       def self.install_openshift(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use YumUpdate
+          #b.use YumUpdate
           b.use SetHostName
           b.use InstallOpenshift
           b.use InstallOpenshiftRhel7

data/lib/vagrant-openshift/command/{openshift_init.rb → origin_init.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class OpenshiftInit < Vagrant.plugin(2, :command)
+      class OriginInit < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -31,23 +31,25 @@ module Vagrant
             :os       => 'centos7',
             :stage    => 'inst',
             :instance_type => 't2.medium',
+            :volume_size => 25,
             :port_mappings => [],
             :no_synced_folders => false,
             :no_insert_key => false
           }
 
           valid_stage = ['os','deps','inst', 'bootstrap']
-          valid_os = ['centos7','fedora','rhel7']
+          valid_os = ['centos7','fedora','rhel7','rhelatomic7']
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant origin-init [vm or instance name]"
             o.separator ""
 
-            o.on("-s [stage]", "--stage [stage]", String, "Specify what build state to start from:\n\tos = base operating system\n\tdeps = only dependencies installed\n\tinst = dev environment [default]\n\tbootstrap = running environment") do |f|
+            o.on("-s [stage]", "
+              --stage [stage]", String, "Specify what build state to start from:\n\tos = base operating system\n\tdeps = only dependencies installed\n\tinst = dev environment [default]\n\tbootstrap = running environment") do |f|
               options[:stage] = f
             end
 
-            o.on("-o [name]", "--os [name]", String, "Operating system:\n\tcentos7 [default]\n\tfedora\n\trhel7") do |f|
+            o.on("-o [name]", "--os [name]", String, "Operating system:\n\tcentos7 [default]\n\tfedora\n\trhel7\n\trhelatomic7") do |f|
               options[:os] = f
             end
 
@@ -66,6 +68,10 @@ module Vagrant
             o.on('--instance-type', "--instance-type [type]", String, "Specify what type of instance to launch") do |f|
               options[:instance_type] = f
             end
+
+            o.on('--volume-size', "--volume-size [size]", String, "Specify the volume size for the instance") do |f|
+              options[:volume_size] = f.to_i
+            end
           end
 
           # Parse the options

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

@@ -95,14 +95,15 @@ set -x
 
 # NOTE: This is only for rhel7
 if [ -n "#{registry}" -a -f /etc/sysconfig/docker ]; then
+  sudo chmod a+rw /etc/sysconfig/docker
   cat <<EOF > /etc/sysconfig/docker
 OPTIONS='--insecure-registry #{registry} --selinux-enabled'
 EOF
-  systemctl restart docker
+  sudo systemctl restart docker
 fi
 
 # so we can call sti
-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
+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
 
 # create a temp dir to play in
 temp_dir=$(mktemp -d /tmp/image_test.XXXXXXX)
@@ -128,19 +129,19 @@ if [ "#{base_images}" == "true" -a -n "#{registry}" ]; then
   docker pull #{registry}/openshift/base-rhel7 && docker tag #{registry}/openshift/base-rhel7 openshift/base-rhel7
 fi
 
-if ! make test TARGET=rhel7; then
+if ! sudo env "PATH=$PATH" make test TARGET=rhel7; then
     echo "ERROR: #{image}-rhel7 failed testing."
     exit 1
 fi
-  
-if ! make test TARGET=centos7; then
+
+if ! sudo env "PATH=$PATH" make test TARGET=centos7; then
     echo "ERROR: #{image}-centos7 failed testing."
     exit 1
 fi
 
 # clean up
 cd /
-rm -rf $temp_dir
+sudo rm -rf $temp_dir
 exit $status
 })
             # Vagrant throws an exception if any execute invocation returns non-zero,

data/lib/vagrant-openshift/constants.rb

@@ -33,7 +33,7 @@ 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/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',
@@ -48,6 +48,7 @@ module Vagrant
           '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'
         }

data/lib/vagrant-openshift/plugin.rb

@@ -83,8 +83,8 @@ module Vagrant
       end
 
       command "origin-init" do
-        require_relative "command/openshift_init"
-        Commands::OpenshiftInit
+        require_relative "command/origin_init"
+        Commands::OriginInit
       end
 
       command "openshift-local-checkout" do

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

@@ -176,3 +176,52 @@
     :openstack:
       :image: <RHEL 7>
       :ssh_user: root
+:rhelatomic7:
+  :os:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: cloud-user
+      :machine_name: openshift-rhelatomic7
+      :ebs_volume_size: 25
+      :ami_tag_prefix: openshift-rhelatomic7_
+    :openstack:
+      :image: <ATOMIC>
+      :flavor: m1.small
+      :ssh_user: root
+  :deps:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: cloud-user
+      :machine_name: devenv-rhelatomic7-base
+      :ebs_volume_size: 25
+      :ami_tag_prefix: devenv-rhelatomic7-base_
+    :openstack:
+      :image: <ATOMIC>
+      :flavor: m1.small
+      :ssh_user: root
+  :inst:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: cloud-user
+      :machine_name: <AMI_NAME>
+      :ebs_volume_size: 25
+      :ami_tag_prefix: openshift-rhelatomic7_
+    :openstack:
+      :image: <ATOMIC>
+      :flavor: m1.small
+      :ssh_user: root
+  :bootstrap:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: cloud-user
+      :machine_name: <AMI_NAME>
+      :ebs_volume_size: 25
+      :ami_tag_prefix: devenv-rhelatomic7-bootstrap_
+    :openstack:
+      :image: <ATOMIC>
+      :flavor: m1.small
+      :ssh_user: root

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.6"
+    VERSION = "2.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,7 +167,7 @@ files:
 - lib/vagrant-openshift/command/local_openshift_setup.rb
 - lib/vagrant-openshift/command/modify_ami.rb
 - lib/vagrant-openshift/command/modify_instance.rb
-- lib/vagrant-openshift/command/openshift_init.rb
+- lib/vagrant-openshift/command/origin_init.rb
 - lib/vagrant-openshift/command/push_openshift_images.rb
 - lib/vagrant-openshift/command/push_openshift_release.rb
 - lib/vagrant-openshift/command/repo_sync_openshift.rb