diff options
author | Pawel Wieczorek <p.wieczorek2@samsung.com> | 2019-11-29 16:18:36 +0100 |
---|---|---|
committer | Morgan Richomme <morgan.richomme@orange.com> | 2019-12-18 07:30:58 +0000 |
commit | df0edea0c75b1bd99f26779be7d7b60d5fcb3481 (patch) | |
tree | 67548fcded63d19d729f1c9e7005978878a3746c | |
parent | 55c0c9d2645ee6c9d5e217326f585c033df449a0 (diff) |
Add Devstack machine and its provisioning
Issue-ID: ONAPARC-537
Change-Id: If725843c3e5ee47724a98d70611cbde464b9debc
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
-rw-r--r-- | bootstrap/vagrant-minimal-onap/Vagrantfile | 34 | ||||
-rw-r--r-- | bootstrap/vagrant-minimal-onap/config/local.conf | 5 |
2 files changed, 34 insertions, 5 deletions
diff --git a/bootstrap/vagrant-minimal-onap/Vagrantfile b/bootstrap/vagrant-minimal-onap/Vagrantfile index 3685df25f..53d78b5a2 100644 --- a/bootstrap/vagrant-minimal-onap/Vagrantfile +++ b/bootstrap/vagrant-minimal-onap/Vagrantfile @@ -8,21 +8,25 @@ vagrant_password = "vagrant" synced_folder_main = "/vagrant" synced_folder_config = "#{synced_folder_main}/config" synced_folder_tools_config = "#{synced_folder_main}/tools/config" +os_config = "#{synced_folder_config}/local.conf" cluster_yml = "cluster.yml" apt_prefs_dir = "/etc/apt/apt.conf.d" apt_prefs = "95silent-approval" vm_memory = 2 * 1024 +vm_memory_os = 8 * 1024 vm_cpus = 1 +vm_cpus_os = 2 vm_box = "generic/ubuntu1804" operation = { name: 'operator', hostname: 'operator', ip: '172.17.4.254' } +devstack = { name: 'devstack', hostname: 'devstack', ip: '172.17.4.200' } cluster = [ { name: 'control', hostname: 'control', ip: '172.17.4.100' }, { name: 'worker', hostname: 'worker', ip: '172.17.4.101' } ] -all = cluster.dup << operation +all = cluster.dup << operation << devstack operation_post_msg = "Run: \"vagrant provision #{operation[:name]} --provision-with=rke_up,setup_kubectl\" to complete cluster creation" @@ -32,6 +36,19 @@ $replace_dns = <<-SCRIPT echo nameserver "$HOST_IP" | tee /etc/resolv.conf SCRIPT +$enable_ipv6 = <<-SCRIPT + sed -i'' 's/net.ipv6.conf.all.disable_ipv6.*$/net.ipv6.conf.all.disable_ipv6 = 0/' /etc/sysctl.conf + sysctl -p +SCRIPT + +$setup_devstack = <<-SCRIPT + CONFIG="$1" + git clone https://opendev.org/openstack/devstack + cd devstack + cp "$CONFIG" . + ./stack.sh +SCRIPT + $add_to_docker_group = <<-SCRIPT USER="$1" echo "Adding ${USER} to 'docker' group" @@ -97,18 +114,25 @@ Vagrant.configure('2') do |config| config.vm.provider :virtualbox do |v| v.name = machine[:name] - v.memory = vm_memory - v.cpus = vm_cpus + v.memory = machine[:name] != 'devstack' ? vm_memory : vm_memory_os + v.cpus = machine[:name] != 'devstack' ? vm_cpus : vm_cpus_os end config.vm.provider :libvirt do |v| - v.memory = vm_memory - v.cpus = vm_cpus + v.memory = machine[:name] != 'devstack' ? vm_memory : vm_memory_os + v.cpus = machine[:name] != 'devstack' ? vm_cpus : vm_cpus_os end config.vm.network :private_network, ip: machine[:ip] config.vm.provision "replace_dns", type: :shell, run: "always", inline: $replace_dns, args: host_ip + if machine[:name] == 'devstack' + config.vm.synced_folder ".", synced_folder_main, type: "rsync", rsync__exclude: "Vagrantfile" + + config.vm.provision "enable_ipv6", type: :shell, run: "always", inline: $enable_ipv6 + config.vm.provision "setup_devstack", type: :shell, privileged: false, inline: $setup_devstack, args: os_config + end + if machine[:name] == 'control' config.vm.provision "customize_control", type: :shell, path: "tools/imported/openstack-k8s-controlnode.sh" config.vm.provision "fix_groups_control", type: :shell, inline: $add_to_docker_group, args: vagrant_user diff --git a/bootstrap/vagrant-minimal-onap/config/local.conf b/bootstrap/vagrant-minimal-onap/config/local.conf new file mode 100644 index 000000000..f8912868a --- /dev/null +++ b/bootstrap/vagrant-minimal-onap/config/local.conf @@ -0,0 +1,5 @@ +[[local|localrc]] +ADMIN_PASSWORD=default123456! +DATABASE_PASSWORD=$ADMIN_PASSWORD +RABBIT_PASSWORD=$ADMIN_PASSWORD +SERVICE_PASSWORD=$ADMIN_PASSWORD |