diff options
Diffstat (limited to 'fuel/deploy/templates/hardware_environment/conf')
| -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 | ||||
| -rw-r--r-- | fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/ha/dea.yaml) | 9 | ||||
| -rw-r--r-- | fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/ha/dha.yaml) | 0 | ||||
| -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 |
6 files changed, 7 insertions, 22 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 diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/ha/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml index 29720e5..520cfc8 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/ha/dea.yaml +++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml @@ -2,9 +2,9 @@ title: Deployment Environment Adapter (DEA) # DEA API version supported version: created: -comment: Config for LF POD1 - HA deployment with Ceph +comment: Config for LF POD1 - 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 @@ -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/pod1/ha/dha.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml index 724d6d8..724d6d8 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/ha/dha.yaml +++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml 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 |