vmdriver, storagedriver: fix salt errors when re-run

salt/storagedriver/init.sls

@@ -4,6 +4,13 @@ include:
   - storagedriver.configuration
   - storagedriver.nfs-server 
 
+
+{% if grains['os_family'] == 'RedHat' %}
+ev_repo_for_storagedriver:
+  pkg.installed:
+    - name: centos-release-qemu-ev
+{% endif %}
+
 storagedriver:
   pkg.installed:
     - pkgs:
@@ -14,7 +21,7 @@ storagedriver:
       - libmemcached-devel
       - python-devel
       - python-virtualenvwrapper
-      - qemu-img
+      - qemu-img-ev
       - zlib-devel
       {% else %}
       - python-pip
@@ -27,6 +34,10 @@ storagedriver:
     - require_in:
       - git: gitrepo_storagedriver
       - virtualenv: virtualenv_storagedriver
+    {% if grains['os_family'] == 'RedHat' %}
+    - require:
+      - pkg: ev_repo_for_storagedriver
+    {% endif %}
 
 storage:
   service:

salt/vmdriver/init.sls

@@ -6,7 +6,7 @@ include:
 
 
 {% if grains['os_family'] == 'RedHat' %}
-ev_repo:
+ev_repo_for_vmdriver:
   pkg.installed:
     - name: centos-release-qemu-ev
 {% endif %}
@@ -30,7 +30,7 @@ vmdriver:
       - libxslt-devel
       - python-devel
       - python-virtualenvwrapper
-      - qemu-img
+      - qemu-img-ev
       - zlib-devel
       {% else %}
       - qemu-kvm
@@ -66,7 +66,7 @@ vmdriver:
       - virtualenv: virtualenv_vmdriver
     {% if grains['os_family'] == 'RedHat' %}
     - require:
-       - pkg: ev_repo
+      - pkg: ev_repo_for_vmdriver
     {% endif %}
 
 agentdriver_service: