From af2db33a0ebab98700c3c03ea84a6ba9b987c5b5 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Fri, 30 Sep 2016 20:28:22 +0200 Subject: Preparing the experimental branch for improved Danube CI/CD experiments Fast forwarded to commit:cf93e6ee11c96de090b04196cc96b4a6b0948928 Change-Id: I13d10d870e8ffc7317ab03f8810592d5b2205875 Signed-off-by: Jonas Bjurel --- .../virtual_environment/noha/networks/fuel1.xml | 12 +++ .../virtual_environment/noha/networks/fuel2.xml | 5 ++ .../virtual_environment/noha/networks/fuel3.xml | 5 ++ .../virtual_environment/noha/networks/fuel4.xml | 12 +++ .../virtual_environment/noha/vms/compute.xml | 91 +++++++++++++++++++++ .../virtual_environment/noha/vms/controller.xml | 91 +++++++++++++++++++++ .../ericsson/virtual_environment/noha/vms/fuel.xml | 93 ++++++++++++++++++++++ .../vms/ericsson_montreal_lab/fuel.xml | 91 +++++++++++++++++++++ deploy/templates/hardware_environment/vms/fuel.xml | 91 +++++++++++++++++++++ .../virtual_environment/noha/networks/fuel1.xml | 12 +++ .../virtual_environment/noha/networks/fuel2.xml | 5 ++ .../virtual_environment/noha/networks/fuel3.xml | 5 ++ .../virtual_environment/noha/networks/fuel4.xml | 12 +++ .../intel/virtual_environment/noha/vms/compute.xml | 91 +++++++++++++++++++++ .../virtual_environment/noha/vms/controller.xml | 91 +++++++++++++++++++++ .../intel/virtual_environment/noha/vms/fuel.xml | 93 ++++++++++++++++++++++ deploy/templates/plugins/.gitkeep | 0 deploy/templates/templater/base_dea_template.yaml | 24 ++++++ .../virtual_environment/networks/fuel1.xml | 12 +++ .../virtual_environment/networks/fuel2.xml | 6 ++ .../virtual_environment/networks/fuel3.xml | 5 ++ .../virtual_environment/networks/fuel4.xml | 12 +++ .../templates/virtual_environment/vms/compute.xml | 67 ++++++++++++++++ .../virtual_environment/vms/controller.xml | 64 +++++++++++++++ deploy/templates/virtual_environment/vms/fuel.xml | 64 +++++++++++++++ .../virtual_environment_noha/networks/fuel1.xml | 12 +++ .../virtual_environment_noha/networks/fuel2.xml | 5 ++ .../virtual_environment_noha/networks/fuel3.xml | 5 ++ .../virtual_environment_noha/networks/fuel4.xml | 12 +++ .../virtual_environment_noha/vms/compute.xml | 64 +++++++++++++++ .../virtual_environment_noha/vms/controller.xml | 64 +++++++++++++++ .../virtual_environment_noha/vms/fuel.xml | 65 +++++++++++++++ 32 files changed, 1281 insertions(+) create mode 100644 deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml create mode 100644 deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml create mode 100644 deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml create mode 100644 deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml create mode 100644 deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml create mode 100644 deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml create mode 100644 deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml create mode 100644 deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml create mode 100644 deploy/templates/hardware_environment/vms/fuel.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/networks/fuel1.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/networks/fuel2.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/networks/fuel3.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/networks/fuel4.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/vms/compute.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/vms/controller.xml create mode 100644 deploy/templates/intel/virtual_environment/noha/vms/fuel.xml create mode 100644 deploy/templates/plugins/.gitkeep create mode 100644 deploy/templates/templater/base_dea_template.yaml create mode 100644 deploy/templates/virtual_environment/networks/fuel1.xml create mode 100644 deploy/templates/virtual_environment/networks/fuel2.xml create mode 100644 deploy/templates/virtual_environment/networks/fuel3.xml create mode 100644 deploy/templates/virtual_environment/networks/fuel4.xml create mode 100644 deploy/templates/virtual_environment/vms/compute.xml create mode 100644 deploy/templates/virtual_environment/vms/controller.xml create mode 100644 deploy/templates/virtual_environment/vms/fuel.xml create mode 100644 deploy/templates/virtual_environment_noha/networks/fuel1.xml create mode 100644 deploy/templates/virtual_environment_noha/networks/fuel2.xml create mode 100644 deploy/templates/virtual_environment_noha/networks/fuel3.xml create mode 100644 deploy/templates/virtual_environment_noha/networks/fuel4.xml create mode 100644 deploy/templates/virtual_environment_noha/vms/compute.xml create mode 100644 deploy/templates/virtual_environment_noha/vms/controller.xml create mode 100644 deploy/templates/virtual_environment_noha/vms/fuel.xml (limited to 'deploy/templates') diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml new file mode 100644 index 000000000..7b2b15423 --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml @@ -0,0 +1,12 @@ + + fuel1 + + + + + + + + + + diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml new file mode 100644 index 000000000..615c92094 --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml @@ -0,0 +1,5 @@ + + fuel2 + + + diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml new file mode 100644 index 000000000..2383e6c1f --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml @@ -0,0 +1,5 @@ + + fuel3 + + + diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml new file mode 100644 index 000000000..5b69f912d --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml @@ -0,0 +1,12 @@ + + fuel4 + + + + + + + + + + diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml new file mode 100644 index 000000000..310ce292a --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml @@ -0,0 +1,91 @@ + + compute + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + SandyBridge + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml new file mode 100644 index 000000000..d0d0ef14c --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml @@ -0,0 +1,91 @@ + + controller + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + SandyBridge + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml new file mode 100644 index 000000000..223a65805 --- /dev/null +++ b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml @@ -0,0 +1,93 @@ + + fuel + 2097152 + 2097152 + 2 + + /machine + + + hvm + + + + + + + + + + + SandyBridge + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml b/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml new file mode 100644 index 000000000..fe547b811 --- /dev/null +++ b/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml @@ -0,0 +1,91 @@ + + fuel + 8290304 + 8290304 + 4 + + /machine + + + hvm + + + + + + + + + + + SandyBridge + + + + + + + destroy + restart + restart + + + + + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + system_u:object_r:svirt_image_t:s0:c52,c932 + + diff --git a/deploy/templates/hardware_environment/vms/fuel.xml b/deploy/templates/hardware_environment/vms/fuel.xml new file mode 100644 index 000000000..8d8dd4494 --- /dev/null +++ b/deploy/templates/hardware_environment/vms/fuel.xml @@ -0,0 +1,91 @@ + + fuel + 8290304 + 8290304 + 4 + + /machine + + + hvm + + + + + + + + + + + SandyBridge + + + + + + + destroy + restart + restart + + + + + + /usr/libexec/qemu-kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + system_u:object_r:svirt_image_t:s0:c52,c932 + + diff --git a/deploy/templates/intel/virtual_environment/noha/networks/fuel1.xml b/deploy/templates/intel/virtual_environment/noha/networks/fuel1.xml new file mode 100644 index 000000000..7b2b15423 --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/networks/fuel1.xml @@ -0,0 +1,12 @@ + + fuel1 + + + + + + + + + + diff --git a/deploy/templates/intel/virtual_environment/noha/networks/fuel2.xml b/deploy/templates/intel/virtual_environment/noha/networks/fuel2.xml new file mode 100644 index 000000000..615c92094 --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/networks/fuel2.xml @@ -0,0 +1,5 @@ + + fuel2 + + + diff --git a/deploy/templates/intel/virtual_environment/noha/networks/fuel3.xml b/deploy/templates/intel/virtual_environment/noha/networks/fuel3.xml new file mode 100644 index 000000000..2383e6c1f --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/networks/fuel3.xml @@ -0,0 +1,5 @@ + + fuel3 + + + diff --git a/deploy/templates/intel/virtual_environment/noha/networks/fuel4.xml b/deploy/templates/intel/virtual_environment/noha/networks/fuel4.xml new file mode 100644 index 000000000..5b69f912d --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/networks/fuel4.xml @@ -0,0 +1,12 @@ + + fuel4 + + + + + + + + + + diff --git a/deploy/templates/intel/virtual_environment/noha/vms/compute.xml b/deploy/templates/intel/virtual_environment/noha/vms/compute.xml new file mode 100644 index 000000000..310ce292a --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/vms/compute.xml @@ -0,0 +1,91 @@ + + compute + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + SandyBridge + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/intel/virtual_environment/noha/vms/controller.xml b/deploy/templates/intel/virtual_environment/noha/vms/controller.xml new file mode 100644 index 000000000..d0d0ef14c --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/vms/controller.xml @@ -0,0 +1,91 @@ + + controller + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + SandyBridge + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml b/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml new file mode 100644 index 000000000..b8af5a633 --- /dev/null +++ b/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml @@ -0,0 +1,93 @@ + + fuel + 2097152 + 2097152 + 2 + + /machine + + + hvm + + + + + + + + + + + SandyBridge + Intel + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/plugins/.gitkeep b/deploy/templates/plugins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/deploy/templates/templater/base_dea_template.yaml b/deploy/templates/templater/base_dea_template.yaml new file mode 100644 index 000000000..bdc1b2684 --- /dev/null +++ b/deploy/templates/templater/base_dea_template.yaml @@ -0,0 +1,24 @@ +############################################################################## +# Copyright (c) 2015, 2016 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# peter.barabas@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +dea-base-config-metadata: + title: 'Deployment Environment Adapter Base configuration' + # DEA API version supported + version: '0.4' + created: 'Fri Jun 10 2016' + comment: 'Rebased for Fuel 9' +environment: + net_segment_type: %{network/networking_parameters/segmentation_type} +fuel: + FUEL_ACCESS: + %{fuel/FUEL_ACCESS} +wanted_release: %{wanted_release} +settings: + %{settings} diff --git a/deploy/templates/virtual_environment/networks/fuel1.xml b/deploy/templates/virtual_environment/networks/fuel1.xml new file mode 100644 index 000000000..7b2b15423 --- /dev/null +++ b/deploy/templates/virtual_environment/networks/fuel1.xml @@ -0,0 +1,12 @@ + + fuel1 + + + + + + + + + + diff --git a/deploy/templates/virtual_environment/networks/fuel2.xml b/deploy/templates/virtual_environment/networks/fuel2.xml new file mode 100644 index 000000000..558788664 --- /dev/null +++ b/deploy/templates/virtual_environment/networks/fuel2.xml @@ -0,0 +1,6 @@ + + fuel2 + + + + diff --git a/deploy/templates/virtual_environment/networks/fuel3.xml b/deploy/templates/virtual_environment/networks/fuel3.xml new file mode 100644 index 000000000..2383e6c1f --- /dev/null +++ b/deploy/templates/virtual_environment/networks/fuel3.xml @@ -0,0 +1,5 @@ + + fuel3 + + + diff --git a/deploy/templates/virtual_environment/networks/fuel4.xml b/deploy/templates/virtual_environment/networks/fuel4.xml new file mode 100644 index 000000000..5b69f912d --- /dev/null +++ b/deploy/templates/virtual_environment/networks/fuel4.xml @@ -0,0 +1,12 @@ + + fuel4 + + + + + + + + + + diff --git a/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml new file mode 100644 index 000000000..0bff88827 --- /dev/null +++ b/deploy/templates/virtual_environment/vms/compute.xml @@ -0,0 +1,67 @@ + + compute + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/virtual_environment/vms/controller.xml b/deploy/templates/virtual_environment/vms/controller.xml new file mode 100644 index 000000000..422aa39e2 --- /dev/null +++ b/deploy/templates/virtual_environment/vms/controller.xml @@ -0,0 +1,64 @@ + + controller + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/virtual_environment/vms/fuel.xml b/deploy/templates/virtual_environment/vms/fuel.xml new file mode 100644 index 000000000..e2a05d86e --- /dev/null +++ b/deploy/templates/virtual_environment/vms/fuel.xml @@ -0,0 +1,64 @@ + + fuel + 2097152 + 2097152 + 2 + + /machine + + + hvm + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/virtual_environment_noha/networks/fuel1.xml b/deploy/templates/virtual_environment_noha/networks/fuel1.xml new file mode 100644 index 000000000..7b2b15423 --- /dev/null +++ b/deploy/templates/virtual_environment_noha/networks/fuel1.xml @@ -0,0 +1,12 @@ + + fuel1 + + + + + + + + + + diff --git a/deploy/templates/virtual_environment_noha/networks/fuel2.xml b/deploy/templates/virtual_environment_noha/networks/fuel2.xml new file mode 100644 index 000000000..615c92094 --- /dev/null +++ b/deploy/templates/virtual_environment_noha/networks/fuel2.xml @@ -0,0 +1,5 @@ + + fuel2 + + + diff --git a/deploy/templates/virtual_environment_noha/networks/fuel3.xml b/deploy/templates/virtual_environment_noha/networks/fuel3.xml new file mode 100644 index 000000000..2383e6c1f --- /dev/null +++ b/deploy/templates/virtual_environment_noha/networks/fuel3.xml @@ -0,0 +1,5 @@ + + fuel3 + + + diff --git a/deploy/templates/virtual_environment_noha/networks/fuel4.xml b/deploy/templates/virtual_environment_noha/networks/fuel4.xml new file mode 100644 index 000000000..5b69f912d --- /dev/null +++ b/deploy/templates/virtual_environment_noha/networks/fuel4.xml @@ -0,0 +1,12 @@ + + fuel4 + + + + + + + + + + diff --git a/deploy/templates/virtual_environment_noha/vms/compute.xml b/deploy/templates/virtual_environment_noha/vms/compute.xml new file mode 100644 index 000000000..95db87984 --- /dev/null +++ b/deploy/templates/virtual_environment_noha/vms/compute.xml @@ -0,0 +1,64 @@ + + compute + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/virtual_environment_noha/vms/controller.xml b/deploy/templates/virtual_environment_noha/vms/controller.xml new file mode 100644 index 000000000..422aa39e2 --- /dev/null +++ b/deploy/templates/virtual_environment_noha/vms/controller.xml @@ -0,0 +1,64 @@ + + controller + 8388608 + 8388608 + 2 + + hvm + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deploy/templates/virtual_environment_noha/vms/fuel.xml b/deploy/templates/virtual_environment_noha/vms/fuel.xml new file mode 100644 index 000000000..e9d454530 --- /dev/null +++ b/deploy/templates/virtual_environment_noha/vms/fuel.xml @@ -0,0 +1,65 @@ + + fuel + 2097152 + 2097152 + 2 + + /machine + + + hvm + + + + + + + + + + + destroy + restart + restart + + /usr/bin/kvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg