CORD-1394 Unify build environment paths
Change-Id: I8d3164aa4247274fc5b89d6115d12d8a1887f41d
diff --git a/Vagrantfile b/Vagrantfile
index b9ec139..9a204ab 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,11 +5,6 @@
Vagrant.configure(2) do |config|
- if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
- config.vm.synced_folder $cordpath, "/cord", mount_options: ["dmode=700,fmode=600"]
- else
- config.vm.synced_folder $cordpath, "/cord"
- end
config.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.define "corddev" do |d|
@@ -18,13 +13,14 @@
d.vm.hostname = "corddev"
d.vm.network "private_network", ip: "10.100.198.200"
d.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/corddev.yml -c local"
+ d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/cord/build/ansible/corddev.yml -c local"
+ d.vm.synced_folder $cordpath, "/opt/cord"
d.vm.provider "virtualbox" do |v|
v.memory = 2048
end
d.vm.provider :libvirt do |v, override|
v.memory = 2048
- override.vm.synced_folder $cordpath, "/cord", type: "nfs"
+ override.vm.synced_folder $cordpath, "/opt/cord", type: "nfs"
end
end
@@ -33,6 +29,7 @@
d.vm.hostname = "prod"
d.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: '*'
d.vm.network "private_network", ip: "10.100.198.201"
+ d.vm.synced_folder $cordpath, "/opt/ciab"
d.vm.network "private_network",
ip: "0.0.0.0",
auto_config: false,
@@ -49,8 +46,8 @@
libvirt__forward_mode: "none",
libvirt__dhcp_enabled: false
d.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/prod.yml -c local"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 cd /cord/build/platform-install; ansible-playbook -i inventory/head-localhost deploy-elasticstack-playbook.yml"
+ d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/prod.yml -c local"
+ d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 cd /opt/ciab/build/platform-install; ansible-playbook -i inventory/head-localhost deploy-elasticstack-playbook.yml"
d.vm.provider "virtualbox" do |v|
v.memory = 2048
end
@@ -58,31 +55,15 @@
v.memory = 24576
v.cpus = 8
v.storage :file, :size => '100G', :type => 'qcow2'
- override.vm.synced_folder $cordpath, "/cord", type: "nfs"
- override.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/add-extra-drive.yml -c local"
- end
- end
-
- config.vm.define "switch" do |s|
- s.vm.box = "ubuntu/trusty64"
- s.vm.hostname = "fakeswitch"
- s.vm.network "private_network", ip: "10.100.198.253"
- s.vm.network "private_network",
- type: "dhcp",
- virtualbox__intnet: "cord-fabric-network",
- libvirt__network_name: "cord-fabric-network",
- mac: "cc37ab000001"
- s.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/fakeswitch.yml -c local"
- s.vm.provider "virtualbox" do |v|
- v.memory = 1048
- v.name = "fakeswitch"
+ override.vm.synced_folder $cordpath, "/opt/ciab", type: "nfs"
+ override.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/add-extra-drive.yml -c local"
end
end
config.vm.define "leaf-1" do |s|
s.vm.box = "ubuntu/trusty64"
s.vm.hostname = "leaf-1"
+ s.vm.synced_folder $cordpath, "/opt/ciab"
s.vm.network "private_network",
#type: "dhcp",
ip: "0.0.0.0",
@@ -121,14 +102,14 @@
s.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
if (ENV['FABRIC'] == "1")
s.vm.provision :shell, path: $cordpath + "/build/scripts/install.sh", args: "-3f"
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/leafswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/leafswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
else
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/leafswitch.yml -c local -e 'net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/leafswitch.yml -c local -e 'net_prefix=10.6.1'"
end
s.vm.provider :libvirt do |v, override|
v.memory = 512
v.cpus = 1
- override.vm.synced_folder $cordpath, "/cord", type: "nfs"
+ override.vm.synced_folder $cordpath, "/opt/ciab", type: "nfs"
end
s.vm.provider "virtualbox" do |v, override|
v.memory = 512
@@ -139,6 +120,7 @@
config.vm.define "leaf-2" do |s|
s.vm.box = "ubuntu/trusty64"
s.vm.hostname = "leaf-2"
+ s.vm.synced_folder $cordpath, "/opt/ciab"
s.vm.network "private_network",
#type: "dhcp",
ip: "0.0.0.0",
@@ -177,14 +159,14 @@
s.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
if (ENV['FABRIC'] == "1")
s.vm.provision :shell, path: $cordpath + "/build/scripts/install.sh", args: "-3f"
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/leafswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/leafswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
else
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/leafswitch.yml -c local -e 'net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/leafswitch.yml -c local -e 'net_prefix=10.6.1'"
end
s.vm.provider :libvirt do |v, override|
v.memory = 512
v.cpus = 1
- override.vm.synced_folder $cordpath, "/cord", type: "nfs"
+ override.vm.synced_folder $cordpath, "/opt/ciab", type: "nfs"
end
s.vm.provider "virtualbox" do |v, override|
v.memory = 512
@@ -195,6 +177,7 @@
config.vm.define "spine-1" do |s|
s.vm.box = "ubuntu/trusty64"
s.vm.hostname = "spine-1"
+ s.vm.synced_folder $cordpath, "/opt/ciab"
s.vm.network "private_network",
#type: "dhcp",
ip: "0.0.0.0",
@@ -219,14 +202,14 @@
s.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
if (ENV['FABRIC'] == "1")
s.vm.provision :shell, path: $cordpath + "/build/scripts/install.sh", args: "-3f"
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/spineswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/spineswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
else
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/spineswitch.yml -c local -e 'net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/spineswitch.yml -c local -e 'net_prefix=10.6.1'"
end
s.vm.provider :libvirt do |v, override|
v.memory = 512
v.cpus = 1
- override.vm.synced_folder $cordpath, "/cord", type: "nfs"
+ override.vm.synced_folder $cordpath, "/opt/ciab", type: "nfs"
end
s.vm.provider "virtualbox" do |v, override|
v.memory = 512
@@ -237,6 +220,7 @@
config.vm.define "spine-2" do |s|
s.vm.box = "ubuntu/trusty64"
s.vm.hostname = "spine-2"
+ s.vm.synced_folder $cordpath, "/opt/ciab"
s.vm.network "private_network",
#type: "dhcp",
ip: "0.0.0.0",
@@ -261,14 +245,14 @@
s.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
if (ENV['FABRIC'] == "1")
s.vm.provision :shell, path: $cordpath + "/build/scripts/install.sh", args: "-3f"
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/spineswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/spineswitch.yml -c local -e 'fabric=true net_prefix=10.6.1'"
else
- s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/spineswitch.yml -c local -e 'net_prefix=10.6.1'"
+ s.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /opt/ciab/build/ansible/spineswitch.yml -c local -e 'net_prefix=10.6.1'"
end
s.vm.provider :libvirt do |v, override|
v.memory = 512
v.cpus = 1
- override.vm.synced_folder $cordpath, "/cord", type: "nfs"
+ override.vm.synced_folder $cordpath, "/opt/ciab", type: "nfs"
end
s.vm.provider "virtualbox" do |v, override|
v.memory = 512
@@ -276,22 +260,6 @@
end
end
- config.vm.define "testbox" do |d|
- d.vm.box = "fgrehm/trusty64-lxc"
- d.ssh.forward_agent = true
- d.vm.hostname = "testbox"
- d.vm.network "private_network", ip: "10.0.3.100", lxc__bridge_name: 'lxcbr0'
- d.vm.provision :shell, path: $cordpath + "/build/scripts/bootstrap_ansible.sh"
- d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /cord/build/ansible/corddev.yml -c local"
- config.vm.provider :lxc do |lxc|
- # Same effect as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
- lxc.customize 'cgroup.memory.limit_in_bytes', '2048M'
- lxc.customize 'aa_profile', 'unconfined'
- lxc.customize 'cgroup.devices.allow', 'b 7:* rwm'
- lxc.customize 'cgroup.devices.allow', 'c 10:237 rwm'
- end
- end
-
config.vm.define "compute-node-1" do |c|
c.vm.communicator = "none"
c.vm.hostname = "compute-node-1"
diff --git a/config/cord_in_a_box.yml b/config/cord_in_a_box.yml
index b93d496..25a1b01 100644
--- a/config/cord_in_a_box.yml
+++ b/config/cord_in_a_box.yml
@@ -23,9 +23,6 @@
pki_dir: '/opt/pki'
ssh_pki_dir: '/opt/ssh_pki'
- # for cord in a box, config = build, so set config_cord_dir to /opt/cord
- config_cord_dir: '/cord'
-
# Specifies tasks within the head node provisioning not to execute, including:
#
# switch_support - don't download the switch ONL images as there are no
diff --git a/scripts/bootstrap_ansible.sh b/scripts/bootstrap_ansible.sh
index 5447483..b39f9d9 100755
--- a/scripts/bootstrap_ansible.sh
+++ b/scripts/bootstrap_ansible.sh
@@ -17,12 +17,10 @@
set -e
-echo "Installing Ansible using APT (PPA)..."
+echo "Installing Ansible using pip..."
apt-get install -y software-properties-common python-netaddr apt-transport-https
-#apt-add-repository ppa:ansible/ansible
apt-get update
-#apt-get install -y ansible
apt-get -y install python-dev libffi-dev python-pip libssl-dev sshpass
pip install ansible==2.2.2.0
mkdir -p /etc/ansible
-cp /cord/build/ansible/ansible.cfg /etc/ansible/ansible.cfg
+
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index 8f864f1..609eb54 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -8,7 +8,7 @@
# Paths
CORDDIR=~/cord
-VMDIR=/cord/build/
+VMDIR=/opt/cord/build/
CONFIG=config/cord_in_a_box.yml
SSHCONFIG=~/.ssh/config
VAGRANT_CWD=${CORDDIR}/build/
@@ -217,10 +217,10 @@
cd $CORDDIR/build
# SSH config saved earlier allows us to connect to VM without running 'vagrant'
- ssh corddev "cd /cord/build; ./gradlew -PdeployConfig=$VMDIR/$CONFIG fetch"
- ssh corddev "cd /cord/build; ./gradlew -PdeployConfig=$VMDIR/$CONFIG buildImages"
- ssh corddev "cd /cord/build; ping -c 3 prod; ./gradlew -PdeployConfig=$VMDIR/$CONFIG -PtargetReg=10.100.198.201:5000 publish"
- ssh corddev "cd /cord/build; ./gradlew -PdeployConfig=$VMDIR/$CONFIG deploy"
+ ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG fetch"
+ ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG buildImages"
+ ssh corddev "cd $VMDIR; ping -c 3 prod; ./gradlew -PdeployConfig=$VMDIR/$CONFIG -PtargetReg=10.100.198.201:5000 publish"
+ ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG deploy"
}
function set_up_maas_user() {
@@ -280,7 +280,7 @@
sudo su $USER -c "VAGRANT_CWD=$VAGRANT_CWD vagrant up $1 --provider libvirt"
# Set up power cycling for the compute node and wait for it to be provisioned
- ssh prod "cd /cord/build/ansible; ansible-playbook maas-provision.yml --extra-vars \"maas_user=maas vagrant_name=$2\""
+ ssh prod "cd $VMDIR/ansible; ansible-playbook maas-provision.yml --extra-vars \"maas_user=maas vagrant_name=$2\""
echo ""
echo "$1 is fully provisioned!"
@@ -288,21 +288,21 @@
function initialize_fabric() {
echo "Initializing fabric"
- ssh prod "cd /cord/build/platform-install; ansible-playbook -i /etc/maas/ansible/pod-inventory cord-refresh-fabric.yml"
+ ssh prod "cd $VMDIR/platform-install; ansible-playbook -i /etc/maas/ansible/pod-inventory cord-refresh-fabric.yml"
echo "Fabric ping test"
- ssh prod "cd /cord/build/platform-install; ansible-playbook -i /etc/maas/ansible/pod-inventory cord-fabric-pingtest.yml"
+ ssh prod "cd $VMDIR/platform-install; ansible-playbook -i /etc/maas/ansible/pod-inventory cord-fabric-pingtest.yml"
}
function run_e2e_test () {
cd $CORDDIR/build
# User has been added to the lbvirtd group, but su $USER to be safe
- ssh corddev "cd /cord/build; ./gradlew -PdeployConfig=$VMDIR/$CONFIG postDeployTests"
+ ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG postDeployTests"
}
function run_diagnostics() {
- ssh corddev "cd /cord/build; ./gradlew -PdeployConfig=$VMDIR/$CONFIG PIrunDiag"
+ ssh corddev "cd $VMDIR; ./gradlew -PdeployConfig=$VMDIR/$CONFIG PIrunDiag"
}
# Parse options