diff options
author | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-08-17 09:12:57 +0200 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-08-17 13:08:01 +0000 |
commit | c4617105467bb5b440119b6d22cdcf4d09fd96f2 (patch) | |
tree | 9a6d3605a1c5557565e43364f0ca4fd8cbe43a55 /deploy/config/labs/devel-pipeline | |
parent | 8b602ad490b427e5b97dd709e4d7905b500579e3 (diff) |
Add config information as well to default lab
It is possible that some one changes the
config of the vms from a virtual environment.
This is already shown in the elx lab.
To make everyone aware of this we push it
to the default lab as well.
Change-Id: I4e9012b3237838b98321472bb16037aa0aeacfdc
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'deploy/config/labs/devel-pipeline')
-rw-r--r-- | deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml | 45 | ||||
-rw-r--r-- | deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml | 2 |
2 files changed, 46 insertions, 1 deletions
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml index 8482016f9..09b5d0845 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml @@ -36,3 +36,48 @@ disks: fuel: 100G controller: 100G compute: 100G + +# Here the infrastructure VMs can be defined. +# The entries are not mandatory! If it is left empty +# the default defined in deploy/templates will +# be used. +define_vms: + fuel: + vcpu: + value: 2 + memory: + attribute_equlas: + unit: KiB + value: 8388608 + currentMemory: + attribute_equlas: + unit: KiB + value: 8388608 + devices: + interface: + # With attribute_equlas someone can define which + # interface type is meant + attribute_equlas: + type: network + # This will overwrite the type of the model of + # the interface + model: + attribute: + type: virtio + controller: + devices: + interface: + attribute_equlas: + type: network + model: + attribute: + type: e1000 + compute: + devices: + interface: + attribute_equlas: + type: network + model: + attribute: + type: e1000 + diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml index f9580124d..47bc55009 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml @@ -63,7 +63,7 @@ define_vms: # the interface model: attribute: - type: e1000 + type: virtio controller: devices: interface: |