diff options
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/base.conf | 1 | ||||
| -rw-r--r-- | deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml | 5 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/os-odl_l2-moon-ha.yml | 5 |
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 |