summaryrefslogtreecommitdiffstats
path: root/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
diff options
context:
space:
mode:
authorSzilard Cserey <szilard.cserey@ericsson.com>2015-09-14 17:54:32 +0200
committerSzilard Cserey <szilard.cserey@ericsson.com>2015-09-17 16:52:17 +0200
commit67bcb6b3596fe99a7ec59aa66593c218c6241355 (patch)
tree8c1839451706edcf57acd20bfe0ecd522b2e7715 /fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
parente50bd70324f20949098c082b560536047b435027 (diff)
Updates for Autodeployer
-Remove pre-deploy mechanism -Update reaping mechanism -Remove old DEA, DHA configuration files Change-Id: Ibc28d148bc23992e940e0247873a226d92fb7af7 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Diffstat (limited to 'fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2')
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/ha/dea.yaml)7
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/ha/dha.yaml)2
2 files changed, 2 insertions, 7 deletions
diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/ha/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
index 2b9319c..6faa1f6 100644
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/ha/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
@@ -2,7 +2,7 @@ title: Deployment Environment Adapter (DEA)
# DEA API version supported
version:
created:
-comment: Config for LF POD2 - HA deployment with Ceph
+comment: Config for LF POD2 - HA deployment with Ceph and Opendaylight
environment:
name: opnfv_virt
mode: ha
@@ -29,11 +29,6 @@ nodes:
interfaces: interfaces_1
transformations: transformations_2
role: ceph-osd,compute
-opnfv:
- hosts:
- - name:
- address:
- fqdn:
fuel:
ADMIN_NETWORK:
ipaddress: 10.20.0.2
diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/ha/dha.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml
index f34d79f..aa0c6d7 100644
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/ha/dha.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml
@@ -2,7 +2,7 @@ title: Deployment Hardware Adapter (DHA)
# DHA API version supported
version:
created:
-comment: Config for LF POD2
+comment: Config for LF POD2 and Opendaylight
# Adapter to use for this definition
adapter: ipmi