C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch to new vagrant image and update ccp-pull

Browse source
This commit is contained in:
Aleksandr Didenko 2016-06-30 11:53:54 +02:00
parent 7dcc7c31f6
commit f304dd4cf3
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Vagrantfile vendored
View file

@ -20,7 +20,8 @@ $instance_name_prefix = "#{$user}-k8s"
# Boxes with libvirt provider support: # Boxes with libvirt provider support:
#$box = "yk0/ubuntu-xenial" #900M #$box = "yk0/ubuntu-xenial" #900M
#$box = "centos/7" #$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 # Create SSH keys for future lab
system 'bash vagrant-scripts/ssh-keygen.sh' system 'bash vagrant-scripts/ssh-keygen.sh'
@ -67,7 +68,8 @@ Vagrant.configure("2") do |config|
domain.cpu_mode = "host-passthrough" domain.cpu_mode = "host-passthrough"
domain.volume_cache = "unsafe" domain.volume_cache = "unsafe"
domain.disk_bus = "virtio" 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 end
# Networks and interfaces # Networks and interfaces

7
ccp/ccp-pull.sh
View file

@ -51,9 +51,9 @@ cleanup() {
fetch_mcp() { fetch_mcp() {
git clone "${PROTO}review.fuel-infra.org:29418/nextgen/microservices" git clone "${PROTO}review.fuel-infra.org:29418/nextgen/microservices"
pushd microservices # pushd microservices
git review -d 22660 # git review -d 22660
popd # popd
} }
fetch_repos() { fetch_repos() {
@ -86,6 +86,7 @@ fetch_app_def() {
cleanup cleanup
fetch_mcp fetch_mcp
fetch_repos fetch_repos
#fetch_app_def #fetch_app_def
echo "Microservices pull is complete" echo "Microservices pull is complete"

9
vagrant-scripts/bootstrap-node.sh
View file

@ -15,9 +15,10 @@ sudo mv ~vagrant/ssh /root/.ssh
sudo rm -f /root/.ssh/id_rsa* sudo rm -f /root/.ssh/id_rsa*
sudo chown -R root: /root/.ssh sudo chown -R root: /root/.ssh
# DISABLED: switched to new box which has 100G / partition
# Setup new drive for docker # Setup new drive for docker
sudo mkfs.ext4 /dev/vdb #sudo mkfs.ext4 /dev/vdb
sudo mkdir -p /var/lib/docker #sudo mkdir -p /var/lib/docker
sudo echo '/dev/vdb /var/lib/docker ext4 defaults,noatime,nodiratime 0 0' >> /etc/fstab #sudo echo '/dev/vdb /var/lib/docker ext4 defaults,noatime,nodiratime 0 0' >> /etc/fstab
sudo mount -a #sudo mount -a