cleanup to cucumber
diff --git a/libvirt/hostnode.sls b/libvirt/hostnode.sls
deleted file mode 100644
index 1838b72..0000000
--- a/libvirt/hostnode.sls
+++ /dev/null
@@ -1,19 +0,0 @@
-
-{%- if pillar.kvm.hostnode.enabled %}
-
-kvm_packages:
- pkg.installed:
- - names:
- - qemu-kvm
- - libvirt-bin
- - ubuntu-vm-builder
- - bridge-utils
-
-kvm_dir:
- file.directory:
- - name: /srv/kvm
- - user: root
- - group: root
- - mode: 775
-
-{%- endif %}
\ No newline at end of file
diff --git a/libvirt/map.jinja b/libvirt/map.jinja
index 40b4b6e..9341754 100644
--- a/libvirt/map.jinja
+++ b/libvirt/map.jinja
@@ -1,6 +1,6 @@
{% set server = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['libvirt-bin','libvirt-dev','pm-utils','libvirt0','python-libvirt'],
+ 'pkgs': ['libvirt-bin','pm-utils','libvirt0','python-libvirt'],
'kvm_pkgs': ['qemu-kvm','qemu-utils'],
'service': 'libvirt-bin',
'config': '/etc/libvirt/libvirtd.conf',
diff --git a/libvirt/server.sls b/libvirt/server.sls
deleted file mode 100644
index c4ee5ff..0000000
--- a/libvirt/server.sls
+++ /dev/null
@@ -1,54 +0,0 @@
-{% from "libvirt/map.jinja" import server with context %}
-
-{%- if server.enabled %}
-
-libvirt_packages:
- pkg.installed:
- - names: {{ server.pkgs }}
-
-libvirtd_config:
- file.managed:
- - name: {{ server.config }}
- - source: salt://libvirt/files/libvirtd.conf.{{ grains.os_family }}
- - template: jinja
- - require:
- - pkg: libvirt_packages
-
-{%- if grains.os_family == 'RedHat' %}
-
-libvirt_sysconfig:
- file.managed:
- - name: /etc/sysconfig/libvirtd
- - contents: 'LIBVIRTD_ARGS="--listen"'
- - require:
- - pkg: libvirt_packages
-
-{%- endif %}
-
-{%- if grains.os_family == 'Debian' %}
-
-/etc/default/libvirt-bin:
- file.managed:
- - source: salt://libvirt/files/libvirt-bin
- - require:
- - pkg: libvirt_packages
-
-{%- endif %}
-
-libvirt_service:
- service.running:
- - name: {{ server.service }}
- - enable: true
- - reload: true
- - watch:
- - file: libvirtd_config
-
-{%- endif %}
-
-{%- if netcfg.disabled %}
-
-/etc/libvirt/qemu/networks/default.xml:
- file.managed.absent:
-
-{%- endif %}
-
diff --git a/libvirt/server/network.sls b/libvirt/server/network.sls
index 4d83223..c4c8da5 100644
--- a/libvirt/server/network.sls
+++ b/libvirt/server/network.sls
@@ -4,7 +4,7 @@
include:
- libvirt.server.service
-{%- for name, network server:networks.iteritems() %}
+{%- for name, network in server.network.iteritems() %}
{%- set network_config_file = '/etc/libvirt/qemu/networks' ~ '/' ~ name ~ '.xml' %}
diff --git a/metadata/service/server/kvm.yml b/metadata/service/server/kvm.yml
index a4e7bcb..a392cc8 100644
--- a/metadata/service/server/kvm.yml
+++ b/metadata/service/server/kvm.yml
@@ -4,7 +4,7 @@
libvirt:
server:
enabled: true
- virtualization:
+ virtualizations:
- kvm
network:
default: