vagrant-openshift 1.0.20 → 2.0.0

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

@@ -0,0 +1,39 @@
+#--
+# 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/create_yum_repositories.rb

@@ -48,7 +48,7 @@ module Vagrant
           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/openshift-deps.repo", "openshift", "https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/")
+            set_yum_repo(env, "/etc/yum.repos.d/openshift-deps.repo", "openshift-deps", "https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/")
           end
 
           sudo(env[:machine], "yum clean all")

data/lib/vagrant-openshift/action/{download_artifacts_openshift3.rb → download_artifacts_openshift.rb}

@@ -18,7 +18,7 @@ require 'pathname'
 module Vagrant
   module Openshift
     module Action
-      class DownloadArtifactsOpenshift3
+      class DownloadArtifactsOpenshift
         include CommandHelper
 
         def initialize(app, env)

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

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013-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.
@@ -66,10 +66,17 @@ module Vagrant
             'num_minions' => 2,
             'cpus' => 2,
             'memory' => 1024,
-            'rebuild_yum_cache' => false,
-            'sync_to' => '/data/src',
-            'sync_from' => "#{gopath}/src"
+            'rebuild_yum_cache' => false
           }
+
+          vagrant_openshift_config['no_synced_folders'] = @options[:no_synced_folders]
+          if @options[:no_synced_folders]
+            vagrant_openshift_config[:no_synced_folders] = true
+          else
+            vagrant_openshift_config['sync_to']   = '/data/src'
+            vagrant_openshift_config['sync_from'] = "#{gopath}/src"
+          end
+
           vagrant_openshift_config['virtualbox'] = {
             'box_name' => box_info[:virtualbox][:box_name],
             'box_url' => box_info[:virtualbox][:box_url]
@@ -103,7 +110,7 @@ module Vagrant
         private
 
         def find_ami_from_tag(box_info)
-          return if box_info[:aws][:ami_tag_prefix].nil?
+          return if box_info[:aws].nil? || box_info[:aws][:ami_tag_prefix].nil?
           @env[:ui].info("Reading AWS credentials from #{@aws_creds_file.to_s}")
           if @aws_creds_file.exist?
             aws_creds = @aws_creds_file.exist? ? Hash[*(File.open(@aws_creds_file.to_s).readlines.map{ |l| l.strip!

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

@@ -0,0 +1,47 @@
+#--
+# 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_openshift3.rb → install_openshift.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift3
+      class InstallOpenshift
         include CommandHelper
         def initialize(app, env)
           @app = app
@@ -41,7 +41,6 @@ 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 KUBERNETES_MASTER=http://localhost:8080
 export OPENSHIFTCONFIG=/openshift.local.config/master/admin.kubeconfig
 DELIM
 
@@ -55,6 +54,12 @@ pushd $ORIGIN_PATH
   hack/install-etcd.sh
 popd
 
+
+mkdir -p /openshift.local.config/master/
+touch /openshift.local.config/master/admin.kubeconfig
+chmod a+r /openshift.local.config/master/admin.kubeconfig
+
+
 cat > /usr/bin/generate_openshift_service <<OUTERDELIM
 
 HOST=\\`facter ec2_public_hostname 2>/dev/null | xargs echo -n\\`
@@ -80,9 +85,6 @@ 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 [ ! -f /openshift.local.config/master/admin.kubeconfig ] ; do sleep 1; done'
-ExecStartPost=/bin/sleep 1
-ExecStartPost=/bin/chmod a+r /openshift.local.config/master/admin*
 
 [Install]
 WantedBy=multi-user.target

data/lib/vagrant-openshift/action/{install_openshift3_asset_dependencies.rb → install_openshift_asset_dependencies.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift3AssetDependencies
+      class InstallOpenshiftAssetDependencies
         include CommandHelper
 
         def initialize(app, env)

data/lib/vagrant-openshift/action/{install_openshift3_base_dependencies.rb → install_openshift_base_dependencies.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift3BaseDependencies
+      class InstallOpenshiftBaseDependencies
         include CommandHelper
 
         def initialize(app, env)
@@ -47,7 +47,7 @@ setenforce 0
 
 systemctl enable ntpd
 
-groupadd docker
+groupadd -f docker
 usermod -a -G docker #{ssh_user}
 
 sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.0.0/16 \\1'," /etc/sysconfig/docker

data/lib/vagrant-openshift/action/{install_openshift3_images.rb → install_openshift_images.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift3Images
+      class InstallOpenshiftImages
         include CommandHelper
 
         def initialize(app, env)

data/lib/vagrant-openshift/action/{install_openshift3_rhel7.rb → install_openshift_rhel7.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift3Rhel7
+      class InstallOpenshiftRhel7
         include CommandHelper
         def initialize(app, env)
           @app = app

data/lib/vagrant-openshift/action/{install_openshift3_router.rb → install_openshift_router.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift3Router
+      class InstallOpenshiftRouter
         include CommandHelper
 
         def initialize(app, env)
@@ -28,12 +28,12 @@ module Vagrant
         def call(env)
           puts 'Installing router'
           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=${OPENSHIFTCONFIG}"
 
 if [[ $OS_RUNNING ]]; then
-  if [[ -n $ROUTER_EXISTS ]]; then
+  ROUTER_EXISTS=$(openshift ex router --credentials=${OPENSHIFTCONFIG} 2>&1 | grep "service exists")
+  if [[ -z $ROUTER_EXISTS ]]; then
     echo "Installing OpenShift router"
     ${CMD}
   else

data/lib/vagrant-openshift/action/{local_openshift3_checkout.rb → local_openshift_checkout.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class LocalOpenshift3Checkout
+      class LocalOpenshiftCheckout
         include CommandHelper
 
         def initialize(app, env, options)
@@ -38,7 +38,7 @@ module Vagrant
           end
           Dir.chdir(go_path) do
             commands = "echo 'Waiting for the cloning process to finish'\n"
-            Constants.openshift3_repos.each do |repo, url|
+            Constants.openshift_repos.each do |repo, url|
               commands += %{
 ( #{repo_checkout_bash_command(repo, url)} ) &
 PIDS+=$!\" \";

data/lib/vagrant-openshift/action/{push_openshift3_images.rb → push_openshift_images.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class PushOpenshift3Images
+      class PushOpenshiftImages
         include CommandHelper
 
         def initialize(app, env, options)
@@ -78,7 +78,7 @@ fi
           cmd = %{
 rm -rf ~/latest_images ; touch ~/latest_images
           }
-          Vagrant::Openshift::Constants.openshift3_images.each do |name, git_url|
+          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)
@@ -116,7 +116,7 @@ docker pull #{@options[:registry]}openshift/base-rhel7
 
           build_images.each do |image|
             name, git_ref = image.split(':')
-            repo_url = Vagrant::Openshift::Constants.openshift3_images[name]
+            repo_url = Vagrant::Openshift::Constants.openshift_images[name]
             if repo_url == nil
               puts "Unregistered image: #{name}, skipping"
               next

data/lib/vagrant-openshift/action/{push_openshift3_release.rb → push_openshift_release.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class PushOpenshift3Release
+      class PushOpenshiftRelease
         include CommandHelper
 
         def initialize(app, env, options)

data/lib/vagrant-openshift/action/{run_openshift3_tests.rb → run_openshift_tests.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class RunOpenshift3Tests
+      class RunOpenshiftTests
         include CommandHelper
 
         @@SSH_TIMEOUT = 4800

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

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013-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.
@@ -28,7 +28,7 @@ module Vagrant
 
         def call(env)
           unless @options[:action].nil? || @options[:service].nil?
-            sudo(env[:machine], "systemctl #{@options[:action]} #{@options[:service]}")
+            sudo(env[:machine], "systemctl #{@options[:action]} #{@options[:service]} #{@options[:argv]}")
             @app.call(env)
           end
         end

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

@@ -0,0 +1,42 @@
+#--
+# 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/sync_local_repository.rb

@@ -28,7 +28,6 @@ module Vagrant
         def call(env)
           env[:machine].env.ui.info("Synchronizing local sources")
 
-          pids = []
           Constants.repos(env).each do |repo_name, url|
             local_repo = Pathname.new(File.expand_path(File.join(env[:machine].env.root_path, "..", repo_name)))
             unless local_repo.exist?
@@ -39,11 +38,8 @@ module Vagrant
               end
             end
 
-            pids << fork {
-              Dir.chdir(local_repo) { sync_repo(env[:machine], repo_name) }
-            }
+            Dir.chdir(local_repo) { sync_repo(env[:machine], repo_name) }
           end
-          Process.waitall
 
           @app.call(env)
         end

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

@@ -0,0 +1,61 @@
+#--
+# 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