vmdriver install test

a477ae1b · Szeberényi Imre · 3f9822e7 · a477ae1b · a477ae1b · a477ae1b
Commit a477ae1b authored Jan 16, 2022 by Szeberényi Imre
Show whitespace changes
Inline Side-by-side

Showing with 81 additions and 62 deletions

salt/vmdriver/configuration.sls
+5 -3

salt/vmdriver/init.sls
+30 -33

salt/vmdriver/libvirt.sls
+24 -24

salt/vmdriver/virtualenv.sls
+22 -2

No files found.
--- a/salt/vmdriver/configuration.sls
+++ b/salt/vmdriver/configuration.sls
@@ -8,11 +8,12 @@ include:
    - user: {{ pillar['user'] }}
    - group: {{ pillar['user'] }}
    - mode: 700
+    - require:
+      - virtualenv: virtualenv_vmdriver
-{% set service_dir = "/etc/systemd/system/" if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' else "/etc/init/" %}
+{% set service_dir = "/etc/systemd/system/" if pillar['init_type'] == 'systemd' else "/etc/init/" %}
 {% set service_files = (("vmcelery@.service", "netcelery@.service", "node.service")
-                        if grains['os_family'] == 'RedHat' 
+                        if pillar['init_type'] == 'systemd' else
-                        or grains['os'] == 'Debian' else
                        ("vmcelery.conf", "netcelery.conf", "node.conf")) %}
 {% for file in service_files %}
@@ -36,3 +37,4 @@ ovs-bridge:
    - user: root
    - group: root
    - mode: 600
--- a/salt/vmdriver/init.sls
+++ b/salt/vmdriver/init.sls
@@ -16,11 +16,10 @@ vmdriver:
    - pkgs:
      - git
      - python-augeas
-      - ntp
+      - chrony
      - wget
      {% if grains['os_family'] == 'RedHat' %}
      - qemu-kvm-ev
-      - python2-pip
      - libmemcached-devel
      - libvirt
      - libvirt-daemon
@@ -28,57 +27,55 @@ vmdriver:
      - libvirt-python
      - libxml2-devel
      - libxslt-devel
-      - python-devel
+      - python3-devel
-      - python-virtualenvwrapper
      - qemu-img-ev
      - zlib-devel
      {% else %}
      - qemu-kvm
-      - python-pip
+#      - libvirt-bin
+      - virt-manager
      - libmemcached-dev
-      - libvirt-bin
      - libxml2-dev
      - libxslt1-dev
+      - python3-dev
      - openvswitch-common
      - openvswitch-switch
-      {% if grains['os'] != 'Debian' %}
+      {% if grains['os_family'] != 'Debian' %}
      {# No such package in Debian Jessie! #}
      - openvswitch-controller
      {% endif %}
-      - python-dev
      - python-libvirt
-      - virtualenvwrapper
      - qemu-utils
      - zlib1g-dev
      {% endif %}
    - require_in:
-      - file: /etc/default/libvirt-bin
+#      - file: /etc/default/libvirt-bin
-      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+#      {% if grains['os_family'] == 'RedHat' or grains['os_family'] == 'Debian' %}
-      - service: libvirtd
+#      - service: libvirtd
-      {% else %}
+#      {% else %}
-      - file: /etc/apparmor.d/libvirt/TEMPLATE
+#      - file: /etc/apparmor.d/libvirt/TEMPLATE
-      - file: /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
+#      - file: /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
-      - file: /var/lib/libvirt/serial
+#      - file: /var/lib/libvirt/serial
-      - service: libvirt-bin
+#      - service: libvirt-bin
-      {% endif %}
+#      {% endif %}
-      - augeas: libvirtconf
+#      - augeas: libvirtconf
      - git: gitrepo_vmdriver
      - virtualenv: virtualenv_vmdriver
-    {% if grains['os_family'] == 'RedHat' %}
+#    {% if grains['os_family'] == 'RedHat' %}
-    - require:
+#    - require:
-      - pkg: ev_repo_for_vmdriver
+#      - pkg: ev_repo_for_vmdriver
-    {% endif %}
+#    {% endif %}
-agentdriver_service:
+#agentdriver_service:
-  service:
+#  service:
-    - name: agentdriver
+#    - name: agentdriver
-    - running
+#    - running
-    - enable: true
+#    - enable: true
-    - watch:
+#    - watch:
-      - pkg: agentdriver
+#      - pkg: agentdriver
-      - sls: agentdriver.gitrepo
+#      - sls: agentdriver.gitrepo
-      - sls: agentdriver.virtualenv
+#      - sls: agentdriver.virtualenv
-      - sls: agentdriver.configuration
+#      - sls: agentdriver.configuration
 node:
  service:

--- a/salt/vmdriver/libvirt.sls
+++ b/salt/vmdriver/libvirt.sls
@@ -3,28 +3,28 @@ augeas_dependency:
    - pkgs:
      - python-augeas
-libvirtconf:
+#libvirtconf:
-  augeas.change:
+#  augeas.change:
-    - context: /files/etc/libvirt/libvirtd.conf
+#    - context: /files/etc/libvirt/libvirtd.conf
-    - changes:
+#    - changes:
-      - set listen_tcp 1
+#      - set listen_tcp 1
-      - set listen_tls 0
+#      - set listen_tls 0
-      - set auth_tcp "none"
+#      - set auth_tcp "none"
-/etc/default/libvirt-bin:
+#/etc/default/libvirt-bin:
-  file.append:
+#  file.append:
-    - text: libvirtd_opts="-d -l"
+#    - text: libvirtd_opts="-d -l"
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os_family'] == 'Debian' %}
 libvirtd:
 {% else %}
 libvirt-bin:
 {% endif %}
  service:
    - running
-    - watch:
+#    - watch:
-      - file: /etc/default/libvirt-bin
+#      - file: /etc/default/libvirt-bin
-      - augeas: libvirtconf
+#      - augeas: libvirtconf
 {% if grains['os_family'] == 'RedHat' %}
 /usr/bin/kvm:
@@ -65,14 +65,14 @@ vmdriver_semodule:
      - file: /root/vmdriver.te
      - pkg: selinux_pkgs
-{% elif grains['os'] == 'Debian' %}
+{% elif grains['os_family'] == 'Debian' %}
-/usr/bin/kvm:
+#/usr/bin/kvm:
-  file.replace:
+#  file.replace:
-    - pattern: -enable-kvm
+#    - pattern: -enable-kvm
-    - repl: ""
+#    - repl: ""
-    - watch:
+#    - watch:
-      - pkg: vmdriver
+#      - pkg: vmdriver
 policycoreutils:
  pkg.installed
@@ -85,7 +85,7 @@ policycoreutils:
    - group: root
    - template: jinja
-polkitd:
+polkit:
  service:
    - running
    - watch:

--- a/salt/vmdriver/virtualenv.sls
+++ b/salt/vmdriver/virtualenv.sls
+include:
+  - common
 virtualenv_vmdriver:
  virtualenv.managed:
+    - python: /usr/bin/python3
+    - name: /home/{{ pillar['user'] }}/.virtualenvs/vmdriver
+    - requirements: /home/{{ pillar['user'] }}/vmdriver/requirements/{{ pillar['deployment_type'] }}.txt
+    - user: {{ pillar['user'] }}
+    - cwd: /home/{{ pillar['user'] }}/vmdriver
+    - no_chown: true
+    - require:
+      - git: gitrepo_vmdriver
+      - virtualenv: virtualenv_vmdriver_install_first
+virtualenv_vmdriver_install_first:
+  virtualenv.managed:
+    - python: /usr/bin/python3
    - name: /home/{{ pillar['user'] }}/.virtualenvs/vmdriver
-    - requirements: /home/{{ pillar['user'] }}/vmdriver/requirements/production.txt
+    - requirements: /home/{{ pillar['user'] }}/circle/requirements/install_first.txt
    - user: {{ pillar['user'] }}
+    - cwd: /home/{{ pillar['user'] }}/vmdriver
    - no_chown: true
+{#
 {% set libvirt_dir = "/usr/lib64/python2.7/site-packages/" if grains['os_family'] == 'RedHat' else "/usr/lib/python2.7/dist-packages/" %}
 {% set targets = { 'libvirtmod_qemu.so': 'libvirtmod_qemu.x86_64-linux-gnu.so',
                   'libvirtmod.so': 'libvirtmod.x86_64-linux-gnu.so'
-                 } if grains['os'] == 'Debian' else {} %}
+                 } if grains['os_family'] == 'Debian' else {} %}
 {% for file in ("libvirtmod_qemu.so", "libvirtmod.so", "libvirt_qemu.py", "libvirt.py", "libvirt_qemu.pyc", "libvirt.pyc") %}
 /home/{{ pillar['user'] }}/.virtualenvs/vmdriver/lib/python2.7/site-packages/{{ file }}:
@@ -18,3 +37,4 @@ virtualenv_vmdriver:
    - require:
      - virtualenv: virtualenv_vmdriver
 {% endfor %}
+#}