add bind9 options for designate

Change-Id: I3dbc4ea6a49e01850918cbe8662fed78269da5af
Issue-Id: MULTICLOUD-95
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

diff --git a/ocata/vagrant/bootstrap.sh b/ocata/vagrant/bootstrap.sh
index 79d31be..2f2d1b1 100644 (file)
--- a/ocata/vagrant/bootstrap.sh
+++ b/ocata/vagrant/bootstrap.sh
@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-set -e
+set -ex
 
 sudo apt-get update -y
 sudo apt-get install git -y
-git clone https://github.com/openstack-dev/devstack 
+git clone https://github.com/openstack-dev/devstack
 cd devstack; git checkout stable/ocata
 sudo apt-get install openvswitch-switch -y
 sudo ovs-vsctl add-br br-ex

diff --git a/ocata/vagrant/setup_cell.sh b/ocata/vagrant/setup_cell.sh
index 0fa736a..4426501 100644 (file)
--- a/ocata/vagrant/setup_cell.sh
+++ b/ocata/vagrant/setup_cell.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 source ~/devstack/openrc admin admin
 nova-manage cell_v2 discover_hosts

diff --git a/ocata/vagrant/setup_compute.sh b/ocata/vagrant/setup_compute.sh
index 7b5964e..56ef08b 100644 (file)
--- a/ocata/vagrant/setup_compute.sh
+++ b/ocata/vagrant/setup_compute.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-set -e
+set -ex
 
 cd devstack
 cp /vagrant/compute.conf local.conf

diff --git a/ocata/vagrant/setup_control.sh b/ocata/vagrant/setup_control.sh
index fb7ef8a..15cf2c7 100644 (file)
--- a/ocata/vagrant/setup_control.sh
+++ b/ocata/vagrant/setup_control.sh
@@ -1,7 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-set -e
+set -ex
 
 cd devstack
 cp /vagrant/control.conf  local.conf
 ./stack.sh
+
+sudo sed -i "s/recursion no;/recursion yes;\n    forwarders { 8.8.8.8; 8.8.8.4; };/" \
+    /etc/bind/named.conf.options
+sudo service bind9 restart