From f304dd4cf3492f5f4bf1f348ff9adea2aec18fdb Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Thu, 30 Jun 2016 11:53:54 +0200
Subject: [PATCH] Switch to new vagrant image and update ccp-pull

---
 Vagrantfile                       | 6 ++++--
 ccp/ccp-pull.sh                   | 7 ++++---
 vagrant-scripts/bootstrap-node.sh | 9 +++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2960b0de4..cdc6501c3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -20,7 +20,8 @@ $instance_name_prefix = "#{$user}-k8s"
 # Boxes with libvirt provider support:
 #$box = "yk0/ubuntu-xenial" #900M
 #$box = "centos/7"
-$box = "nrclark/xenial64-minimal-libvirt"
+#$box = "nrclark/xenial64-minimal-libvirt"
+$box = "peru/ubuntu-16.04-server-amd64"
 
 # Create SSH keys for future lab
 system 'bash vagrant-scripts/ssh-keygen.sh'
@@ -67,7 +68,8 @@ Vagrant.configure("2") do |config|
         domain.cpu_mode = "host-passthrough"
         domain.volume_cache = "unsafe"
         domain.disk_bus = "virtio"
-        domain.storage :file, :type => 'qcow2', :bus => 'virtio', :size => '20G', :device => 'vdb'
+        # DISABLED: switched to new box which has 100G / partition
+        #domain.storage :file, :type => 'qcow2', :bus => 'virtio', :size => '20G', :device => 'vdb'
       end
 
       # Networks and interfaces
diff --git a/ccp/ccp-pull.sh b/ccp/ccp-pull.sh
index 00d03b88f..ccae6acee 100755
--- a/ccp/ccp-pull.sh
+++ b/ccp/ccp-pull.sh
@@ -51,9 +51,9 @@ cleanup() {
 
 fetch_mcp() {
   git clone "${PROTO}review.fuel-infra.org:29418/nextgen/microservices"
-  pushd microservices
-  git review -d 22660
-  popd
+#  pushd microservices
+#  git review -d 22660
+#  popd
 }
 
 fetch_repos() {
@@ -86,6 +86,7 @@ fetch_app_def() {
 cleanup
 fetch_mcp
 fetch_repos
+
 #fetch_app_def
 
 echo "Microservices pull is complete"
diff --git a/vagrant-scripts/bootstrap-node.sh b/vagrant-scripts/bootstrap-node.sh
index 79bcf9174..a08a709d3 100755
--- a/vagrant-scripts/bootstrap-node.sh
+++ b/vagrant-scripts/bootstrap-node.sh
@@ -15,9 +15,10 @@ sudo mv ~vagrant/ssh /root/.ssh
 sudo rm -f /root/.ssh/id_rsa*
 sudo chown -R root: /root/.ssh
 
+# DISABLED: switched to new box which has 100G / partition
 # Setup new drive for docker
-sudo mkfs.ext4 /dev/vdb
-sudo mkdir -p /var/lib/docker
-sudo echo '/dev/vdb /var/lib/docker ext4 defaults,noatime,nodiratime 0 0' >> /etc/fstab
-sudo mount -a
+#sudo mkfs.ext4 /dev/vdb
+#sudo mkdir -p /var/lib/docker
+#sudo echo '/dev/vdb /var/lib/docker ext4 defaults,noatime,nodiratime 0 0' >> /etc/fstab
+#sudo mount -a