diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-05 13:25:08 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-05 13:25:08 +0000 |
commit | a1a413ad65c31ebf5dc42924f7ed04ab02a04872 (patch) | |
tree | bfe49085fe03cc6578ca9cd00ea82802bb57d1be /deploy/templates/ericsson | |
parent | 14d7bf43d3790a0a5fb69c9eff0e93b9fd63c5ba (diff) | |
parent | 1b89628e4571a65245a743e4a85d38438a119b3d (diff) |
Merge "build, deploy: Remove obsolete Fuel@Openstack code"
Diffstat (limited to 'deploy/templates/ericsson')
7 files changed, 0 insertions, 309 deletions
diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml deleted file mode 100644 index 7b2b15423..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel1.xml +++ /dev/null @@ -1,12 +0,0 @@ -<network> - <name>fuel1</name> - <forward mode='nat'> - <nat> - <port start='1024' end='65535'/> - </nat> - </forward> - <bridge name='fuel1' stp='on' delay='0'/> - <ip address='10.20.0.1' netmask='255.255.255.0'> - </ip> -</network> - diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml deleted file mode 100644 index 615c92094..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel2.xml +++ /dev/null @@ -1,5 +0,0 @@ -<network> - <name>fuel2</name> - <bridge name='fuel2' stp='on' delay='0'/> -</network> - diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml deleted file mode 100644 index 2383e6c1f..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel3.xml +++ /dev/null @@ -1,5 +0,0 @@ -<network> - <name>fuel3</name> - <bridge name='fuel3' stp='on' delay='0'/> -</network> - diff --git a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml b/deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml deleted file mode 100644 index 5b69f912d..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/networks/fuel4.xml +++ /dev/null @@ -1,12 +0,0 @@ -<network> - <name>fuel4</name> - <forward mode='nat'> - <nat> - <port start='1024' end='65535'/> - </nat> - </forward> - <bridge name='fuel4' stp='on' delay='0'/> - <ip address='172.16.0.1' netmask='255.255.255.0'> - </ip> -</network> - diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml deleted file mode 100644 index 310ce292a..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml +++ /dev/null @@ -1,91 +0,0 @@ -<domain type='kvm'> - <name>compute</name> - <memory unit='KiB'>8388608</memory> - <currentMemory unit='KiB'>8388608</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='network'/> - <boot dev='hd'/> - <bios rebootTimeout='30000'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <source network='fuel1'/> - <model type='e1000'/> - </interface> - <interface type='network'> - <source network='fuel2'/> - <model type='e1000'/> - </interface> - <interface type='network'> - <source network='fuel3'/> - <model type='e1000'/> - </interface> - <interface type='network'> - <source network='fuel4'/> - <model type='e1000'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> - <sound model='ich6'> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - </video> - <memballoon model='virtio'> - </memballoon> - </devices> -</domain> diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml deleted file mode 100644 index d0d0ef14c..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml +++ /dev/null @@ -1,91 +0,0 @@ -<domain type='kvm'> - <name>controller</name> - <memory unit='KiB'>8388608</memory> - <currentMemory unit='KiB'>8388608</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='network'/> - <boot dev='hd'/> - <bios rebootTimeout='30000'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='usb' index='0'> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <source network='fuel1'/> - <model type='e1000'/> - </interface> - <interface type='network'> - <source network='fuel2'/> - <model type='e1000'/> - </interface> - <interface type='network'> - <source network='fuel3'/> - <model type='e1000'/> - </interface> - <interface type='network'> - <source network='fuel4'/> - <model type='e1000'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> - <sound model='ich6'> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - </video> - <memballoon model='virtio'> - </memballoon> - </devices> -</domain> diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml deleted file mode 100644 index 223a65805..000000000 --- a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml +++ /dev/null @@ -1,93 +0,0 @@ -<domain type='kvm'> - <name>fuel</name> - <memory unit='KiB'>2097152</memory> - <currentMemory unit='KiB'>2097152</currentMemory> - <vcpu placement='static'>2</vcpu> - <resource> - <partition>/machine</partition> - </resource> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - <boot dev='cdrom'/> - <bootmenu enable='no'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide'/> - <readonly/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='qcwo2'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - <controller type='ide' index='0'> - </controller> - <controller type='usb' index='0'> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <source network='fuel1'/> - <model type='e1000'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'> - <listen type='address' address='127.0.0.1'/> - </graphics> - <sound model='ich6'> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - </video> - <memballoon model='virtio'> - </memballoon> - </devices> - <seclabel type='dynamic' model='apparmor' relabel='yes'/> -</domain> - |