openstack/designate
Code Issues Proposed changes

Update vagrant config

Browse Source 
* Move to bionic
* Add openSUSE Leap 15
* * Update Bind devstack backend plugin to work on Leap
* Remove port mapping
* Rmove the .gitconfig copy into the VM

Change-Id: I99d228f850e03045febf196f12eef5927f7605b9
Signed-off-by: Graham Hayes <gr@ham.ie>
This commit is contained in:
Graham Hayes 2019-04-01 14:48:48 +01:00
parent 8594066e2b
commit 3734f2a13f
No known key found for this signature in database
GPG Key ID: 1B263DC59F4AEFD5
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/vagrant/Vagrantfile vendored
View File

@ -92,7 +92,6 @@ set -e
# Fixup permissions on /opt/stack/ # Fixup permissions on /opt/stack/
sudo chown vagrant:vagrant /opt/stack/ sudo chown vagrant:vagrant /opt/stack/
# Clone DevStack # Clone DevStack
if [ ! -d "/home/vagrant/devstack" ]; then if [ ! -d "/home/vagrant/devstack" ]; then
git clone https://opendev.org/openstack/devstack.git /home/vagrant/devstack git clone https://opendev.org/openstack/devstack.git /home/vagrant/devstack
@ -127,17 +126,6 @@ SCRIPT
ubuntu.vm.provision :shell, :privileged => false, :inline => $script ubuntu.vm.provision :shell, :privileged => false, :inline => $script
end end
config.vm.define "ubuntu-xenial", autostart: false do |ubuntu|
ubuntu.vm.box = "yk0/ubuntu-xenial"
ubuntu.vm.network :private_network, ip: "192.168.27.100"
ubuntu.vm.provision :shell, :privileged => true, :inline => "DEBIAN_FRONTEND=noninteractive apt-get update"
ubuntu.vm.provision :shell, :privileged => true, :inline => "DEBIAN_FRONTEND=noninteractive apt-get install --yes git lvm2"
ubuntu.vm.provision :shell, :privileged => false, :inline => $script
end
config.vm.define "centos-7", autostart: false do |centos| config.vm.define "centos-7", autostart: false do |centos|
centos.vm.box = "centos/7" centos.vm.box = "centos/7"
@ -148,4 +136,14 @@ SCRIPT
centos.vm.provision :shell, :privileged => false, :inline => $script centos.vm.provision :shell, :privileged => false, :inline => $script
end end
config.vm.define "openSUSE-15", autostart: false do |opensuse|
opensuse.vm.box = "opensuse/openSUSE-15.0-x86_64"
opensuse.vm.network :private_network, ip: "192.168.27.102"
opensuse.vm.provision :shell, :privileged => true, :inline => "zypper install -y git-core libcap-progs"
opensuse.vm.provision :shell, :privileged => false, :inline => $script
end
end end

11
devstack/designate_plugins/backend-bind9
View File

@ -37,6 +37,15 @@ if is_fedora; then
BIND_GROUP=named BIND_GROUP=named
fi fi
if is_suse; then
BIND_SERVICE_NAME=named
BIND_CFG_DIR=/etc/named
BIND_CFG_FILE=/etc/named.conf
BIND_VAR_DIR=/var/lib/named
BIND_USER=named
BIND_GROUP=named
fi
# Entry Points # Entry Points
# ------------ # ------------
@ -46,6 +55,8 @@ function install_designate_backend {
install_package bind9 install_package bind9
elif is_fedora; then elif is_fedora; then
install_package bind install_package bind
elif is_suse; then
install_package bind
fi fi
# The user that designate runs as needs to be member of **$BIND_GROUP** group. # The user that designate runs as needs to be member of **$BIND_GROUP** group.