openstack/designate
Code Issues Proposed changes

Add centos7, remove Fedora Vagrant VM

Browse Source 
The Fedora box has not been available in some time, and most Designate
deployments running on RH based distros will be RHEL/CentOS.

Change-Id: I05e34c908ac1d5a7a2037d43f47987cad6c25531
This commit is contained in:
Kiall Mac Innes 2016-06-07 15:50:34 +01:00
parent a686e6a4c5
commit 5d0e4da38c
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/vagrant/Vagrantfile vendored
View File

@ -151,15 +151,14 @@ SCRIPT
ubuntu.vm.provision :shell, :privileged => false, :inline => $script
end
config.vm.define "centos-7", autostart: false do |centos|
centos.vm.box = "centos/7"
config.vm.define "fedora", autostart: false do |fedora|
fedora.vm.box = "box-cutter/fedora20"
centos.vm.network :private_network, ip: "192.168.27.101"
fedora.vm.network :private_network, ip: "192.168.27.101"
centos.vm.provision :shell, :privileged => true, :inline => "yum update -y vim-minimal" # RH Bug 1066983
centos.vm.provision :shell, :privileged => true, :inline => "yum install -y git-core"
fedora.vm.provision :shell, :privileged => true, :inline => "yum update -y vim-minimal" # RH Bug 1066983
fedora.vm.provision :shell, :privileged => true, :inline => "yum install -y git-core"
fedora.vm.provision :shell, :privileged => false, :inline => $script
centos.vm.provision :shell, :privileged => false, :inline => $script
end
end

10
devstack/plugin.sh
View File

@ -249,11 +249,11 @@ function init_designate {
# install_designate - Collect source and prepare
function install_designate {
install_package libcap2-bin
if is_fedora; then
# This package provides `dig`
install_package bind-utils
if is_ubuntu; then
install_package libcap2-bin
elif is_fedora; then
# bind-utils package provides `dig`
install_package libcap bind-utils
fi
git_clone $DESIGNATE_REPO $DESIGNATE_DIR $DESIGNATE_BRANCH