summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-10-09 18:32:31 +0800
committerbaigk <baiguoku@huawei.com>2015-10-10 10:17:48 +0800
commit80c770bb093ad2af54171de1a2c4630536d4daf0 (patch)
tree693a483f4b4f02eb7dcd908691e2db67f7b6003c /deploy/conf
parent00aaaac786bcec0d2de7c14c4f3c5a89ba2553f5 (diff)
bugfix: libvirt_type should be kvm when host is barebetal mode
JIRA: COMPASS-81 Change-Id: Iba3cb182a3e461ab89eb40fdba7800b8b2a1fc3e Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/baremetal.conf1
-rw-r--r--deploy/conf/base.conf12
-rw-r--r--deploy/conf/compass.conf15
3 files changed, 17 insertions, 11 deletions
diff --git a/deploy/conf/baremetal.conf b/deploy/conf/baremetal.conf
index 5d42b36d..56903c77 100644
--- a/deploy/conf/baremetal.conf
+++ b/deploy/conf/baremetal.conf
@@ -2,3 +2,4 @@ export SWITCH_IPS="192.168.124.2"
export SWITCH_CREDENTIAL="version=2c,community=public"
export DEPLOYMENT_TIMEOUT="150"
export POLL_SWITCHES_FLAG="nopoll_switches"
+export INSTALL_NIC=${INSTALL_NIC:-eth3}
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 050fe350..c48aca64 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -9,18 +9,8 @@ export MGMT_MASK=${MAGMT_MASK:-255.255.252.0}
export MGMT_GW=${MAGMT_GW:-192.168.200.1}
export MGMT_IP_START=${MGMT_IP_START:-192.168.200.3}
export MGMT_IP_END=${MGMT_IP_END:-192.168.200.254}
-export OM_NIC=${OM_NIC:-eth3}
-export COMPASS_VIRT_CPUS=4
-export COMPASS_VIRT_MEM=4096
-export COMPASS_SERVER=$INSTALL_IP
-export COMPASS_SERVER_URL="http://$COMPASS_SERVER/api"
-export COMPASS_USER_EMAIL="admin@huawei.com"
-export COMPASS_USER_PASSWORD="admin"
+export EXTERNAL_NIC=${EXTERNAL_NIC:-eth3}
export CLUSTER_NAME="opnfv2"
-export LANGUAGE="EN"
-export TIMEZONE="America/Los_Angeles"
-export NTP_SERVER="$COMPASS_SERVER"
-export NAMESERVERS="$COMPASS_SERVER"
export DOMAIN="ods.com"
export PARTITIONS="/=70%,/home=5%,/tmp=5%,/var=20%"
export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24"
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
new file mode 100644
index 00000000..eee23e9f
--- /dev/null
+++ b/deploy/conf/compass.conf
@@ -0,0 +1,15 @@
+export COMPASS_VIRT_CPUS=4
+export COMPASS_VIRT_MEM=4096
+export COMPASS_SERVER=$INSTALL_IP
+export COMPASS_SERVER_URL="http://$COMPASS_SERVER/api"
+export COMPASS_USER_EMAIL="admin@huawei.com"
+export COMPASS_USER_PASSWORD="admin"
+export COMPASS_DNS1=${COMPASS_DNS1:-'8.8.8.8'}
+export COMPASS_DNS2=${COMPASS_DNS2:-}
+export COMPASS_EXTERNAL_IP=${COMPASS_EXTERNAL_IP:-192.168.124.221}
+export COMPASS_EXTERNAL_MASK=${COMPASS_EXTERNAL_MASK:-255.255.252.0}
+export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-192.168.124.1}
+export LANGUAGE="EN"
+export TIMEZONE="America/Los_Angeles"
+export NTP_SERVER="$COMPASS_SERVER"
+export NAMESERVERS="$COMPASS_SERVER"