Merge "Update vagrant config" into stable/stein

2 files changed, 23 insertions, 2 deletions

diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile
index b8192a9b..5865144e 100644
--- a/contrib/vagrant/Vagrantfile
+++ b/contrib/vagrant/Vagrantfile
@@ -123,8 +123,8 @@ ln -s /opt/stack/designate/rally-scenarios/plugins /home/vagrant/.rally/plugins
 
 SCRIPT
 
-  config.vm.define "ubuntu-xenial", primary: true do |ubuntu|
-    ubuntu.vm.box = "yk0/ubuntu-xenial"
+  config.vm.define "ubuntu-bionic", primary: true do |ubuntu|
+    ubuntu.vm.box = "ubuntu/bionic64"
 
     ubuntu.vm.network :private_network, ip: "192.168.27.100"
 
@@ -144,4 +144,14 @@ SCRIPT
 
     centos.vm.provision :shell, :privileged => false, :inline => $script
   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
diff --git a/devstack/designate_plugins/backend-bind9 b/devstack/designate_plugins/backend-bind9
index 3c43e768..117e1fbd 100644
--- a/devstack/designate_plugins/backend-bind9
+++ b/devstack/designate_plugins/backend-bind9
@@ -37,6 +37,15 @@ if is_fedora; then
     BIND_GROUP=named
 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
 # ------------
 
@@ -46,6 +55,8 @@ function install_designate_backend {
         install_package bind9
     elif is_fedora; then
         install_package bind
+    elif is_suse; then
+        install_package bind
     fi
 
     # The user that designate runs as needs to be member of **$BIND_GROUP** group.