diff options
| author | Graham Hayes <gr@ham.ie> | 2019-04-01 14:48:48 +0100 |
|---|---|---|
| committer | Guang Yee <guang.yee@suse.com> | 2020-01-16 18:05:32 -0800 |
| commit | 54ad81e35027c5a177e8d7e4e8884b47faa94087 (patch) | |
| tree | 5770b13f78bdeaaaba2d3fc7dd74a4d0de73dc15 | |
| parent | 357a41c4281181cd0cffa04b377cdfc3020eaf1f (diff) | |
| download | designate-54ad81e35027c5a177e8d7e4e8884b47faa94087.tar.gz | |
Update vagrant config
* 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>
(cherry picked from commit 3734f2a13f094fe86c354c87e102543f9b1fa006)
| -rw-r--r-- | contrib/vagrant/Vagrantfile | 14 | ||||
| -rw-r--r-- | devstack/designate_plugins/backend-bind9 | 11 |
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. |