random fixes

salt/agentdriver/configuration.sls

@@ -38,6 +38,7 @@ incron:
 {% endif %}
 {% endif %}
   service:
   service:
     - reload: true
     - reload: true
+    - enable: true
     - running
     - running
     - watch:
     - watch:
       - file: /etc/incron.d/agentdriver
       - file: /etc/incron.d/agentdriver

salt/manager/init.sls

@@ -75,6 +75,7 @@ portal:
     - watch:
     - watch:
       - file: manager_postactivate
       - file: manager_postactivate
       - file: portal.conf
       - file: portal.conf
+      - sls: manager.gitrepo
 
 
 memcached:
 memcached:
   service:
   service:

salt/manager/nginx.sls

@@ -17,6 +17,20 @@ circlecert:
     - cwd: /etc/ssl/certs/
     - cwd: /etc/ssl/certs/
     - creates: /etc/ssl/certs/circle.pem
     - creates: /etc/ssl/certs/circle.pem
 
 
+{% if grains['os_family'] == 'RedHat' %}
+nginx_selinux:
+  pkg.installed:
+    - pkgs:
+      - policycoreutils
+      - policycoreutils-python
+  selinux.boolean:
+    - name: httpd_can_network_connect
+    - value: True
+    - persist: True
+    - require:
+      - pkg: nginx_selinux
+{% endif %}
+
 nginxdefault:
 nginxdefault:
   file.managed:
   file.managed:
   {% if grains['os_family'] == 'RedHat' %}
   {% if grains['os_family'] == 'RedHat' %}

salt/manager/postgres.sls

@@ -3,7 +3,7 @@ postgresql_initdb:
   cmd.run:
   cmd.run:
     - cwd: /
     - cwd: /
     - user: root
     - user: root
-    - name: service postgresql initdb
+    - name: postgresql-setup initdb
     - unless: test -f /var/lib/pgsql/data/postgresql.conf
     - unless: test -f /var/lib/pgsql/data/postgresql.conf
     - env:
     - env:
       LC_ALL: C.UTF-8
       LC_ALL: C.UTF-8

salt/manager/rabbitmq.sls

 rabbitmq-server:
 rabbitmq-server:
   pkg.installed:
   pkg.installed:
     - name: rabbitmq-server
     - name: rabbitmq-server
+  {% if grains['os_family'] == 'RedHat' %}
+  file.managed:
+    - name: /etc/rabbitmq/rabbitmq-env.conf
+    - contents: RABBITMQ_DIST_PORT=5671
+  {% endif %}
   service.running:
   service.running:
     - enable: True
     - enable: True
     - require:
     - require:
       - pkg: rabbitmq-server
       - pkg: rabbitmq-server
+      {% if grains['os_family'] == 'RedHat' %}
+      - file: rabbitmq-server
+      {% endif %}
 
 
 rabbitmq_user:
 rabbitmq_user:
   rabbitmq_user.present:
   rabbitmq_user.present:
     - name: {{ pillar['amqp']['user'] }}
     - name: {{ pillar['amqp']['user'] }}
     - password: {{ pillar['amqp']['password'] }}
     - password: {{ pillar['amqp']['password'] }}
+    - require:
+      - service: rabbitmq-server
 
 
 virtual_host:
 virtual_host:
-    rabbitmq_vhost.present:
-        - name: {{ pillar['amqp']['vhost']}}
-        - user: {{ pillar['amqp']['user'] }}
-        - conf: .*
-        - write: .*
-        - read: .*
+  rabbitmq_vhost.present:
+    - name: {{ pillar['amqp']['vhost']}}
+    - user: {{ pillar['amqp']['user'] }}
+    - conf: .*
+    - write: .*
+    - read: .*
+    - require:
+      - service: rabbitmq-server

salt/vmdriver/files/10.virt.rules

+polkit.addRule(function(action, subject) {
+  polkit.log("action=" + action);
+  polkit.log("subject=" + subject);
+  var now = new Date();
+  polkit.log("now=" + now)
+  if ((action.id == "org.libvirt.unix.manage" || action.id == "org.libvirt.unix.monitor") && subject.isInGroup("wheel")) {
+    return polkit.Result.YES;
+  }
+  return null;
+});

salt/vmdriver/files/vmdriver.te

+
+module vmdriver 1.0;
+
+require {
+	type virt_var_lib_t;
+	type svirt_tcg_t;
+	class sock_file { create unlink };
+	class dir { write remove_name add_name };
+}
+
+#============= svirt_tcg_t ==============
+allow svirt_tcg_t virt_var_lib_t:dir { write remove_name add_name };
+allow svirt_tcg_t virt_var_lib_t:sock_file { create unlink };

salt/vmdriver/libvirt.sls

@@ -26,6 +26,40 @@ libvirt-bin:
   file.symlink:
   file.symlink:
     - target: /usr/libexec/qemu-kvm
     - target: /usr/libexec/qemu-kvm
 
 
+/etc/polkit-1/rules.d/10.virt.rules:
+  file.managed:
+    - source: salt://vmdriver/files/10.virt.rules
+    - template: jinja
+    - mode: 644
+
+polkit:
+  service:
+    - running
+    - watch:
+      - file: /etc/polkit-1/rules.d/10.virt.rules
+
+/root/vmdriver.te:
+  file.managed:
+    - source: salt://vmdriver/files/vmdriver.te
+    - template: jinja
+    - mode: 644
+
+selinux_pkgs:
+  pkg.installed:
+    - pkgs:
+      - policycoreutils
+      - policycoreutils-python
+
+vmdriver_semodule:
+  cmd.run:
+    - cwd: /root
+    - user: root
+    - name: checkmodule -M -m -o vmdriver.mod vmdriver.te; semodule_package -o vmdriver.pp -m vmdriver.mod; semodule -i vmdriver.pp
+    - unless: semodule -l |grep -qs ^vmdriver
+    - require:
+      - file: /root/vmdriver.te
+      - pkg: selinux_pkgs
+
 {% else %}
 {% else %}
 
 
 /etc/apparmor.d/libvirt/TEMPLATE:
 /etc/apparmor.d/libvirt/TEMPLATE: