vagrant-openshift 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f42ad6eeea81faac5dc4094f66c540759b5276
-  data.tar.gz: c6f5b108e6fea0f10d3023204ae3bf44e78051bc
+  metadata.gz: e99424d02a9d9cf48ecfe8b86623f866c41f67ae
+  data.tar.gz: a9394c7c854bd35e0a2b0b75486fa842469cdbff
 SHA512:
-  metadata.gz: 10b73600f020405ff442a623b791af60cee555d494cead79959fac324c3ef5bb409937f46bfb80298c82a6f8a13bf35b07eab8d65f29c8d30b6dbfd82e86f245
-  data.tar.gz: 78059996e90d5fdc8ca322c4c3c03f9ba11844f54de8de83553c71df7a928ad786c9fb81d4dc2818cb5a53adfb0682dcf1d777da54bd618d0e7a356d1230b061
+  metadata.gz: 586312d43c42cb95f7464e97ba75d9eb56638784038cbb8d7810fb837a145186e3119218e518977e2c3e31ab0b9f8caf13b489935c31c58e65c52587052f6b48
+  data.tar.gz: d5b882400527319a834c92ab70f9231e2fa643e198898dd6e5744758b2a14dbecf8e5e05c92b8178d89329d33d43de97321c9bb8e3de218bf095eee2200966d8

data/README.asciidoc

@@ -33,59 +33,30 @@ Compile an install the plugin using Rake
 $ rake vagrant:install
 ----
 
-=== Getting started
+=== Getting started with Openshift v3
 
 ==== Clone the OpenShift Origin repositories
 
-===== Geard
-
 [source, sh]
 ----
 $ echo "export GOPATH=~/code" >> ~/.bash_profile   # ~/code can be any dir
 $ source ~/.bash_profile
 $ cd $GOPATH
-$ vagrant geard-local-checkout -u <github username>
-----
-
-===== OpenShift 2.x
-
-[source, sh]
-----
-$ vagrant origin-local-checkout -u <github username>
+$ vagrant openshift3-local-checkout -u <github username>
+$ cd github.com/src/openshift/origin
 ----
 
-This will clone several repositories from link:http://www.github.com[GitHub] and link them against the upstream repositories.
-
-NOTE: Skip this step if building upstream code
 
 ==== Initialize the Vagrantfile
 
-Create a Vagrantfile and customize it to match your requirements:
-
-[source, sh]
-----
-$ vagrant origin-init <instance name>
-----
-
-.Command options:
-
-* Specify which OS to build with:
-** --os fedora		- Launch a Fedora 20 image (used for Geard development)
-** --os rhel6		- Launch a RHEL 6 image (where available)
-** --os centos6		- Launch a CentOS 6 image (where available, used for OpenShift 2.x development)
-
-* Specify the stage of image to launch:
-** --stage os    - Launch the base operating system with no OpenShift dependencies
-** --stage deps  - Launch the image with OpenShift dependencies already installed
-** --stage inst  - Launch the image with OpenShift fully installed
-
-.So to launch the latest OpenShift instance:
+Generate a .vagrant-openshift.json it to match your requirements:
 
 [source, sh]
 ----
 $ vagrant origin-init --stage inst --os fedora <instance name>
 ----
 
+
 ==== Start the machine
 
 ===== VirtualBox
@@ -104,61 +75,76 @@ Note: See Other Environments below for launching against other options.
 
 * Syncing and building code from local repository clones
 
-===== Geard
+[source, sh]
+----
+$ vagrant sync-openshift3
+----
+
+
+==== Running Tests
 
 [source, sh]
 ----
-$ vagrant sync-geard
+$ vagrant test-openshift3 --all
 ----
 
 
-===== OpenShift 2.x
+=== Getting started with Openshift v2
+
+==== Clone the OpenShift Origin repositories
 
 [source, sh]
 ----
-$ vagrant sync
+$ vagrant openshift2-local-checkout -u <github username>
 ----
 
+This will clone several repositories from link:http://www.github.com[GitHub] and link them against the upstream repositories.
 
-==== Running OpenShift Origin Tests
+NOTE: Skip this step if building upstream code
 
-===== Geard
+==== Initialize the Vagrantfile
+
+Create a Vagrantfile and customize it to match your requirements:
 
 [source, sh]
 ----
-$ vagrant test-geard --all
+$ vagrant origin-init --stage inst --os centos6 <instance name>
 ----
 
+==== Start the machine
+
+===== VirtualBox
 
-===== OpenShift 2.x
+Running with the default VirtualBox provider
 
 [source, sh]
 ----
-$ vagrant test --all
+vagrant up
 ----
 
-== Other Notes
+Note: See Other Environments below for launching against other options.
 
-==== Install OpenShift and its Dependencies
 
-If starting from --stage os, install the build and package dependencies.
+==== Making Subsequent Changes
 
-===== Geard
+* Syncing and building code from local repository clones
 
 [source, sh]
 ----
-$ vagrant build-geard-base
-$ vagrant install-geard
+$ vagrant sync-openshift2
 ----
 
-===== OpenShift 2.x
+
+==== Running Tests
 
 [source, sh]
 ----
-$ vagrant origin-build-base
-$ vagrant sync --clean
+$ vagrant test-openshift2 --all
 ----
 
+
+== Other Notes
+
 ==== Other Environments
 
 ===== AWS/EC2
@@ -291,7 +277,7 @@ certtool --generate-certificate --load-privkey clientkey.pem \
 
 ----
 LIBVIRTD_ARGS="--listen"
----- 
+----
 
 ** Restart libvirtd
 

data/lib/vagrant-openshift/action/{build_sources.rb → build_openshift2.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildSources
+      class BuildOpenshift2
         include CommandHelper
 
         def initialize(app, env)
@@ -36,4 +36,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant-openshift/action/{build_geard.rb → build_openshift3.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildGeard
+      class BuildOpenshift3
         include CommandHelper
 
         def initialize(app, env)
@@ -26,11 +26,15 @@ module Vagrant
         end
 
         def call(env)
-          do_execute(env[:machine], sync_bash_command('geard', %{
-echo "Performing geard build..."
+          do_execute(env[:machine], sync_bash_command('origin', %{
+echo "Performing openshift build..."
 set -e
-contrib/build -s
-          }))
+hack/build-go.sh
+if [ ! -d _output/etcd ]
+then
+  hack/install-etcd.sh
+fi
+}))
 
           @app.call(env)
         end

data/lib/vagrant-openshift/action/{build_geard_images.rb → build_openshift3_images.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildGeardImages
+      class BuildOpenshift3Images
         include CommandHelper
 
         def initialize(app, env, options)
@@ -30,9 +30,9 @@ module Vagrant
           # FIXME: Measure what would be the appropriate timeout here as the
           #        docker build command can take quite a long time...
           #
-          @options[:geard_images].each do |geard_image, _|
-            docker_image_name = "openshift/#{geard_image}"
-            docker_file_path = "#{Constants.build_dir}#{geard_image}"
+          @options[:openshift3_images].each do |openshift3_image, _|
+            docker_image_name = "openshift/#{openshift3_image}"
+            docker_file_path = "#{Constants.build_dir}#{openshift3_image}"
             build_cmd = %{
 echo "Building #{docker_image_name} image"
 pushd #{docker_file_path}
@@ -40,9 +40,9 @@ pushd #{docker_file_path}
 popd
             }
             if @options[:force]
-              sudo(env[:machine], build_cmd, { :timeout => 60*20 })
+              sudo(env[:machine], build_cmd, { :timeout => 60*20, :verbose => false })
             else
-              sudo(env[:machine], sync_bash_command(geard_image, build_cmd), { :timeout => 60*20 })
+              sudo(env[:machine], sync_bash_command(openshift3_image, build_cmd), { :timeout => 60*20, :verbose => false })
             end
           end
           @app.call(env)

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

@@ -0,0 +1,50 @@
+#--
+# 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 BuildOpenshift3InfrastructureImages
+        include CommandHelper
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options
+        end
+
+        def call(env)
+          # FIXME: Measure what would be the appropriate timeout here as the
+          #        docker build command can take quite a long time...
+          #
+          @options[:openshift3_infrastructure_images].each do |openshift3_image, _|
+            docker_image_name = "openshift/#{openshift3_image}"
+            docker_file_path = "#{Constants.build_dir}#{Vagrant::Openshift::Constants.openshift3_infrastructure_images[openshift3_image]}"
+            build_cmd = %{
+echo "Building #{docker_image_name} image"
+pushd #{docker_file_path}
+  docker build --rm #{@options[:force] ? "--no-cache" : ""} -t #{docker_image_name} .
+popd
+            }
+            sudo(env[:machine], build_cmd, { :timeout => 60*20, :verbose => false })
+          end
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/action/{checkout_tests.rb → checkout_openshift2_tests.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class CheckoutTests
+      class CheckoutOpenshift2Tests
         include CommandHelper
 
         def initialize(app, env)
@@ -54,4 +54,4 @@ Listen 81
       end
     end
   end
-end
+end

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

@@ -28,7 +28,7 @@ module Vagrant
 
         def call(env)
           git_clone_commands = ""
-          Constants.repos.each do |repo_name, url|
+          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

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

@@ -26,10 +26,8 @@ module Vagrant
         end
 
         def call(env)
-          is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
-
           git_clone_commands = ""
-          Constants.repos.each do |repo_name, url|
+          Constants.repos(env).each do |repo_name, url|
             bare_repo_name = repo_name + "-bare"
             wc_repo_name = repo_name + "-bare-working_copy"
             bare_repo_path = Constants.build_dir + bare_repo_name

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

@@ -34,7 +34,7 @@ module Vagrant
           }}
 
           git_clone_commands = ""
-          Constants.repos.each do |repo_name, url|
+          Constants.repos(env).each do |repo_name, url|
             bare_repo_name = repo_name + "-bare"
             bare_repo_path = Constants.build_dir + bare_repo_name
 

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

@@ -33,7 +33,7 @@ module Vagrant
 }}
 
           git_clone_commands = ""
-          Constants.repos.each do |repo_name, url|
+          Constants.repos(env).each do |repo_name, url|
             bare_repo_name = repo_name + "-bare"
             bare_repo_path = Constants.build_dir + bare_repo_name
 

data/lib/vagrant-openshift/action/{create_puppet_file.rb → create_openshift2_puppet_file.rb}

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

data/lib/vagrant-openshift/action/{create_test_users.rb → create_openshift2_test_users.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class CreateTestUsers
+      class CreateOpenshift2TestUsers
         include CommandHelper
 
         def initialize(app, env)
@@ -33,4 +33,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant-openshift/action/{download_artifacts.rb → download_artifacts_openshift2.rb}

@@ -18,7 +18,7 @@ require 'pathname'
 module Vagrant
   module Openshift
     module Action
-      class DownloadArtifacts
+      class DownloadArtifactsOpenshift2
         include CommandHelper
 
         def initialize(app, env)
@@ -55,11 +55,10 @@ module Vagrant
               FileUtils.mkdir_p File.dirname(target.to_s)
             end
 
-            command = "/usr/bin/rsync -avz -e 'ssh -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
+            command = "/usr/bin/rsync -avz -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
 
             if not system(command)
-              machine.ui.warn "Unable to download artifact"
-              machine.ui.warn r.stderr
+              machine.ui.warn "Unable to download artifacts"
             end
           end
           @app.call(env)

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

@@ -0,0 +1,61 @@
+#--
+# 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 'pathname'
+
+module Vagrant
+  module Openshift
+    module Action
+      class DownloadArtifactsOpenshift3
+        include CommandHelper
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          machine = @env[:machine]
+          machine.ui.info "Downloading logs"
+          ssh_info = machine.ssh_info
+          private_key_path = ssh_info[:private_key_path].kind_of?(Array) ? ssh_info[:private_key_path][0] : ssh_info[:private_key_path]
+
+          artifacts_dir = Pathname.new(File.expand_path(machine.env.root_path + "artifacts"))
+          download_map = {
+            "/var/log/yum.log"                     => artifacts_dir + "yum.log",
+            "/var/log/secure"                      => artifacts_dir + "secure",
+            "/var/log/audit/audit.log"             => artifacts_dir + "audit.log"
+          }
+
+          download_map.each do |source,target|
+            machine.ui.info "Downloading artifacts from '#{source}' to '#{target}'"
+            if target.to_s.end_with? '/'
+              FileUtils.mkdir_p target.to_s
+            else
+              FileUtils.mkdir_p File.dirname(target.to_s)
+            end
+
+            command = "/usr/bin/rsync -avz -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
+
+            if not system(command)
+              machine.ui.warn "Unable to download artifacts"
+            end
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -52,9 +52,46 @@ module Vagrant
           box_info[:aws_creds_file] = @aws_creds_file
           find_ami_from_tag(box_info)
 
-          contents = Vagrant::Util::TemplateRenderer.render(template_path.to_s[0..-5], box_info: box_info)
-          File.open("Vagrantfile", "w+") do |f|
-            f.write(contents)
+          if os == :fedora
+
+            gopath = nil
+            if ENV['GOPATH'] && !ENV['GOPATH'].empty?
+              gopath = File.expand_path(ENV['GOPATH'].split(/:/).last)
+            else
+              gopath = '.'
+            end
+
+            vagrant_openshift_config = {
+              'instance_name' => box_info[:instance_name],
+              'os' => os,
+              'dev_cluster' => false,
+              'num_minions' => 2,
+              'rebuild_yum_cache' => false,
+              'sync_to' => '/data/src',
+              'sync_from' => "#{gopath}/src",
+              'virtualbox' => {
+                'box_name' => box_info[:virtualbox][:box_name],
+                'box_url' => box_info[:virtualbox][:box_url]
+              },
+              'vmware' => {
+                'box_name' => box_info[:vmware][:box_name],
+                'box_url' => box_info[:vmware][:box_url]
+              },
+              'aws' => {
+                  'ami' => box_info[:aws][:ami],
+                  'ami_region' => box_info[:aws][:ami_region],
+                  'ssh_user' => box_info[:aws][:ssh_user]
+              }
+            }
+
+            File.open(".vagrant-openshift.json","w") do |f|
+              f.write(JSON.pretty_generate(vagrant_openshift_config))
+            end
+          else
+            contents = Vagrant::Util::TemplateRenderer.render(template_path.to_s[0..-5], box_info: box_info)
+            File.open("Vagrantfile", "w+") do |f|
+              f.write(contents)
+            end
           end
 
           @app.call(env)
@@ -77,7 +114,8 @@ module Vagrant
 
             aws_compute = Fog::Compute.new(fog_config)
             @env[:ui].info("Searching for latest base AMI")
-            images = aws_compute.images.all({'Owner' => 'self', 'name' => "#{box_info[:aws][:ami_tag_prefix]}*" })
+            images = aws_compute.images.all({'Owner' => 'self', 'name' => "#{box_info[:aws][:ami_tag_prefix]}*",
+                                             'state' => 'available' })
             latest_image = images.sort_by{ |i| i.name.split("_")[-1].to_i }.last
             box_info[:aws][:ami] = latest_image.id
             @env[:ui].info("Found: #{latest_image.id} (#{latest_image.name})")

data/lib/vagrant-openshift/action/{idle_all_gears.rb → idle_all_gears_openshift2.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class IdleAllGears
+      class IdleAllGearsOpenshift2
         include CommandHelper
 
         def initialize(app, env)
@@ -33,4 +33,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant-openshift/action/{install_open_shift_dependencies.rb → install_openshift2_base_dependencies.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenShiftDependencies
+      class InstallOpenshift2BaseDependencies
         include CommandHelper
 
         def initialize(app, env)
@@ -47,4 +47,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant-openshift/action/{install_build_dependencies.rb → install_openshift2_build_dependencies.rb}

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

data/lib/vagrant-openshift/action/{install_geard.rb → install_openshift3.rb}

@@ -17,9 +17,8 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallGeard
+      class InstallOpenshift3
         include CommandHelper
-
         def initialize(app, env)
           @app = app
           @env = env
@@ -30,42 +29,49 @@ module Vagrant
           sudo(env[:machine], %{
 set -x
 # TODO Remove me ASAP
+sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
 setenforce 0
 usermod -a -G docker #{ssh_user}
 
-GEARD_PATH=/data/src/github.com/openshift/geard
-chown -R #{ssh_user}:#{ssh_user} /data
-
-# Modify SSHD config to use gear-auth-keys-command to support git clone from repo
-echo -e '\\nAuthorizedKeysCommand /usr/sbin/gear-auth-keys-command' >> /etc/ssh/sshd_config
-echo -e '\\nAuthorizedKeysCommandUser nobody' >> /etc/ssh/sshd_config
+ORIGIN_PATH=/data/src/github.com/openshift/origin
 
-cat > /etc/profile.d/geard.sh <<DELIM
+cat > /etc/profile.d/openshift.sh <<DELIM
 export GOPATH=/data
-export PATH=$GOPATH/bin:$PATH
-export GEARD_URI=http://172.17.42.1:43273
+export PATH=$GOPATH/bin:$ORIGIN_PATH/_output/etcd/bin:$ORIGIN_PATH/_output/go/bin:$PATH
+# Force using local images instead of always reaching docker hub when doing builds
+export USE_LOCAL_IMAGES=true
 DELIM
 
-# Must listen on docker gateway address for container to access host, see: https://github.com/dotcloud/docker/issues/1143
-GEARD_OPTS=http://172.17.42.1:43273
-cat > /usr/lib/systemd/system/geard.service <<DELIM
+source /etc/profile.d/openshift.sh
+
+go get code.google.com/p/go.tools/cmd/cover
+
+pushd $ORIGIN_PATH
+  hack/install-etcd.sh
+popd
+
+# Force socket reuse
+echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
+
+chown -R #{ssh_user}:#{ssh_user} /data
+
+cat > /usr/lib/systemd/system/openshift.service <<DELIM
 [Unit]
-Description=Gear Provisioning Daemon (geard)
+Description=OpenShift
 After=docker.service
 Requires=docker.service
-Documentation=https://github.com/openshift/geard
+Documentation=https://github.com/openshift/origin
 
 [Service]
 Type=simple
-EnvironmentFile=-/etc/default/gear
-ExecStart=/usr/bin/gear daemon $GEARD_OPTS
+EnvironmentFile=-/etc/profile.d/openshift.sh
+ExecStart=$ORIGIN_PATH/_output/go/bin/openshift start
 
 [Install]
 WantedBy=multi-user.target
 DELIM
 
-systemctl restart sshd
-systemctl enable geard.service
+#systemctl enable openshift.service
           })
 
           @app.call(env)
@@ -73,4 +79,4 @@ systemctl enable geard.service
       end
     end
   end
-end
+end