vagrant-openshift 3.0.8 → 3.0.9

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

@@ -41,7 +41,7 @@ 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], %{
@@ -51,7 +51,7 @@ popd
           })
         end
 
-          
+
           @app.call(env)
         end
       end

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

@@ -55,7 +55,7 @@ module Vagrant
 
           unless is_fedora
             unless env[:machine].communicate.test("rpm -q epel-release")
-              sudo(env[:machine], "yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm")
+              sudo(env[:machine], "yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm")
 
               #Workaround broken RHEL image which does not recover after restart.
               if "VagrantPlugins::AWS::Provider" == env[:machine].provider.class.to_s

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

@@ -35,10 +35,10 @@ module Vagrant
           artifacts_dir = Pathname.new(File.expand_path(machine.env.root_path + "artifacts"))
 
           _,_,exit_code = do_execute machine, "mkdir -p /tmp/openshift && journalctl -u openshift --no-pager > /tmp/openshift/openshift.log", :fail_on_error => false
-          if exit_code != 0 
+          if exit_code != 0
             machine.ui.warn "Unable to dump openshift log from journalctl"
           end
-          
+
           download_map = {
             "/var/log/yum.log"               => artifacts_dir + "yum.log",
             "/var/log/secure"                => artifacts_dir + "secure",

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

@@ -0,0 +1,67 @@
+#--
+# Copyright 2016 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 DownloadArtifactsOriginMetrics
+        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-metrics/"            => 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/install_docker.rb

@@ -0,0 +1,54 @@
+#--
+# Copyright 2016 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 InstallDocker
+        include CommandHelper
+        include InstallHelper
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options.clone
+        end
+
+        def call(env)
+          # Migrate our install script to the host machine
+          ssh_user = @env[:machine].ssh_info[:username]
+          destination="/home/#{ssh_user}/"
+          @env[:machine].communicate.upload(File.join(__dir__,"/../resources/configure_docker.sh"), destination)
+          home="#{destination}/resources"
+
+          isolated_install(
+            @env[:machine],
+            'docker',
+            @options[:"docker.version"],
+            @options[:"docker.repourls"],
+            @options[:"docker.reponames"],
+            @options[:force]
+          )
+
+          # Configure the Docker daemon
+          sudo(@env[:machine], "SSH_USER='#{ssh_user}' #{home}/configure_docker.sh", :timeout=>60*30)
+
+          @app.call(@env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+#--
+# Copyright 2016 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 InstallGolang
+        include CommandHelper
+        include InstallHelper
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options.clone
+        end
+
+        def call(env)
+          isolated_install(
+            @env[:machine],
+            'golang',
+            @options[:"golang.version"],
+            @options[:"golang.repourls"],
+            @options[:"golang.reponames"],
+            @options[:force]
+          )
+
+          if @options[:"golang.version"] =~ %r"^1\.4.*" && ! env[:machine].communicate.test("test -e /etc/fedora-release")
+            # Prior to go1.5, the cgo symbol tables were not provided in the base golang
+            # package on RHEL and CentOS, so if we've installed go1.4.x and we're not on
+            # Fedora, we need to also install `golang-pkg-linux-amd64'
+            sudo(@env[:machine], "yum install -y #{format_versioned_package("golang-pkg-linux-amd64", @options[:"golang.version"])}", :timeout=>60*5)
+          end
+
+          @app.call(@env)
+        end
+      end
+    end
+  end
+end

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

@@ -35,8 +35,11 @@ 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
+  if $(test -e /etc/fedora-release)
+  then
+    # Update npm, we need a newer version than is installed by yum
+    sudo npm install npm@3.7.3 -g
+  fi
 fi
 
 }
@@ -63,7 +66,7 @@ popd
             cmd += %{
   # Make sure tests pass before backing up this asset install
   pushd $ORIGIN_CONSOLE_PATH
-    grunt test
+    hack/test-headless.sh test
   popd
   mkdir -p $ASSET_BACKUP_DIR
   cp -rf $ORIGIN_CONSOLE_PATH/node_modules $ASSET_BACKUP_DIR/node_modules

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

@@ -26,253 +26,38 @@ 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
-            }, :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
+          # Migrate all of our scripts to the host machine
+          ssh_user = @env[:machine].ssh_info[:username]
+          destination="/home/#{ssh_user}/"
+          @env[:machine].communicate.upload(File.join(__dir__,"/../resources"), destination)
+          home="#{destination}/resources"
 
-fi
-          }, :timeout=>60*10, :verbose => false)
+          # Workaround to vagrant inability to guess interface naming sequence:
+          # Tell system to abandon the new naming scheme and use eth* instead if
+          # we're communicating with a Fedora machine
+          sudo(@env[:machine], "#{home}/reconfigure_network_fedora.sh")
 
-          ssh_user = env[:machine].ssh_info[:username]
-          sudo(env[:machine], "yum install -y \
-                                augeas \
-                                bzr \
-                                bridge-utils \
-                                bzip2 \
-                                bind \
-                                btrfs-progs-devel \
-                                bind-utils \
-                                ctags \
-                                device-mapper-devel \
-                                docker-io \
-                                ethtool \
-                                e2fsprogs \
-                                fontconfig \
-                                git \
-                                gcc \
-                                gcc-c++ \
-                                glibc-static \
-                                gnuplot \
-                                httpie \
-                                hg \
-                                iscsi-initiator-utils \
-                                jq \
-                                java-1.?.0-openjdk \
-                                kernel-devel \
-                                libselinux-devel \
-                                libnetfilter_queue-devel \
-                                make \
-                                mlocate \
-                                ntp \
-                                openldap-clients \
-                                openvswitch \
-                                rubygems \
-                                screen \
-                                ShellCheck \
-                                socat \
-                                sqlite-devel \
-                                sysstat \
-                                tig \
-                                tmux \
-                                unzip \
-                                vim \
-                                wget \
-                                xfsprogs \
-                                Xvfb \
-                                yum-utils",:timeout=>60*30, :verbose => false)
+          # Install base dependencies that we cannot continue without
+          sudo(@env[:machine], "#{home}/install_dependencies.sh", :timeout=>60*30)
 
-          sudo(env[:machine], "yum install -y facter", fail_on_error: false, :timeout=>60*20, :verbose => false)
+          # Install dependencies that are nice to have but we can live without
+          sudo(@env[:machine], "#{home}/install_nonessential.sh", :timeout=>60*20, fail_on_error: false)
 
           # Install Chrome and chromedriver for headless UI testing
-          sudo(env[:machine], %{
-set -ex
-cd /tmp
-
-# Add signing key for Chrome repo
-wget https://dl.google.com/linux/linux_signing_key.pub
-rpm --import linux_signing_key.pub
-
-# Add Chrome yum repo
-yum-config-manager --add-repo=http://dl.google.com/linux/chrome/rpm/stable/x86_64
-
-# Install chrome
-yum install -y google-chrome-stable
-
-# Install chromedriver
-wget https://chromedriver.storage.googleapis.com/2.16/chromedriver_linux64.zip
-unzip chromedriver_linux64.zip
-mv chromedriver /usr/bin/chromedriver
-chown root /usr/bin/chromedriver
-chmod 755 /usr/bin/chromedriver
-          }, :timeout=>60*60, :verbose => false)
+          sudo(@env[:machine], "#{home}/install_chrome.sh", :timeout=>60*60)
 
-          sudo(env[:machine], "wget -O /etc/yum.repos.d/openshift-rhel7-dependencies.repo https://mirror.openshift.com/pub/openshift-origin/nightly/rhel-7/dependencies/openshift-rhel7-dependencies.repo", fail_on_error: true, :timeout=>60*20, :verbose => true)
-
-          #
-          # FIXME: Need to install golang packages 'after' the 'gcc' is
-          #        installed. See BZ#1101508
-          #
-          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)
+          # If we're on RHEL, install the OSE RPM repositories
+          is_rhel = @env[:machine].communicate.test("test -e /etc/redhat-release && ! test -e /etc/fedora-release && ! test -e /etc/centos-release")
+          if is_rhel
+            sudo(@env[:machine], "#{home}/install_rhaos_repos.sh")
           end
 
-          sudo(env[:machine], %{
-set -ex
-
-if [[ -e /etc/redhat-release && ! -e /etc/fedora-release && ! -e /etc/centos-release ]]; then
-
-# 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/
-        https://use-mirror1.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
-        https://use-mirror2.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/x86_64/os/
-        https://euw-mirror1.ops.rhcloud.com/enterprise/enterprise-3.1/RH7-RHAOS-3.1/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
-
-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
-  sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
-  setenforce 0
-fi
-
-systemctl enable ntpd
-
-groupadd -f docker
-usermod -a -G docker #{ssh_user}
-
-ADDITIONAL_OPTIONS='--insecure-registry=172.30.0.0/16 --insecure-registry=ci.dev.openshift.redhat.com:5000'
-sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='${ADDITIONAL_OPTIONS} \\1'," /etc/sysconfig/docker
-sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='${ADDITIONAL_OPTIONS} -\\1'," /etc/sysconfig/docker
-sed -i "s,^ADD_REGISTRY='\\(.*\\)',#ADD_REGISTRY='--add-registry=docker.io \\1'," /etc/sysconfig/docker
-
-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
-
-  sudo lvcreate -n openshift-xfs-vol-dir -l 100%FREE /dev/${VG}
-  sudo mkfs.xfs /dev/${VG}/openshift-xfs-vol-dir
-  sudo mkdir -p /mnt/openshift-xfs-vol-dir
-  sudo sh -c "echo /dev/${VG}/openshift-xfs-vol-dir /mnt/openshift-xfs-vol-dir xfs gquota 1 1 >> /etc/fstab"
-  sudo mount /mnt/openshift-xfs-vol-dir
-  sudo chown -R #{ssh_user}:#{ssh_user} /mnt/openshift-xfs-vol-dir
-fi
-
-# Force socket reuse
-echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
-
-mkdir -p /data/src
-mkdir -p /data/pkg
-mkdir -p /data/bin
-
-GO_VERSION=($(go version))
-echo "Detected go version: $(go version)"
-
-# TODO: Remove for go1.5, go vet and go cover will be internal
-if [[ ${GO_VERSION[2]} == "go1.4"* ]]; then
-  GOPATH=/data go get golang.org/x/tools/cmd/cover
-
-# https://groups.google.com/forum/#!topic/golang-nuts/nZLhcbaa3wQ
-set +e
-  GOPATH=/data go get golang.org/x/tools/cmd/vet
-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 108746816ddf01ad0c2dbea08a1baef08bc47313
-    then
-      # Re-install using this version of the tool
-      GOPATH=/data go install golang.org/x/tools/cmd/vet
-    fi
-  popd >/dev/null
-fi
-
-chown -R #{ssh_user}:#{ssh_user} /data
-
-sed -i "s,^#DefaultTimeoutStartSec=.*,DefaultTimeoutStartSec=240s," /etc/systemd/system.conf
-
-# Docker 1.8.2 now sets a TimeoutStartSec of 1 minute.  Unfortunately, for some
-# reason the initial docker start up is now taking > 5 minutes.  Until that is fixed need this.
-sed -i 's,TimeoutStartSec=.*,TimeoutStartSec=10min,'  /usr/lib/systemd/system/docker.service
+          # Configure the machine system
+          sudo(@env[:machine], "SSH_USER='#{ssh_user}' #{home}/configure_system.sh", :timeout=>60*30)
 
-systemctl daemon-reexec
-systemctl daemon-reload
-systemctl enable docker
-time systemctl start docker
-          }, :timeout=>60*30, :verbose => false)
-          @app.call(env)
+          @app.call(@env)
         end
       end
     end
   end
-end
+end