vagrant-openshift 3.0.8 → 3.0.9

data/lib/vagrant-openshift/helper/command_helper.rb

@@ -50,6 +50,14 @@ module Vagrant
           end
         }
 
+        # if verbose output is requested, we don't mess with vagrant's built-in SSH error handling
+        # otherwise, we ask for muted SSH error handling to reduce the clutter
+        if options[:verbose]
+          opts = nil
+        else
+          opts = { :error_key => :ssh_bad_exit_status_muted }
+        end
+
         (0..options[:retries]).each do |retry_count|
           begin
             if options[:verbose]
@@ -59,9 +67,9 @@ module Vagrant
             end
             Timeout::timeout(options[:timeout]) do
               if options[:sudo]
-                rc = machine.communicate.sudo(command, nil, &execute)
+                rc = machine.communicate.sudo(command, opts, &execute)
               else
-                rc = machine.communicate.execute(command, nil, &execute)
+                rc = machine.communicate.execute(command, opts, &execute)
               end
             end
           rescue Timeout::Error
@@ -135,49 +143,65 @@ popd
 
       def repo_checkout_bash_command(repo, url)
         repo_path = File.expand_path(repo)
-        command = ""
-        if Pathname.new(repo_path).exist?
-          if @options[:replace]
-            command += %{
-echo 'Replacing: #{repo_path}'
-pushd #{repo_path}
-  git fetch origin
-  git reset --hard origin/master
-  git clean -fdx
-  set +e
-  git branch | grep -ve " master$" | xargs git branch -D
-  set -e
-popd
-}
-          else
-            command += "echo 'Already cloned: #{repo}'\n"
-          end
-        else
-          command += %{
-cloned=false
-echo 'Cloning #{repo} ...'
-}
-
-          if @options[:user]
-            user_repo_url="git@github.com:#{@options[:user]}/#{repo}"
-            command += %{
-echo 'Cloning #{user_repo_url}'
-git clone --quiet --recurse-submodules #{user_repo_url}
-if [ $? -eq 0 ]; then
-cloned=true
-(cd #{repo} && git remote add upstream #{url} && git fetch upstream)
+        branch = @options[:branch] || 'master'
+        command = %{
+set -e
+clone_repo=false
+if [ -d "#{repo_path}" ]
+then
+  replace_repo=#{@options[:replace] ? "true" : "false"}
+  echo 'Checking repo integrity for #{repo_path}'
+  if (pushd #{repo_path} && git fsck && popd)
+  then
+    if [ "${replace_repo}" = "true" ]
+    then
+      echo 'Replacing: #{repo_path}'
+      pushd #{repo_path}
+        git fetch origin
+        git fetch --prune origin +refs/tags/*:refs/tags/*
+        git reset --merge
+        git checkout #{branch}
+        git reset --hard origin/#{branch}
+        git clean -fdx
+        set +e
+        git branch | grep -ve " #{branch}$" | xargs git branch -D
+        set -e
+        git gc --prune=all
+      popd
+    else
+      echo 'Already cloned: #{repo}'
+    fi
+  else
+    rm -rf #{repo_path}
+    clone_repo=true
+  fi
 else
-echo 'Fork of repo #{repo} not found. Cloning read-only copy from upstream'
+  clone_repo=true
 fi
-}
 
-          end
+if [ "${clone_repo}" = "true" ]
+then
+  cloned=false
+  echo 'Cloning #{repo} ...'
+}
+        if @options[:user]
+          user_repo_url="git@github.com:#{@options[:user]}/#{repo}"
           command += %{
-[ $cloned != true ] && git clone --quiet --recurse-submodules #{url}
-( cd #{repo} && git checkout #{@options[:branch]} &>/dev/null)
+  echo 'Cloning #{user_repo_url}'
+  if git clone --quiet --recurse-submodules #{user_repo_url}
+  then
+    cloned=true
+    (cd #{repo} && git remote add upstream #{url} && git fetch upstream)
+  else
+    echo 'Fork of repo #{repo} not found. Cloning read-only copy from upstream'
+  fi
 }
         end
-
+        command += %{
+  [ "${cloned}" != true ] && git clone --quiet --recurse-submodules #{url}
+  (cd #{repo} && git checkout #{branch} &>/dev/null)
+fi
+}
         command
       end
 

data/lib/vagrant-openshift/helper/install_helper.rb

@@ -0,0 +1,139 @@
+#--
+# 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 InstallHelper
+      include CommandHelper
+
+      # install_from_url installs an RPM repository from the given URL
+      # SSL client certs and keys are installed and provided, but won't
+      # be used unless they are necessary, so repositories that do not
+      # use them can still function correctly with one .repo defenition
+      def install_from_url(url)
+        reponame = url.gsub(/[^a-zA-Z0-9]/,'')
+
+        remote_write(@env[:machine], "/etc/yum.repos.d/#{reponame}.repo") {%{
+[#{reponame}]
+name=#{reponame}
+baseurl=#{url}
+enabled=1
+gpgcheck=0
+sslverify=0
+sslclientcert=/var/lib/yum/client-cert.pem
+sslclientkey=/var/lib/yum/client-key.pem
+}}
+
+        return reponame
+      end
+
+      # assemble_reponames assembles a list of repository names for use
+      # with `yum install`, or provides `*` if no repository names are
+      # provided
+      def assemble_reponames(fresh_install, pre_existing)
+        reponames = []
+
+        # If the user didn't specify any names or install any custom
+        # repositories, default to use all of the normally available
+        # repositories on the system.
+        if fresh_install.empty?() && pre_existing.empty?()
+          reponames << '"*"'
+        else
+          reponames = fresh_install + pre_existing
+        end
+
+        return "--enablerepo=#{reponames.join(" --enablerepo=")}"
+      end
+
+      # format_versioned_package formats a pacakge name with a version
+      # to allow for better UX on the command line. For instance, a
+      # package `docker` should be called `docker` without a version but
+      # `docker-1.11.3` with one, but the user only wants to provide the
+      # `1.11.3` version, not the dash as well, so a simple concat is not
+      # possible
+      def format_versioned_package(name, version)
+        if version
+          "#{name}-#{version}"
+        else
+          name
+        end
+      end
+
+      # uninstall_safely tries to uninstall the given package, but it
+      # will fail if it fails to confirm that only the single package
+      # given will be the removed
+      def uninstall_safely(machine, package, force)
+        stdout, stderr, _ = sudo(machine, "yum remove --assumeno -q #{package}", :timeout=>60, fail_on_error: false)
+
+        # we want to match output like:
+        # Remove  1 Package
+        # Remove  20 Packages
+        # Remove  1 Package (+1 Dependent package)
+        # Remove  20 Packages (+20 Dependent packages)
+        amount_pattern = /Remove\s+([0-9]+)\s+Packages?(\s+\(\+([0-9]+)\s+Dependent\s+packages?\))?/
+        match = amount_pattern.match((stdout+stderr).join(""))
+
+        unless match
+          raise "Package removal statistics not found in `yum` output."
+        end
+
+        # if we can tell there's more than one package being removed, or if
+        # there's any dependent packages being removed, we need to fail the
+        # uninstall process unless the force flag has been set
+        if (match.captures[0].to_i > 1 || match.captures[2]) && !force
+          raise "Removing #{package} would also remove other packages, this is disabled by default for safety."
+        end
+
+        sudo(machine, "yum autoremove -y #{package}", :timeout=>60)
+      end
+
+      # isolated_install runs a full isolated installation of a package,
+      # trying to remove previous versions if possible, setting up and
+      # tearing down extra repositories, etc.
+      def isolated_install(machine, package, version, repourls, reponames, force)
+        # if the package is already installed and we can cleanly uninstall it, we should
+        if machine.communicate.test("yum list installed #{package}")
+          begin
+            uninstall_safely(machine, package, force)
+          rescue Exception => e
+            $stderr.puts "Could not complete #{package} installation process, a previous #{package} install exists and removing it would not be clean:"
+            $stderr.puts e.message
+            $stderr.puts "If you want to continue anyway, try running the vagrant command again with `--force`"
+            exit 1
+          end
+        end
+
+        # Install user-specified repositories
+        extra_repositories = []
+        repourls.each do |url|
+          extra_repositories << install_from_url(url)
+        end
+
+        # Install the package
+        yum_config=%{-y --disablerepo="*"}
+        yum_config+=%{ #{assemble_reponames(extra_repositories, reponames)}}
+        yum_config+=%{ #{format_versioned_package(package, version)}}
+        sudo(machine, "yum install #{yum_config}", :timeout=>60*30)
+
+        # Disable all repositories that were installed for the express purpose of giving us the package
+        extra_repositories.each do |repo|
+          sudo(machine, "yum-config-manager --disable #{repo}", :timeout=>60*30)
+        end
+      end
+
+    end
+  end
+end

data/lib/vagrant-openshift/plugin.rb

@@ -87,6 +87,16 @@ module Vagrant
         Commands::InstallOrigin
       end
 
+      command "install-docker" do
+        require_relative "command/install_docker"
+        Commands::InstallDocker
+      end
+
+      command "install-golang" do
+        require_relative "command/install_golang"
+        Commands::InstallGolang
+      end
+
       command "install-origin-assets-base" do
         require_relative "command/install_origin_assets_base"
         Commands::InstallOriginAssetsBase
@@ -130,7 +140,7 @@ module Vagrant
       command "test-origin-console" do
         require_relative "command/test_origin_console"
         Commands::TestOriginConsole
-      end      
+      end
 
       command "test-sti" do
         require_relative "command/test_sti"
@@ -142,6 +152,16 @@ module Vagrant
         Commands::TestOriginAggregatedLogging
       end
 
+      command "test-origin-metrics" do
+        require_relative "command/test_origin_metrics"
+        Commands::TestOriginMetrics
+      end
+
+      command "test-customer-diagnostics" do
+        require_relative "command/test_customer_diagnostics"
+        Commands::TestCustomerDiagnostics
+      end
+
       command "download-artifacts-origin" do
         require_relative "command/download_artifacts_origin"
         Commands::DownloadArtifactsOrigin
@@ -150,13 +170,18 @@ module Vagrant
       command "download-artifacts-origin-console" do
         require_relative "command/download_artifacts_origin_console"
         Commands::DownloadArtifactsOriginConsole
-      end      
+      end
 
       command "download-artifacts-origin-aggregated-logging" do
         require_relative "command/download_artifacts_origin_aggregated_logging"
         Commands::DownloadArtifactsOriginAggregatedLogging
       end
 
+      command "download-artifacts-origin-metrics" do
+        require_relative "command/download_artifacts_origin_metrics"
+        Commands::DownloadArtifactsOriginAggregatedLogging
+      end
+
       command "download-artifacts-sti" do
         require_relative "command/download_artifacts_sti"
         Commands::DownloadArtifactsSti
@@ -197,6 +222,16 @@ module Vagrant
         Commands::RepoSyncOriginAggregatedLogging
       end
 
+      command "sync-origin-metrics" do
+        require_relative "command/repo_sync_origin_metrics"
+        Commands::RepoSyncOriginMetrics
+      end
+
+      command "sync-customer-diagnostics" do
+        require_relative "command/repo_sync_customer_diagnostics"
+        Commands::RepoSyncCustomerDiagnostics
+      end
+
       provisioner(:openshift) do
         require_relative "provisioner"
         Provisioner

data/lib/vagrant-openshift/resources/configure_docker.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+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
+
+if lvdisplay docker-vg >/dev/null 2>&1; then
+    VG="docker-vg"
+elif lvdisplay vg_vagrant >/dev/null 2>&1; then
+    VG="vg_vagrant"
+elif lvdisplay fedora >/dev/null 2>&1; then
+    VG="fedora"
+elif lvdisplay centos >/dev/null 2>&1; then
+    VG="centos"
+fi
+
+if [[ -n "${VG}" ]]; then
+    lvcreate -n docker-data -l 70%FREE /dev/${VG}
+    lvcreate -n docker-metadata -l 17%FREE /dev/${VG}
+    lvcreate -n openshift-xfs-vol-dir -l 100%FREE /dev/${VG}
+    mkfs.xfs /dev/${VG}/openshift-xfs-vol-dir
+    mkdir -p /mnt/openshift-xfs-vol-dir
+    echo /dev/${VG}/openshift-xfs-vol-dir /mnt/openshift-xfs-vol-dir xfs gquota 1 1 >> /etc/fstab
+    mount /mnt/openshift-xfs-vol-dir
+    chown -R "${SSH_USER}:${SSH_USER}" /mnt/openshift-xfs-vol-dir
+
+    DOCKER_STORAGE_OPTIONS="  -s devicemapper"
+    DOCKER_STORAGE_OPTIONS+=" --storage-opt dm.datadev=/dev/${VG}/docker-data"
+    DOCKER_STORAGE_OPTIONS+=" --storage-opt dm.metadatadev=/dev/${VG}/docker-metadata"
+    if [[ "$(repoquery --pkgnarrow=installed --qf '%{version}' docker)" =~ ^1\.[0-9]{2}\..* ]]; then
+        # after Docker 1.10 we need to amend the devicemapper options
+        DOCKER_STORAGE_OPTIONS+=" --storage-opt dm.use_deferred_removal=true"
+        DOCKER_STORAGE_OPTIONS+=" --storage-opt dm.use_deferred_deletion=true"
+    fi
+    sed -i "s,^DOCKER_STORAGE_OPTIONS=.*,DOCKER_STORAGE_OPTIONS='${DOCKER_STORAGE_OPTIONS}'," /etc/sysconfig/docker-storage
+fi
+
+# 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
+
+systemctl daemon-reexec
+systemctl daemon-reload
+systemctl enable docker
+time systemctl start docker

data/lib/vagrant-openshift/resources/configure_system.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+if [[ ! -e /etc/fedora-release ]]; then
+    sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
+    setenforce 0
+fi
+
+systemctl enable ntpd
+
+# Force socket reuse
+echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse
+
+mkdir -p /data/src
+mkdir -p /data/pkg
+mkdir -p /data/bin
+
+chown -R "${SSH_USER}:${SSH_USER}" /data
+
+sed -i "s,^#DefaultTimeoutStartSec=.*,DefaultTimeoutStartSec=240s," /etc/systemd/system.conf

data/lib/vagrant-openshift/resources/install_chrome.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -o errexit
+
+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