vagrant-openshift 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb033502a4178e709d31a39cc71226c88b50d23
-  data.tar.gz: 4c848bdfec382e02933d75c3be1a95844b439c1b
+  metadata.gz: a6e6bdc21d8baa7b69733b3a3b83c60f19f2292b
+  data.tar.gz: e0ad051aa84b80fe52264e9cfc29bd61dfb48788
 SHA512:
-  metadata.gz: c6d441d48d0ae6c186f77213a2842cd48b49445724352108fb2cf44bd4df7134f9425dfc2a1995c407f862f2e03d7cf2e2c42420a704bd7a94b4cd8da7f1c854
-  data.tar.gz: de2de3908c380749c8296e5fff97007d707d18364a9cee2100e9b53a71040915ea6182722b7758baffa60ec1ee230b2eebf31e3e71d7cf63ff028a4290fbf138
+  metadata.gz: d79ee5377fed47bd933ef59094cddcb8542f90d8c7df59319e2534ec325b84004ed981a4021b25f05138dd1f68809bea92f53868a7984149924796ab65ae54b7
+  data.tar.gz: 8f1c8f3a7beebc21c1c7171a1837e613e2caa9acfed8c4c8943b1c2d797a67bea102e13e6ab92bd87f31444febbf70f7c3a50a6b7498553c9d6a32926fbc033b

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "json"
 end

data/README.asciidoc

@@ -39,7 +39,7 @@ Compile and install using Rake:
 
 [source, sh]
 ----
-$ rake vagrant:install
+$ rake
 ----
 
 ===== From rubygems.org
@@ -419,27 +419,6 @@ $ vagrant build-openshift --images
 $ vagrant build-sti --binary-only
 ----
 
-=== Creating a "bootstrap" Vagrant Box
-
-Assuming you are targeting the v0.4.4 for your vagrant box
-
-[source, sh]
-----
-$ cd ~/tmp
-$ vagrant openshift-local-checkout --replace --branch v0.4.4
-$ pushd origin
-$ vagrant origin-init --stage inst --os fedora openshift-bootstrap --no-synced-folders
-$ vagrant up
-$ vagrant clone-upstream-repos --clean
-$ vagrant checkout-repos --branch v0.4.4
-$ vagrant build-openshift --images
-$ vagrant build-sti --binary-only
-$ vagrant bootstrap-openshift
-
-$ rm -f /tmp/fedora_virtualbox_bootstrap.box
-$ vagrant package --output /tmp/fedora_virtualbox_bootstrap.box
-----
-
 == Notice of Export Control Law
 
 This software distribution includes cryptographic software that is subject to the U.S. Export Administration Regulations (the "*EAR*") and other U.S. and foreign laws and may not be exported, re-exported or transferred (a) to any country listed in Country Group E:1 in Supplement No. 1 to part 740 of the EAR (currently, Cuba, Iran, North Korea, Sudan & Syria); (b) to any prohibited destination or to any end user who has been prohibited from participating in U.S. export transactions by any federal agency of the U.S. government; or (c) for use in connection with the design, development or production of nuclear, chemical or biological weapons, or rocket systems, space launch vehicles, or sounding rockets, or unmanned air vehicle systems.You may not download this software or technical information if you are located in one of these countries or otherwise subject to these restrictions. You may not provide this software or technical information to individuals or entities located in one of these countries or otherwise subject to these restrictions. You are also responsible for compliance with foreign law requirements applicable to the import, export and use of this software and technical information.

data/lib/vagrant-openshift/action.rb

@@ -40,14 +40,6 @@ module Vagrant
         end
       end
 
-      def self.install_openshift_router(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use RunSystemctl, {:action => "start", :service => "openshift"}
-          b.use InstallOpenshiftRouter
-          b.use RunSystemctl, {:action => "stop", :service => "openshift"}
-        end
-      end
-
       def self.install_openshift_assets_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use InstallOpenshiftAssetDependencies
@@ -204,26 +196,6 @@ module Vagrant
         end
       end
 
-      def self.install_docker_registry
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use InstallDockerRegistry
-        end
-      end
-
-      def self.bootstrap_openshift(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use RunSystemctl, {:action => 'restart', :service => 'docker'}
-          b.use BootstrapOpenshift
-          b.use RunSystemctl, {:action => 'enable', :service => 'openshift'}
-          b.use RunSystemctl, {:action => 'start', :service => 'openshift', argv: '--force'}
-          b.use WaitForOpenshift
-          b.use InstallOpenshiftRouter
-          b.use InstallDockerRegistry
-          b.use SetupSamplePolicy
-          b.use CreateSampleProject
-        end
-      end
-
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :Clean, action_root.join("clean")
       autoload :CloneUpstreamRepositories, action_root.join("clone_upstream_repositories")
@@ -257,13 +229,7 @@ module Vagrant
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
       autoload :SetupBindHost, action_root.join("setup_bind_host")
-      autoload :InstallOpenshiftRouter, action_root.join("install_openshift_router")
       autoload :RunSystemctl, action_root.join("run_systemctl")
-      autoload :InstallDockerRegistry, action_root.join("install_docker_registry")
-      autoload :WaitForOpenshift, action_root.join("wait_for_openshift")
-      autoload :CreateSampleProject, action_root.join("create_sample_project")
-      autoload :SetupSamplePolicy, action_root.join("setup_sample_policy")
-      autoload :BootstrapOpenshift, action_root.join("bootstrap_openshift")
     end
   end
 end

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

@@ -60,7 +60,7 @@ popd
           else
             cmd = sync_bash_command('origin', cmd)
           end
-          do_execute(env[:machine], cmd) 
+          do_execute(env[:machine], cmd)
           @app.call(env)
         end
       end

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

@@ -27,14 +27,13 @@ module Vagrant
         end
 
         def call(env)
-          git_clone_commands = ""
+          git_clone_commands = "set -e\n"
           Constants.repos(env).each do |repo_name, url|
             bare_repo_name = repo_name + "-bare"
             bare_repo_path = Constants.build_dir + bare_repo_name
             repo_path = Constants.build_dir + repo_name
 
             git_clone_commands += %{
-(
 if [ -d #{bare_repo_path} ]; then
 rm -rf #{repo_path}
 echo 'Cloning #{repo_name} ...'
@@ -48,13 +47,10 @@ git clone --quiet #{bare_repo_path} #{repo_path}
 else
 MISSING_REPO+='#{bare_repo_name}'
 fi
-) &
-PIDS+=$!\" \";
 }
           end
 
           git_clone_commands += %{
-[ -n \"$PIDS\" ] && wait $PIDS
 if [ -n \"$MISSING_REPO\" ]; then
 echo 'Missing required upstream repositories:'
 echo $MISSING_REPO

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

@@ -35,7 +35,7 @@ module Vagrant
    UserKnownHostsFile=/dev/null
           }}
 
-          git_clone_commands = ""
+          git_clone_commands = "set -e\n"
           Constants.repos(env).each do |repo_name, url|
             bare_repo_name = repo_name + "-bare"
             bare_repo_path = Constants.build_dir + bare_repo_name
@@ -46,14 +46,11 @@ module Vagrant
 
             git_clone_commands += %{
 if [ ! -d #{bare_repo_path} ]; then
-git clone --quiet --bare #{url} #{bare_repo_path} >/dev/null &
-PIDS+=$!\" \"
+git clone --quiet --bare #{url} #{bare_repo_path} >/dev/null
 fi
 }
           end
 
-          git_clone_commands += "[ -n \"$PIDS\" ] && wait $PIDS\n"
-
           sudo(env[:machine], "mkdir -p #{Constants.build_dir}")
           sudo(env[:machine], "mkdir -p #{Constants.build_dir + "builder"} && chown -R #{ssh_user}:#{ssh_user} #{Constants.build_dir}")
           do_execute env[:machine], git_clone_commands

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

@@ -62,10 +62,10 @@ module Vagrant
             'instance_name' => box_info[:instance_name],
             'os' => os,
             'dev_cluster' => false,
-            'insert_key' => (stage == :inst),
+            'insert_key' => ((stage == :inst) || (stage == :bootstrap)) && !@options[:no_insert_key],
             'num_minions' => 2,
             'cpus' => 2,
-            'memory' => 1024,
+            'memory' => 2048,
             'rebuild_yum_cache' => false
           }
 

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

@@ -41,7 +41,7 @@ ORIGIN_PATH=/data/src/github.com/openshift/origin
 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 OPENSHIFTCONFIG=/openshift.local.config/master/admin.kubeconfig
+export KUBECONFIG=/openshift.local.config/master/admin.kubeconfig
 DELIM
 
 cat > /etc/sysconfig/openshift <<DELIM
@@ -84,7 +84,8 @@ Documentation=https://github.com/openshift/origin
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/openshift
-ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://\\${HOST}:8443
+ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --cors-allowed-origins=.* --public-master=https://\\${HOST}:8443
+LimitNOFILE=4096
 
 [Install]
 WantedBy=multi-user.target

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

@@ -26,17 +26,29 @@ module Vagrant
         end
 
         def call(env)
+          # Workaround to vagrant inability to guess interface naming sequence
+          # Tell system to abandon the new naming scheme and use eth* instead
+          is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
+          if is_fedora
+            sudo(env[:machine], %{
+if ! [[ -L /etc/udev/rules.d/80-net-setup-link.rules ]]; then
+  ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+  rm -f /etc/sysconfig/network-scripts/ifcfg-enp0s3
+fi
+            })
+          end
+
           ssh_user = env[:machine].ssh_info[:username]
           # 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", {:timeout=>60*10})
-          sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*5})
+          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*20})
+          sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*10})
           #
           # 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", {:timeout=>60*5})
+          sudo(env[:machine], "yum install -y golang golang-pkg-linux-amd64 golang-src", {:timeout=>60*10})
           #
           sudo(env[:machine], %{
 
@@ -78,10 +90,6 @@ chown -R #{ssh_user}:#{ssh_user} /data
 systemctl daemon-reload
 systemctl enable docker
 systemctl start docker
-
-docker pull openshift/docker-registry
-docker pull openshift/origin-sti-builder
-docker pull openshift/origin-deployer
           }, {:timeout=>60*30})
           @app.call(env)
         end

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

@@ -39,13 +39,9 @@ module Vagrant
           Dir.chdir(go_path) do
             commands = "echo 'Waiting for the cloning process to finish'\n"
             Constants.openshift_repos.each do |repo, url|
-              commands += %{
-( #{repo_checkout_bash_command(repo, url)} ) &
-PIDS+=$!\" \";
-}
+              commands += repo_checkout_bash_command(repo, url)
             end
 
-            commands += "[ -n \"$PIDS\" ] && wait $PIDS\n"
             system(commands)
             puts "OpenShift repositories cloned into #{Dir.pwd}"
           end

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

@@ -37,40 +37,46 @@ systemctl restart docker
           }
         end
 
-        def build_image(image_name, git_ref, repo_url, registry)
+        def push_image(image_name, git_ref, registry)
           %{
 set -e
+pushd /data/src/github/openshift/#{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
+# FIXME: Paralelize this
+docker push -f #{registry}#{image_name}-centos7:$git_ref
+docker push -f #{registry}#{image_name}-centos7:latest
+docker push -f docker.io/#{image_name}-centos7:latest
+docker push -f #{registry}#{image_name}-rhel7:$git_ref
+docker push -f #{registry}#{image_name}-rhel7:latest
+popd
+set +e
+          }
+        end
+
+        def build_image(image_name, git_ref, repo_url, registry)
+          %{
 dest_dir="/data/src/github/openshift/#{image_name}"
 rm -rf ${dest_dir}; mkdir -p ${dest_dir}
-if git clone #{repo_url} ${dest_dir}; then
-  pushd ${dest_dir}
-    git checkout #{git_ref}
-    git_ref=$(git rev-parse --short HEAD)
-    echo "Building #{image_name}:$git_ref"
-
-    if make build TARGET=centos7; then
-      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 -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
+set -e
+pushd ${dest_dir}
+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
+make build TARGET=centos7
+echo "Building and testing #{image_name}-rhel7:$git_ref ..."
+make test TARGET=rhel7
+make build TARGET=rhel7
+popd
+set +e
           }
         end
 
@@ -98,14 +104,20 @@ fi
           end
 
           cmd += %{
-set -x; set +e
-echo "Pre-pulling base images"
+set -x
+set +e
+echo "Pre-pulling base images ..."
 docker pull #{@options[:registry]}openshift/base-centos7
 [[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-centos7 openshift/base-centos7
 docker pull #{@options[:registry]}openshift/base-rhel7
 [[ "$?" == "0" ]] && docker tag #{@options[:registry]}openshift/base-rhel7 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
+          }
+
           # 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")
@@ -114,6 +126,7 @@ docker pull #{@options[:registry]}openshift/base-rhel7
 
           build_images = @options[:build_images].split(",").map { |i| i.strip }
 
+          push_cmd = ""
           build_images.each do |image|
             name, git_ref = image.split(':')
             repo_url = Vagrant::Openshift::Constants.openshift_images[name]
@@ -122,8 +135,11 @@ docker pull #{@options[:registry]}openshift/base-rhel7
               next
             end
             cmd += build_image(name, git_ref, repo_url, @options[:registry])
+            push_cmd += push_image(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])
 
           do_execute(env[:machine], cmd)

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

@@ -48,9 +48,9 @@ popd >/dev/null
         }
           exit_code = 0
           if as_root
-            _,_,exit_code = sudo(env[:machine], cmd, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
+            _,_,exit_code = sudo(env[:machine], cmd, {:timeout => 60*60*2, :fail_on_error => false, :verbose => false})
           else
-            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
+            _,_,exit_code = do_execute(env[:machine], cmd, {:timeout => 60*60*2, :fail_on_error => false, :verbose => false})
           end
           exit_code
         end

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

@@ -64,6 +64,9 @@ module Vagrant
             end
             command += "git push -q verifier:#{Constants.build_dir + repo_name }-bare #{branch}:master --tags --force"
             system(command)
+            if $?.exitstatus != 0
+              exit $?.exitstatus
+            end
           ensure
             reset_temp_commit
           end

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

@@ -27,7 +27,7 @@ module Vagrant
 
         def call(env)
           env[:machine].env.ui.info("Synchronizing upstream sources\n")
-          command = ""
+          command = "set -e\n"
 
           Constants.repos(env).each do |repo_name, url|
 
@@ -40,7 +40,6 @@ module Vagrant
 
             command += "export GIT_SSH=#{Constants.git_ssh};\n" unless Constants.git_ssh.nil? or Constants.git_ssh.empty?
             command += %{
-(
 if [ ! -d #{bare_repo_wc_path} ]; then
 echo 'Cloning #{repo_name} ...'
 git clone -l --quiet #{bare_repo_path} #{bare_repo_wc_path}
@@ -52,13 +51,9 @@ git fetch upstream
 git checkout master
 git reset --hard upstream/#{branch}
 git push origin master -f
-) &
-PIDS+=$!\" \";
 }
           end
 
-          command += "[ -n \"$PIDS\" ] && wait $PIDS\n"
-
           do_execute(env[:machine], command)
 
           env[:machine].env.ui.info("Done")

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

@@ -31,7 +31,8 @@ module Vagrant
             :os       => 'centos7',
             :stage    => 'inst',
             :port_mappings => [],
-            :no_synced_folders => false
+            :no_synced_folders => false,
+            :no_insert_key => false
           }
 
           valid_stage = ['os','deps','inst', 'bootstrap']
@@ -56,6 +57,10 @@ module Vagrant
             o.on('--no-synced-folders', 'Checkout source into image rather than mapping from host system') do |f|
               options[:no_synced_folders] = true
             end
+
+            o.on('--no-insert-key', 'Insert a secure ssh key on vagrant up') do |f|
+              options[:no_insert_key] = true
+            end
           end
 
           # Parse the options

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

@@ -30,7 +30,6 @@ module Vagrant
           options = {}
           options[:image] = nil
           options[:ref] = 'master'
-          options[:image_version] = ""
           options[:source] = nil
           options[:base_images] = false
           options[:registry] = ""
@@ -47,10 +46,6 @@ module Vagrant
               options[:ref] = o
             end
 
-            o.on("-m", "--image_version VERSION", String, "version of the software") do |o|
-              options[:image_version] = o
-            end
-
             o.on("-s", "--source SOURCE", String, "git repo source url") do |o|
               options[:source] = o
             end
@@ -85,7 +80,6 @@ module Vagrant
           with_target_vms(argv, :reverse => true) do |machine|
             image = options[:image]
             ref = options[:ref]
-            image_version = options[:image_version]
             source = options[:source]
             base_images = options[:base_images]
             registry = options[:registry]
@@ -134,45 +128,16 @@ 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 [ -n "#{image_version}" ]; then
-  BASE_NAME="#{image}-#{image_version}"
-  pushd #{image_version} > /dev/null
-else 
-  BASE_NAME="#{image}"
+if ! make test TARGET=rhel7; then
+    echo "ERROR: #{image}-rhel7 failed testing."
+    exit 1
 fi
-
-IMAGE_NAME="${BASE_NAME}-centos7"
-
-# Build the CentOS7 STI image we use for testing
-docker build -t ${IMAGE_NAME}-candidate .
-status=$?
-
-# Run the STI image test framework
-if [ $status -eq 0 ]; then
-  IMAGE_NAME=${IMAGE_NAME}-candidate ./test/run
-  status=$?
+  
+if ! make test TARGET=centos7; then
+    echo "ERROR: #{image}-centos7 failed testing."
+    exit 1
 fi
 
-if [ $status -eq 0 -a -f Dockerfile.rhel7 ]; then
-  mv Dockerfile Dockerfile.centos7
-  mv Dockerfile.rhel7 Dockerfile
-
-  IMAGE_NAME="${BASE_NAME}-rhel7"
-
-  # Build the RHEL7 based STI image we use for testing
-  docker build -t ${IMAGE_NAME}-candidate .
-  status=$?
-
-  # Run the STI image test framework
-  if [ $status -eq 0 ]; then
-    IMAGE_NAME=${IMAGE_NAME}-candidate ./test/run
-    status=$?
-  fi
-fi
-
-# If software version is set, go back to the repository root
-[ -n "#{image_version}" ] && popd > /dev/null
-
 # clean up
 cd /
 rm -rf $temp_dir

data/lib/vagrant-openshift/plugin.rb

@@ -137,16 +137,6 @@ module Vagrant
         Commands::TestOpenshiftImage
       end
 
-      command "install-openshift-router" do
-        require_relative "command/install_openshift_router"
-        Commands::InstallOpenshiftRouter
-      end
-
-      command "install-docker-registry" do
-        require_relative 'command/install_docker_registry'
-        Commands::InstallDockerRegistry
-      end
-
       command "bootstrap-openshift" do
         require_relative 'command/bootstrap_openshift'
         Commands::BootstrapOpenshift

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,6 @@ files:
 - Rakefile
 - lib/vagrant-openshift.rb
 - lib/vagrant-openshift/action.rb
-- lib/vagrant-openshift/action/bootstrap_openshift.rb
 - lib/vagrant-openshift/action/build_openshift.rb
 - lib/vagrant-openshift/action/build_openshift_base_images.rb
 - lib/vagrant-openshift/action/build_sti.rb
@@ -132,18 +131,15 @@ files:
 - lib/vagrant-openshift/action/clone_upstream_repositories.rb
 - lib/vagrant-openshift/action/create_ami.rb
 - lib/vagrant-openshift/action/create_bare_repo_placeholders.rb
-- lib/vagrant-openshift/action/create_sample_project.rb
 - lib/vagrant-openshift/action/create_yum_repositories.rb
 - lib/vagrant-openshift/action/download_artifacts_openshift.rb
 - lib/vagrant-openshift/action/download_artifacts_sti.rb
 - lib/vagrant-openshift/action/generate_template.rb
-- lib/vagrant-openshift/action/install_docker_registry.rb
 - lib/vagrant-openshift/action/install_openshift.rb
 - lib/vagrant-openshift/action/install_openshift_asset_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift_base_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift_images.rb
 - lib/vagrant-openshift/action/install_openshift_rhel7.rb
-- lib/vagrant-openshift/action/install_openshift_router.rb
 - lib/vagrant-openshift/action/local_openshift_checkout.rb
 - lib/vagrant-openshift/action/modify_ami.rb
 - lib/vagrant-openshift/action/modify_instance.rb
@@ -156,11 +152,9 @@ files:
 - lib/vagrant-openshift/action/set_host_name.rb
 - lib/vagrant-openshift/action/setup_bind_dns_key.rb
 - lib/vagrant-openshift/action/setup_bind_host.rb
-- lib/vagrant-openshift/action/setup_sample_policy.rb
 - lib/vagrant-openshift/action/sync_local_repository.rb
 - lib/vagrant-openshift/action/sync_upstream_repository.rb
 - lib/vagrant-openshift/action/test_exit_code.rb
-- lib/vagrant-openshift/action/wait_for_openshift.rb
 - lib/vagrant-openshift/action/yum_update.rb
 - lib/vagrant-openshift/command/bootstrap_openshift.rb
 - lib/vagrant-openshift/command/build_openshift.rb
@@ -170,10 +164,8 @@ files:
 - lib/vagrant-openshift/command/checkout_repositories.rb
 - lib/vagrant-openshift/command/clone_upstream_repositories.rb
 - lib/vagrant-openshift/command/create_ami.rb
-- lib/vagrant-openshift/command/install_docker_registry.rb
 - lib/vagrant-openshift/command/install_openshift.rb
 - lib/vagrant-openshift/command/install_openshift_assets_base.rb
-- lib/vagrant-openshift/command/install_openshift_router.rb
 - lib/vagrant-openshift/command/local_openshift_setup.rb
 - lib/vagrant-openshift/command/modify_ami.rb
 - lib/vagrant-openshift/command/modify_instance.rb
@@ -215,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to manage OpenShift Origin environments

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

@@ -1,34 +0,0 @@
-#--
-# Copyright 2015 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class BootstrapOpenshift
-        include CommandHelper
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          do_execute(env[:machine], %q[echo "Bootstrap OpenShift Environment"])
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,39 +0,0 @@
-#--
-# Copyright 2015 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class CreateSampleProject
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          puts %q[Creating sample OpenShift project 'Turbo']
-
-          sudo(env[:machine], %q[
-              openshift admin new-project turbo --admin=admin --description='Turbo Sample' --display-name='Turbo Sample'
-          ])
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,47 +0,0 @@
-#--
-# Copyright 2015 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class InstallDockerRegistry
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          puts 'Installing docker registry'
-          sudo(env[:machine], %q[
-#set -x
-source /etc/profile.d/openshift.sh
-
-CMD="openshift admin registry --create --credentials=${OPENSHIFTCONFIG}"
-OS_RUNNING=$(systemctl status openshift | /bin/grep "(running)")
-if [[ $OS_RUNNING ]]; then
-  ${CMD}
-else
-  echo "The OpenShift process is not running.  To install a docker registry please start OpenShift and run ${CMD}"
-fi
-])
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-#--
-# 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class InstallOpenshiftRouter
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          puts 'Installing router'
-          sudo(env[:machine], '
-OS_RUNNING=$(systemctl status openshift | grep "(running)")
-CMD="openshift ex router --create --credentials=${OPENSHIFTCONFIG}"
-
-if [[ $OS_RUNNING ]]; then
-  ROUTER_EXISTS=$(openshift ex router --credentials=${OPENSHIFTCONFIG} 2>&1 | grep "service exists")
-  if [[ -z $ROUTER_EXISTS ]]; then
-    echo "Installing OpenShift router"
-    ${CMD}
-  else
-    echo "Router already exists, skipping"
-  fi
-else
-  echo "The OpenShift process is not running.  To install a router please start OpenShift and run ${CMD}"
-fi
-
-
-')
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-#--
-# Copyright 2015 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class SetupSamplePolicy
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          puts 'Creating cluster-admin policy'
-
-          sudo(env[:machine], %q[
-#set -x
-
-source /etc/profile.d/openshift.sh
-openshift admin policy add-role-to-group cluster-admin system:authenticated --config=${OPENSHIFTCONFIG} --namespace=master
-          ])
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,61 +0,0 @@
-#--
-# Copyright 2015 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require 'open-uri'
-require 'openssl'
-require 'uri'
-
-module Vagrant
-  module Openshift
-    module Action
-      class WaitForOpenshift
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          puts 'Waiting on openshift...'
-
-          uri    = URI.parse('https://localhost:8443/api')
-          status = nil
-          begin
-            until '200' == status
-              uri.open(ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE, read_timeout: 10) do |response|
-                status = response.status[0]
-                if '200' == status
-                  puts "...#{response.status[1]}"
-                else
-                  puts "...#{response.status[1]}:#{status}"
-                  sleep 1
-                end
-              end
-            end
-          rescue OpenSSL::SSL::SSLError, Errno::ECONNRESET, OpenURI::HTTPError
-            sleep 1
-            retry
-          rescue => e
-            puts "#{e.class}: #{e.message}"
-            raise
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-#--
-# Copyright 2013 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class InstallDockerRegistry < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "installs docker registry as container"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-docker-registry [vm-name]"
-            o.separator ""
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_docker_registry(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-#--
-# Copyright 2013 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class InstallOpenshiftRouter < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "installs openshift router"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-openshift-router [vm-name]"
-            o.separator ""
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_openshift_router(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end