Commit 365c2a84 by Czémán Arnold

Merge branch 'issue_23' into 'master'

Replace qemu-kvm package

See merge request !8
parents 8c57ec2d ca937bde
...@@ -4,6 +4,13 @@ include: ...@@ -4,6 +4,13 @@ include:
- vmdriver.virtualenv - vmdriver.virtualenv
- vmdriver.configuration - vmdriver.configuration
{% if grains['os_family'] == 'RedHat' %}
ev_repo:
pkg.installed:
- name: centos-release-qemu-ev
{% endif %}
vmdriver: vmdriver:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
...@@ -11,8 +18,8 @@ vmdriver: ...@@ -11,8 +18,8 @@ vmdriver:
- python-augeas - python-augeas
- ntp - ntp
- wget - wget
- qemu-kvm
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- qemu-kvm-ev
- python2-pip - python2-pip
- libmemcached-devel - libmemcached-devel
- libvirt - libvirt
...@@ -26,6 +33,7 @@ vmdriver: ...@@ -26,6 +33,7 @@ vmdriver:
- qemu-img - qemu-img
- zlib-devel - zlib-devel
{% else %} {% else %}
- qemu-kvm
- python-pip - python-pip
- libmemcached-dev - libmemcached-dev
- libvirt-bin - libvirt-bin
...@@ -56,6 +64,10 @@ vmdriver: ...@@ -56,6 +64,10 @@ vmdriver:
- augeas: libvirtconf - augeas: libvirtconf
- git: gitrepo_vmdriver - git: gitrepo_vmdriver
- virtualenv: virtualenv_vmdriver - virtualenv: virtualenv_vmdriver
{% if grains['os_family'] == 'RedHat' %}
- require:
- pkg: ev_repo
{% endif %}
agentdriver_service: agentdriver_service:
service: service:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment