openstack/fuel-library
Code Issues Proposed changes

Merge "Allow to assign "virt" role without "compute" Change reduced-footprint rolename from "kvm-virt" to "virt""

Browse Source
This commit is contained in:
Jenkins 2015-07-16 13:29:17 +00:00 committed by Gerrit Code Review
commit cc55fdb08a
10 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/deployment_groups/tasks.yaml
View File

@ -122,9 +122,9 @@
strategy:
type: parallel
- id: kvm-virt
- id: virt
type: group
role: [kvm-virt]
role: [virt]
required_for: [deploy_end]
parameters:
strategy:

1
deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp
View File

@ -43,7 +43,6 @@ vm_config { $vms:
exec { 'generate_vms':
command => "/usr/bin/generate_vms.sh ${libvirt_dir} ${template_dir}",
onlyif => "test `virsh -q list | wc -l` -lt 1",
refreshonly => true,
path => ['/usr/sbin', '/usr/bin' , '/sbin', '/bin'],
notify => Service[$libvirt_service_name],

2
deployment/puppet/osnailyfacter/modular/generate_vms/tasks.yaml
View File

@ -1,6 +1,6 @@
- id: generate_vms
type: puppet
groups: [kvm-virt]
groups: [virt]
requires: [netconfig]
required_for: [deploy_end]
parameters:

2
deployment/puppet/osnailyfacter/modular/globals/tasks.yaml
View File

@ -2,7 +2,7 @@
type: puppet
groups: [primary-controller, controller,
cinder, cinder-vmware, compute, ceph-osd,
zabbix-server, primary-mongo, mongo]
zabbix-server, primary-mongo, mongo, virt]
required_for: [deploy_end]
requires: [hiera]
parameters:

2
deployment/puppet/osnailyfacter/modular/hiera/tasks.yaml
View File

@ -1,6 +1,6 @@
- id: hiera
type: puppet
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
requires: [deploy_start]
required_for: [deploy_end]
parameters:

2
deployment/puppet/osnailyfacter/modular/logging/tasks.yaml
View File

@ -1,6 +1,6 @@
- id: logging
type: puppet
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
required_for: [deploy_end]
requires: [globals]
parameters:

4
deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml
View File

@ -1,6 +1,6 @@
- id: netconfig
type: puppet
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
required_for: [deploy_end]
requires: [tools]
parameters:
@ -14,7 +14,7 @@
- id: connectivity_tests
type: puppet
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
required_for: [firewall, hosts]
requires: [netconfig]
parameters:

2
deployment/puppet/osnailyfacter/modular/tools/tasks.yaml
View File

@ -1,6 +1,6 @@
- id: tools
type: puppet
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo, virt]
required_for: [deploy_end]
requires: [logging]
parameters:

18
files/fuel-misc/generate_vms.sh
View File

@ -47,7 +47,7 @@ create_vm_disks() {
continue
fi
qemu-img create -f $DISK_FORMAT $DISK_PATH $DISK_SIZE
qemu-img create -f $DISK_FORMAT $DISK_PATH $DISK_SIZE || exit 2
done
}
@ -85,18 +85,20 @@ do
VM_NAME=$(basename $TEMPLATE_XML | cut -f1 -d".")
DST_XML=${LIBVIRT_DIR}/${VM_NAME}.xml
#Copy VMs xml file to libvirt and ensure autostart
if ! [[ -h "${LIBVIRT_DIR}/autostart/$VM_NAME.xml" ]]; then
ln -s $DST_XML ${LIBVIRT_DIR}/autostart/
fi
cp -f $TEMPLATE_XML $DST_XML
#Create disks for VMs
create_vm_disks $VM_NAME $TEMPLATE_XML
create_vm_disks $VM_NAME $DST_XML
#Verify cpu settings
verify_cpu $VM_NAME $TEMPLATE_XML
verify_cpu $VM_NAME $DST_XML
#Verify memory settings
verify_mem $VM_NAME $TEMPLATE_XML
#Copy VMs xml file to libvirt and ensure autostart
ln -s $DST_XML ${LIBVIRT_DIR}/autostart/
cp -f $TEMPLATE_XML $DST_XML
verify_mem $VM_NAME $DST_XML
done

6
tests/noop/astute.yaml/neut_gre.generate_vms.yaml
View File

@ -201,7 +201,7 @@ network_metadata:
user_node_name: Untitled (6a:e7)
node_roles:
- compute
- kvm-virt
- virt
name: node-128
node-129:
swift_zone: '1'
@ -481,7 +481,7 @@ nodes:
name: node-128
public_address: 172.16.0.2
public_netmask: 255.255.255.0
role: kvm-virt
role: virt
storage_address: 192.168.1.2
storage_netmask: 255.255.255.0
swift_zone: '128'
@ -661,7 +661,7 @@ repo_setup:
type: deb
uri: http://mirror.fuel-infra.org/mos/ubuntu/
resume_guests_state_on_host_boot: true
role: kvm-virt
role: virt
sahara:
db_password: f0jl4v47
enabled: false