diff options
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 10 | ||||
| -rw-r--r-- | xci/Vagrantfile | 90 | ||||
| -rwxr-xr-x | xci/config/aio-vars | 8 | ||||
| -rwxr-xr-x | xci/config/ha-vars | 8 | ||||
| -rwxr-xr-x | xci/config/mini-vars | 8 | ||||
| -rwxr-xr-x | xci/config/noha-vars | 8 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 9 |
7 files changed, 125 insertions, 16 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 2b902152..ad028070 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -94,6 +94,16 @@ for task in syntax-check list-tasks; do -e testing_user=${TESTING_USER} done +# NOTE(hwoarang): Disable selinux as we are hitting issues with it from time to +# time. Remove this when Centos7 is a proper gate on bifrost so we know that +# selinux works as expected. +if [[ -e /etc/centos-release ]]; then + echo "*************************************" + echo "WARNING: Disabling selinux on CentOS7" + echo "*************************************" + sudo setenforce 0 +fi + # Create the VMS ${ANSIBLE} ${ANSIBLE_VERBOSITY} \ -i inventory/localhost \ diff --git a/xci/Vagrantfile b/xci/Vagrantfile new file mode 100644 index 00000000..cdcd705a --- /dev/null +++ b/xci/Vagrantfile @@ -0,0 +1,90 @@ +# 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. + +# Verify whether required plugins are installed. +required_plugins = [ "vagrant-disksize" ] +required_plugins.each do |plugin| + if not Vagrant.has_plugin?(plugin) + raise "The vagrant plugin #{plugin} is required. Please run `vagrant plugin install #{plugin}`" + end +end + +Vagrant.configure(2) do |config| + + # Configure all VM specs. + config.vm.provider "virtualbox" do |v| + v.memory = 8192 + v.cpus = 8 + end + + # Configure the disk size. + disk_size = "160GB" + + # The below options are good enough for the 'mini' flavor but + # make sure you export the variables to match the flavor you want to test. + config.vm.define "ubuntu1604" do |xenial| + xenial.vm.box = "ubuntu/xenial64" + xenial.disksize.size = disk_size + config.vm.provision "shell"do |s| + s.privileged = false + s.inline = <<-SHELL + cd /vagrant + export XCI_FLAVOR=${XCI_FLAVOR:-mini} + export VM_CPU=${VM_CPU:-2} + export VM_DISK=${VM_DISK:-40} + export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-2048} + export VM_DOMAIN_TYPE=qemu + [[ ! -e ${HOME}/.ssh/id_rsa ]] && ssh-keygen -q -P '' -f ${HOME}/.ssh/id_rsa + ./xci-deploy.sh + SHELL + s.env = { + "XCI_FLAVOR" => "#{ENV['XCI_FLAVOR']}", + "VM_CPU" => "#{ENV['VM_CPU']}", + "VM_DISK" => "#{ENV['VM_DISK']}", + "VM_MEMORY_SIZE" => "#{ENV['VM_MEMORY_SIZE']}" + } + end + end + + config.vm.define "centos7" do |centos7| + centos7.vm.box = "centos/7" + centos7.disksize.size = disk_size + # The CentOS build does not have growroot, so we + # have to do it ourselves. + config.vm.provision "shell" do |s| + s.privileged = false + s.inline = <<-SHELL + cd /vagrant + PART_START=$(parted /dev/sda --script unit MB print | awk '/^ 3 / {print $3}') + parted /dev/sda --script unit MB mkpart primary ${PART_START} 100% + parted /dev/sda --script set 4 lvm on + pvcreate /dev/sda4 + vgextend VolGroup00 /dev/sda4 + lvextend -l +100%FREE /dev/mapper/VolGroup00-LogVol00 + xfs_growfs /dev/mapper/VolGroup00-LogVol00 + export XCI_FLAVOR=${XCI_FLAVOR:-mini} + export VM_CPU=${VM_CPU:-2} + export VM_DISK=${VM_DISK:-40} + export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-2048} + export VM_DOMAIN_TYPE=qemu + [[ ! -e ${HOME}/.ssh/id_rsa ]] && ssh-keygen -q -P '' -f ${HOME}/.ssh/id_rsa + ./xci-deploy.sh + SHELL + s.env = { + "XCI_FLAVOR" => "#{ENV['XCI_FLAVOR']}", + "VM_CPU" => "#{ENV['VM_CPU']}", + "VM_DISK" => "#{ENV['VM_DISK']}", + "VM_MEMORY_SIZE" => "#{ENV['VM_MEMORY_SIZE']}" + } + end + end +end diff --git a/xci/config/aio-vars b/xci/config/aio-vars index f28ecff1..ed921f42 100755 --- a/xci/config/aio-vars +++ b/xci/config/aio-vars @@ -11,8 +11,8 @@ #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=1 export TEST_VM_NODE_NAMES=opnfv -export VM_DOMAIN_TYPE=kvm -export VM_CPU=8 -export VM_DISK=80 -export VM_MEMORY_SIZE=8192 +export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} +export VM_CPU=${VM_CPU:-8} +export VM_DISK=${VM_DISK:-80} +export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-8192} export VM_DISK_CACHE=unsafe diff --git a/xci/config/ha-vars b/xci/config/ha-vars index 1ba45890..b864c42e 100755 --- a/xci/config/ha-vars +++ b/xci/config/ha-vars @@ -11,8 +11,8 @@ #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=6 export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01" -export VM_DOMAIN_TYPE=kvm -export VM_CPU=8 -export VM_DISK=80 -export VM_MEMORY_SIZE=16384 +export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} +export VM_CPU=${VM_CPU:-8} +export VM_DISK=${VM_CPU:-80} +export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-16384} export VM_DISK_CACHE=unsafe diff --git a/xci/config/mini-vars b/xci/config/mini-vars index 8f1e83cd..fd32e7f3 100755 --- a/xci/config/mini-vars +++ b/xci/config/mini-vars @@ -11,8 +11,8 @@ #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=3 export TEST_VM_NODE_NAMES="opnfv controller00 compute00" -export VM_DOMAIN_TYPE=kvm -export VM_CPU=8 -export VM_DISK=80 -export VM_MEMORY_SIZE=12288 +export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} +export VM_CPU=${VM_CPU:-8} +export VM_DISK=${VM_DISK:-80} +export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-12288} export VM_DISK_CACHE=unsafe diff --git a/xci/config/noha-vars b/xci/config/noha-vars index 935becb2..6d85111c 100755 --- a/xci/config/noha-vars +++ b/xci/config/noha-vars @@ -11,8 +11,8 @@ #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=4 export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01" -export VM_DOMAIN_TYPE=kvm -export VM_CPU=8 -export VM_DISK=80 -export VM_MEMORY_SIZE=12288 +export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} +export VM_CPU=${VM_CPU:-8} +export VM_DISK=${VM_DISK:-80} +export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-12288} export VM_DISK_CACHE=unsafe diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 268d2ab9..40dd08ba 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -63,6 +63,15 @@ echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- source file/install-ansible.sh +# There is no CentOS or openSUSE support at all +if [[ $OS_FAMILY != Debian ]]; then + echo "" + echo "Error: Sorry, only Ubuntu hosts are supported for now!" + echo "Error: CentOS7 and openSUSE Leap support is still work in progress." + echo "" + exit 1 +fi + # TODO: The xci playbooks can be put into a playbook which will be done later. #------------------------------------------------------------------------------- |