aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorchigang <chigang@huawei.com>2017-07-26 17:19:30 +0800
committerchigang <chigang@huawei.com>2017-07-28 09:22:13 +0800
commit1edb67f913276eec2dad1adae80a3ac3d9a5356c (patch)
treedc3c6c7f68b3f5c22ad9a99973de84375899afc0 /deploy/conf
parentef15f07cc10f92ba07fb22d257ccbde7fab9a51d (diff)
Add moonv4 into Compass4nfv
JIRA:- To deploy moon master, export MOON_CFG env like below compass deploy: export MOON_CFG="master:flag=Disable,slave:flag=Enable,slave:name=slave1,slave:master_ip=master_ip" To deploy moon slave, export MOON_CFG env like below compass deploy: export MOON_CFG="master:flag=Enable,slave:flag=Disable,slave:name=slave1,slave:master_ip=master_ip" Change-Id: I21c0186a029c508d390c69112b43510d9c5b9c5c Signed-off-by: chigang <chigang@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/base.conf1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml5
-rw-r--r--deploy/conf/vm_environment/os-odl_l2-moon-ha.yml5
3 files changed, 5 insertions, 6 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index b474e282..bdbea459 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -68,3 +68,4 @@ export OS_CONFIG_FILENAME=""
export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,image:service=service,metering:service=service,network:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_db_secret,alarming:aodh=aodh_db_secret,policy:congress=service"
export CONSOLE_CREDENTIALS="admin:console=console,demo:console=console,compute:console=console,dashboard:console=console,identity:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_secret,alarming:aodh=aodh_secret,policy:congress=console"
export PACKAGE_CONFIG_FILENAME=""
+export MOON_CFG=${MOON_CFG:-"master:flag=Disable,slave:flag=Disable,slave:name=slave1,slave:master_ip=master_ip"}
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
index dca3228b..d2447c1d 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
@@ -15,9 +15,9 @@ POWER_TOOL: ipmitool
ipmiUser: root
ipmiVer: '2.0'
-moon: "Enable"
plugins:
- opendaylight: "Enable"
+ - moon: "Enable"
hosts:
- name: host1
@@ -74,5 +74,4 @@ hosts:
ipmiIp: 172.16.130.31
ipmiPass: Opnfv@pod1
roles:
- - compute
- - ceph-osd
+ - moon
diff --git a/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
index 759055d6..5a02cbf7 100644
--- a/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
@@ -11,9 +11,9 @@
TYPE: virtual
FLAVOR: cluster
-moon: "Enable"
plugins:
- opendaylight: "Enable"
+ - moon: "Enable"
hosts:
- name: host1
@@ -45,5 +45,4 @@ hosts:
- name: host5
roles:
- - compute
- - ceph-osd
+ - moon