vagrant-openshift 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1d9f532660bb3adc5e3749b5fba4d3c52b1154
-  data.tar.gz: 7ffa2c5f6f5d4a483e0f9896a28d294f1f295654
+  metadata.gz: b6fed7895b9c29e2bc6c343bf45e64e77a7826c1
+  data.tar.gz: f5912d91922785dc54314d6c62bf4ee6643eda98
 SHA512:
-  metadata.gz: 383500d85b7811455243bfbe40b76fe05033bafb0037083b839a4438983866cf236bdcff260c0383cc5ed0ba139db1d11659f0e4bf4bac5792a21b60b2320cab
-  data.tar.gz: b6e221c7ec9637cb95269249e6f3e32189bd7c9184e3b9055bf1fbce15521596cf56017116e6ae0e6576c89270db9d0bc478d355c01c450fb3ea1ad1f8d53878
+  metadata.gz: 1a31420933e35afa585e1d08e7e4a563b455ee71ecb2efff5d6796da1779e6756ca485aa23046ccb147b55d57e0082d12305a4b7b67fa72c52705a8e51f9116c
+  data.tar.gz: 51ebaf5f3f26c9a3cb140f2acbd07479e56bdad3c0015e98bba28724f52b3197c8c0593191d08f578d8b05996004e1de8ab58448abe1fb4b14c9ee734ded37f2

data/README.asciidoc

@@ -423,6 +423,56 @@ $ vagrant build-origin --images
 $ vagrant build-sti --binary-only
 ----
 
+=== Testing openshift/origin-aggregated-logging
+
+NOTE: You will still need to clone the OpenShift Origin repo as above, in order
+to use the Vagrantfile and the contrib/vagrant directory.
+origin-aggregated-logging currently has no vagrant support.
+
+==== Clone the OpenShift Origin aggregated logging repositories
+
+Use `vagrant origin-local-checkout` as above link:#clone-the-openshift-origin-repositories[Clone the OpenShift Origin repositories], except use `--repo origin-aggregated-logging`:
+[source, sh]
+----
+$ cd $GOPATH
+$ vagrant origin-local-checkout --repo origin-aggregated-logging -u <github
+username>
+# run the remaining vagrant commands from $GOPATH/src/github.com/openshift/origin
+$ pushd $GOPATH/src/github.com/openshift/origin
+----
+
+==== Initialize local vagrant conf
+
+Same as above for origin - see link:#initialize-local-vagrant-conf[Initialize local vagrant conf]
+You must be in `$GOPATH/src/github.com/openshift/origin` to run this.
+
+==== Start the machine
+
+Same as above for origin - see link:#start-the-machine[Start the machine]
+You must be in `$GOPATH/src/github.com/openshift/origin` to run this.
+
+==== Making Subsequent Changes
+
+* Building updated code from edits in your local repository clones:
+
+[source, sh]
+----
+$ vagrant sync-origin-aggregated-logging
+----
+
+For some providers, your local repositories are automatically synchronized
+to the remote VM. If not, the `--source` option can be used to do so
+before building.
+You must be in `$GOPATH/src/github.com/openshift/origin` to run this.
+
+==== Running Tests
+
+[source, sh]
+----
+$ vagrant test-origin-aggregated-logging [--env NAME=VAR] ...
+----
+You must be in `$GOPATH/src/github.com/openshift/origin` to run this.
+
 == 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/build_origin_base_images.rb

@@ -34,7 +34,7 @@ pushd /data/src/github.com/openshift/origin
   hack/build-base-images.sh
 popd
 },
-            { :timeout => 60*30, :verbose => false })
+            { :timeout => 60*60*2, :verbose => false })
           @app.call(env)
         end
 

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

@@ -0,0 +1,60 @@
+#--
+# 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.
+#++
+
+module Vagrant
+  module Openshift
+    module Action
+      class BuildOriginImages
+        include CommandHelper
+
+        def initialize(app, env, options={})
+          @app = app
+          @env = env
+          @options = options
+        end
+
+        def call(env)
+          ssh_user = env[:machine].ssh_info[:username]
+
+          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}")
+
+          sudo(env[:machine], %{
+set -e
+
+pushd #{Constants.build_dir}origin/images/base
+sudo cp -r #{Constants.build_dir}x86_64 .
+sudo cp /etc/yum.repos.d/origin_local.repo .
+docker build -t openshift/origin-base -f Dockerfile.rpm .
+popd
+})
+       
+        images = @options[:images].split(",")
+        images.each do |image|
+          sudo(env[:machine], %{
+            pushd #{Constants.build_dir}origin/images/#{image}
+            docker build -t openshift/#{image} -f Dockerfile .
+            popd
+          })
+        end
+
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+#--
+# 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.
+#++
+
+module Vagrant
+  module Openshift
+    module Action
+      class BuildOriginRpmTest
+        include CommandHelper
+
+        def initialize(app, env, options={})
+          @app = app
+          @env = env
+          @options = options
+        end
+
+        def call(env)
+          ssh_user = env[:machine].ssh_info[:username]
+
+          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}")
+
+          sudo(env[:machine], %{
+set -e
+
+sudo yum install -y tito
+
+pushd #{Constants.build_dir}/origin
+sudo yum-builddep ./origin.spec
+sudo tito build --rpm --test -o #{Constants.build_dir}
+popd
+})
+
+          @app.call(env)
+        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 = "set -e\n"
-          Constants.repos(env).each do |repo_name, url|
+          Constants.repos_for_name(@options[:repo]).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

@@ -20,14 +20,15 @@ module Vagrant
       class Clean
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options={})
           @app = app
           @env = env
+          @options = options
         end
 
         def call(env)
           git_clone_commands = ""
-          Constants.repos(env).each do |repo_name, url|
+          Constants.repos_for_name(@options[:repo]).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

@@ -36,7 +36,7 @@ UserKnownHostsFile=/dev/null
 }}
 
           git_clone_commands = "set -e\n"
-          Constants.repos(env).each do |repo_name, url|
+          Constants.repos_for_name(@options[:repo]).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_local_yum_repo.rb

@@ -0,0 +1,54 @@
+#
+# 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.
+#++
+
+module Vagrant
+  module Openshift
+    module Action
+      class CreateLocalYumRepo
+        include CommandHelper
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options
+        end
+
+        def call(env)
+          if @options[:rpmdir_loc]
+            rpmdir_loc = @options[:rpmdir_loc]
+          else
+            rpmdir_loc = "#{Constants.build_dir}x86_64"
+          end
+          ssh_user = env[:machine].ssh_info[:username]
+
+          sudo(env[:machine], %{
+set -e
+
+sudo yum install -y createrepo
+sudo chmod -R og+w #{rpmdir_loc} /etc/yum.repos.d/
+sudo createrepo #{rpmdir_loc}
+sudo printf "[origin_local]\nname=origin_local\nbaseurl=file://#{rpmdir_loc}\nenabled=1\ngpgcheck=0\n" > /etc/yum.repos.d/origin_local.repo
+sudo chmod -R og-w /etc/yum.repos.d/
+sudo yum clean all
+sudo yum repolist all
+})
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -38,16 +38,17 @@ module Vagrant
             "/var/log/secure"                => artifacts_dir + "secure",
             "/var/log/audit/audit.log"       => artifacts_dir + "audit.log",
             "/tmp/openshift/"                => artifacts_dir,
-            "/tmp/origin/e2e/"               => artifacts_dir + "e2e/",
-            "/tmp/openshift-extended-tests/" => artifacts_dir + "extended-tests/",
-            "/tmp/openshift-cmd/"            => artifacts_dir + "cmd/",
-            "/tmp/openshift-integration/"    => artifacts_dir + "integration/",
 
             "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
             "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/"
           }
 
           download_map.each do |source,target|
+            if ! machine.communicate.test("sudo ls #{source}")
+              machine.ui.info "#{source} did not exist on the remote system.  This is often the case for tests that were not run."
+              next
+            end
+
             machine.ui.info "Downloading artifacts from '#{source}' to '#{target}'"
             if target.to_s.end_with? '/'
               FileUtils.mkdir_p target.to_s
@@ -55,7 +56,7 @@ module Vagrant
               FileUtils.mkdir_p File.dirname(target.to_s)
             end
 
-            command = "/usr/bin/rsync -az -e 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
+            command = "/usr/bin/rsync -az -e 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' --exclude='volumes/*' --exclude='volumes/' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
 
             if not system(command)
               machine.ui.warn "Unable to download artifacts"

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

@@ -0,0 +1,67 @@
+#--
+# 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 DownloadArtifactsOriginAggregatedLogging
+        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",
+            "/tmp/origin-aggregated-logging/" => artifacts_dir,
+          }
+
+          download_map.each do |source,target|
+            if ! machine.communicate.test("sudo ls #{source}")
+              machine.ui.info "#{source} did not exist on the remote system.  This is often the case for tests that were not run."
+              next
+            end
+
+            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 -az -e 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' --exclude='volumes/*' --exclude='volumes/' #{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

@@ -65,10 +65,6 @@ module Vagrant
             'os' => os,
             'dev_cluster' => false,
             'insert_key' => (stage == :inst) && !@options[:no_insert_key],
-            'num_minions' => 2,
-            'cpus' => 2,
-            'memory' => 2048,
-            'rebuild_yum_cache' => false,
             'instance_type' => instance_type,
             'volume_size' => volume_size
           }

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

@@ -35,6 +35,8 @@ ASSET_BACKUP_DIR=/data/asset_dependencies
 
 if ! which npm > /dev/null 2>&1 ; then
   sudo yum -y install npm
+  # Update npm, we need a newer version than is installed by yum
+  sudo npm install npm@3.7.3 -g
 fi
 
 }
@@ -69,7 +71,7 @@ popd
 }
           end
 
-          do_execute(env[:machine], cmd, :verbose => false, :timeout=>60*60)
+          do_execute(env[:machine], cmd, :verbose => false, :timeout=>60*60*2)
           @app.call(env)
         end
       end

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

@@ -38,6 +38,26 @@ fi
             }, :verbose => false)
           end
 
+
+          sudo(env[:machine], %{
+if [[ -e /etc/redhat-release && ! -e /etc/fedora-release && ! -e /etc/centos-release ]]; then
+
+cat <<EOF > /etc/yum.repos.d/dockerextra.repo
+[dockerextra]
+name=RHEL Docker Extra
+baseurl=https://mirror.openshift.com/enterprise/rhel/dockerextra/x86_64/os/
+enabled=1
+gpgcheck=0
+failovermethod=priority
+sslverify=False
+sslclientcert=/var/lib/yum/client-cert.pem
+sslclientkey=/var/lib/yum/client-key.pem
+
+EOF
+
+fi
+          }, :timeout=>60*10, :verbose => false)
+
           ssh_user = env[:machine].ssh_info[:username]
           sudo(env[:machine], "yum install -y \
                                 augeas \
@@ -60,6 +80,7 @@ fi
                                 gnuplot \
                                 httpie \
                                 hg \
+                                iscsi-initiator-utils \
                                 jq \
                                 java-1.?.0-openjdk \
                                 kernel-devel \
@@ -107,21 +128,26 @@ unzip chromedriver_linux64.zip
 mv chromedriver /usr/bin/chromedriver
 chown root /usr/bin/chromedriver
 chmod 755 /usr/bin/chromedriver
-          }, :timeout=>60*20, :verbose => false)
+          }, :timeout=>60*60, :verbose => false)
 
           #
           # 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*20, :verbose => false)
+          sudo(env[:machine], "yum install -y golang golang-src", :timeout=>60*20, :verbose => false)
           #
+
+          unless is_fedora
+            sudo(env[:machine], "yum install -y golang-pkg-linux-amd64", :timeout=>60*20, :verbose => false)
+          end
+
           sudo(env[:machine], %{
 set -ex
 
 if [[ -e /etc/redhat-release && ! -e /etc/fedora-release && ! -e /etc/centos-release ]]; then
 
-# create rhaos repo
-cat <<EOF > /etc/yum.repos.d/rhaos.repo
+# create rhaos3.1 and 3.2 repos
+cat <<EOF > /etc/yum.repos.d/rhaos31.repo
 [rhel-7-server-ose-3.1-rpms]
 name=RHEL7 Red Hat Atomic OpenShift 3.1
 baseurl=https://mirror.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
@@ -137,10 +163,27 @@ sslclientcert=/var/lib/yum/client-cert.pem
 sslclientkey=/var/lib/yum/client-key.pem
 
 EOF
+
+cat <<EOF > /etc/yum.repos.d/rhaos32.repo
+[rhel-7-server-ose-3.2-rpms]
+name=RHEL7 Red Hat Atomic OpenShift 3.2
+baseurl=https://mirror.ops.rhcloud.com/enterprise/enterprise-3.2/latest/RH7-RHAOS-3.2/x86_64/os/
+        https://use-mirror1.ops.rhcloud.com/enterprise/enterprise-3.2/latest/RH7-RHAOS-3.2/x86_64/os/
+        https://use-mirror2.ops.rhcloud.com/enterprise/enterprise-3.2/latest/RH7-RHAOS-3.2/x86_64/os/
+        https://euw-mirror1.ops.rhcloud.com/enterprise/enterprise-3.2/latest/RH7-RHAOS-3.2/x86_64/os/
+enabled=1
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
+failovermethod=priority
+sslverify=0
+sslclientcert=/var/lib/yum/client-cert.pem
+sslclientkey=/var/lib/yum/client-key.pem
+
+EOF
+
 fi
 
 if ! test -e /etc/fedora-release; then
-  # TODO Remove me ASAP
   sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
   setenforce 0
 fi
@@ -156,6 +199,24 @@ sed -i "s,^ADD_REGISTRY='\\(.*\\)',#ADD_REGISTRY='--add-registry=docker.io \\1',
 
 cat /etc/sysconfig/docker
 
+
+if sudo lvdisplay docker-vg 2>&1>/dev/null
+then
+  VG="docker-vg"
+elif sudo lvdisplay vg_vagrant 2>&1>/dev/null
+then
+  VG="vg_vagrant"
+elif sudo lvdisplay centos 2>&1>/dev/null
+then
+  VG="centos"
+fi
+if [ -n "${VG}" ]
+then
+  sudo lvcreate -n docker-data -l 90%FREE /dev/${VG}
+  sudo lvcreate -n docker-metadata -l 50%FREE /dev/${VG}
+  sudo sed -i "s,^DOCKER_STORAGE_OPTIONS=.*,DOCKER_STORAGE_OPTIONS='-s devicemapper --storage-opt dm.datadev=/dev/${VG}/docker-data --storage-opt dm.metadatadev=/dev/${VG}/docker-metadata'," /etc/sysconfig/docker-storage
+fi
+
 # Force socket reuse
 echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
 
@@ -177,7 +238,7 @@ set -e
 
   # 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
-    if git checkout c262de870b618eed648983aa994b03bc04641c72
+    if git checkout 108746816ddf01ad0c2dbea08a1baef08bc47313
     then
       # Re-install using this version of the tool
       GOPATH=/data go install golang.org/x/tools/cmd/vet