From 3e8f02304be516acc2c49da0f77a376ba800418f Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Tue, 31 Oct 2017 07:59:23 -0700 Subject: add bind9 options for designate Change-Id: I3dbc4ea6a49e01850918cbe8662fed78269da5af Issue-Id: MULTICLOUD-95 Signed-off-by: Guo Ruijing --- ocata/vagrant/bootstrap.sh | 6 +++--- ocata/vagrant/setup_cell.sh | 2 +- ocata/vagrant/setup_compute.sh | 4 ++-- ocata/vagrant/setup_control.sh | 8 ++++++-- 4 files changed, 12 insertions(+), 8 deletions(-) (limited to 'ocata') diff --git a/ocata/vagrant/bootstrap.sh b/ocata/vagrant/bootstrap.sh index 79d31be4..2f2d1b12 100644 --- 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 0fa736a6..44265016 100644 --- 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 7b5964e1..56ef08b6 100644 --- 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 fb7ef8ac..15cf2c79 100644 --- 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 -- cgit 1.2.3-korg