summaryrefslogtreecommitdiffstats
path: root/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab
diff options
context:
space:
mode:
Diffstat (limited to 'fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab')
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/ha/dea.yaml)9
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/ha/dha.yaml)2
2 files changed, 3 insertions, 8 deletions
diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/ha/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
index cdb4aec..6c79653 100644
--- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/ha/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
@@ -2,9 +2,9 @@ title: Deployment Environment Adapter (DEA)
# DEA API version supported
version:
created:
-comment: Test environment Ericsson Montreal
+comment: Config for Ericsson Montreal Lab - HA deployment with Ceph and Opendaylight
environment:
- name: opnfv_virt
+ name: opnfv
mode: ha
net_segment_type: gre
wanted_release: Juno on Ubuntu 14.04.1
@@ -33,11 +33,6 @@ nodes:
interfaces: interfaces_1
transformations: transformations_2
role: ceph-osd,compute
-opnfv:
- hosts:
- - name:
- address:
- fqdn:
fuel:
ADMIN_NETWORK:
ipaddress: 10.40.0.2
diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/ha/dha.yaml b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml
index 6227e5f..ca446f6 100644
--- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/ha/dha.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml
@@ -2,7 +2,7 @@ title: Deployment Hardware Adapter (DHA)
# DHA API version supported
version:
created:
-comment: Test environment Ericsson Montreal
+comment: Config for Ericsson Montreal Lab
# Adapter to use for this definition
adapter: hp