summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-11-03 09:51:08 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-03 09:51:08 +0000
commit2f6d5d1ee4303850b4455e4da7864ef7710e8b5f (patch)
treec6540ab5890e077098958621b682dd456d0791e6 /ocata
parente696f412d77fdf4467583911fd73544018ff10c8 (diff)
parent3e8f02304be516acc2c49da0f77a376ba800418f (diff)
Merge "add bind9 options for designate"
Diffstat (limited to 'ocata')
-rw-r--r--ocata/vagrant/bootstrap.sh6
-rw-r--r--ocata/vagrant/setup_cell.sh2
-rw-r--r--ocata/vagrant/setup_compute.sh4
-rw-r--r--ocata/vagrant/setup_control.sh8
4 files changed, 12 insertions, 8 deletions
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