Skip to content

CIRCLE / salt

Go to a project
Commit 15d544d2 by Czémán Arnold
Options

Merge branch 'debian' into ceph 

Conflicts:
	README.md
parents b01ae5bd 281aa630
Showing with 258 additions and 45 deletions
README.md
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* Cent OS 7+ * Cent OS 7+
* Scientific Linux 7+ * Scientific Linux 7+
* Debian Linux family: * Debian Linux family:
* Debian linux 8+
* Ubuntu linux 14.04 LTS * Ubuntu linux 14.04 LTS
## Prerequisites ## Prerequisites
...@@ -60,7 +61,7 @@ Most used variables ...@@ -60,7 +61,7 @@ Most used variables
* **database**: * **database**:
* **password**: database user’s password * **password**: database user’s password
* **amqp**: * **amqp**:
* **password**: ampq user’s password * **password**: amqp user’s password
* **host**: amqp server IP - usually runs at localhost * **host**: amqp server IP - usually runs at localhost
* **graphite**: * **graphite**:
* **password**: graphite user’s password * **password**: graphite user’s password
...@@ -101,6 +102,7 @@ Other variables ...@@ -101,6 +102,7 @@ Other variables
* vm_if: vm interface * vm_if: vm interface
* vm_et: vm network * vm_et: vm network
* management_if: management interface * management_if: management interface
* reload_firewall_timeout: timeout for synchronous firewall reload
* graphite: * graphite:
* user: graphite user * user: graphite user
* port: graphite server’s port * port: graphite server’s port
...@@ -129,7 +131,7 @@ Other variables ...@@ -129,7 +131,7 @@ Other variables
Run the following installation command: Run the following installation command:
```bash ```bash
salt/install.sh allinone sudo salt-call state.sls allinone --local --file-root=/home/$USER/salt/salt --pillar-root=/home/$USER/salt/pillar
``` ```
After this finished, you have to get "Failed: 0" message. After this finished, you have to get "Failed: 0" message.
If installer fails, please visit the [Troubleshooting](#troubleshooting) paragraph. If installer fails, please visit the [Troubleshooting](#troubleshooting) paragraph.
...@@ -191,10 +193,11 @@ Finally, we can run the machine. Click on 'deploy' and start it. You can choose, ...@@ -191,10 +193,11 @@ Finally, we can run the machine. Click on 'deploy' and start it. You can choose,
## Troubleshooting ## ## Troubleshooting ##
### Portal won't loaded ### Portal won't load
Maybe port 443 closed. Check and open it. Maybe port 443 is closed. Check and open it.
### Portal wont loaded on Ubuntu 14.04
### Portal won't load on Ubuntu 14.04
```bash ```bash
sudo service nginx restart sudo service nginx restart
``` ```
......
pillar/firewall.sls
...@@ -17,3 +17,5 @@ fwdriver: ...@@ -17,3 +17,5 @@ fwdriver:
external_if: eth0 external_if: eth0
external_net: 10.0.0.97/16 external_net: 10.0.0.97/16
gateway: 10.0.255.254 gateway: 10.0.255.254
reload_firewall_timeout: 120
pillar/installer.sls
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#nfs: #nfs:
# enabled: true # enabled: true
# server: 10.0.0.115 # server: 10.0.0.115
# network: 192.168.1.0/24 # network: 192.168.1.0/24
# directory: /datastore # directory: /datastore
......
salt/agentdriver/configuration.sls
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- user: root - user: root
- group: root - group: root
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/agentdriver.service: /etc/systemd/system/agentdriver.service:
file.managed: file.managed:
- user: root - user: root
...@@ -37,7 +37,7 @@ incrond: ...@@ -37,7 +37,7 @@ incrond:
incron: incron:
{% endif %} {% endif %}
service: service:
- reload: true - full_restart: true
- enable: true - enable: true
- running - running
- watch: - watch:
......
salt/allinone.sls
include: include:
- profile
- agentdriver - agentdriver
- manager - manager
- graphite - graphite
......
salt/fwdriver/configuration.sls
...@@ -9,7 +9,7 @@ include: ...@@ -9,7 +9,7 @@ include:
- group: {{ pillar['fwdriver']['user'] }} - group: {{ pillar['fwdriver']['user'] }}
- mode: 700 - mode: 700
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/firewall.service: /etc/systemd/system/firewall.service:
file.managed: file.managed:
- user: root - user: root
...@@ -22,7 +22,7 @@ include: ...@@ -22,7 +22,7 @@ include:
- user: root - user: root
- group: root - group: root
- template: jinja - template: jinja
- source: file:///home/{{ pillar['fwdriver']['user'] }}/fwdriver/miscellaneous/firewall-init.service - source: salt://fwdriver/files/firewall-init.service
{% else %} {% else %}
/etc/init/firewall.conf: /etc/init/firewall.conf:
file.managed: file.managed:
...@@ -55,7 +55,7 @@ include: ...@@ -55,7 +55,7 @@ include:
- user: {{ pillar['fwdriver']['user'] }} - user: {{ pillar['fwdriver']['user'] }}
- group: {{ pillar['fwdriver']['user'] }} - group: {{ pillar['fwdriver']['user'] }}
{% if grains['os_family'] != 'RedHat' %} {% if grains['os_family'] != 'RedHat' and grains['os'] != 'Debian' %}
/etc/init.d/isc-dhcp-server: /etc/init.d/isc-dhcp-server:
file.symlink: file.symlink:
- target: /lib/init/upstart-job - target: /lib/init/upstart-job
...@@ -77,12 +77,18 @@ include: ...@@ -77,12 +77,18 @@ include:
- source: salt://fwdriver/files/sudoers - source: salt://fwdriver/files/sudoers
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
systemd-sysctl: systemd-sysctl:
cmd.run:
- name: /bin/systemctl restart systemd-sysctl
service.running: service.running:
- reload: True - watch:
- file: /etc/sysctl.d/60-circle-firewall.conf
- require:
- cmd: systemd-sysctl
{% endif %}
{% if grains['os_family'] == 'RedHat' %}
/root/firewall-init.te: /root/firewall-init.te:
file.managed: file.managed:
- source: salt://fwdriver/files/firewall-init.te - source: salt://fwdriver/files/firewall-init.te
......
salt/fwdriver/files/firewall-init.service 0 → 100644
[Unit]
Description=CIRCLE firewall init
After=network.target
#Before=firewall.service
[Service]
User=root
Group=root
Type=oneshot
ExecStart=/bin/bash -c "/bin/systemctl restart openvswitch{%if grains['os']=='Debian'%}-switch{%endif%} ; /sbin/ip netns add fw || true; ovs-vsctl del-br firewall || true; /sbin/ip netns exec fw sysctl -f /etc/sysctl.d/60-circle-firewall.conf ; /sbin/ip netns exec fw ip link set lo up"
[Install]
WantedBy=multi-user.target
salt/fwdriver/init.sls
...@@ -18,7 +18,10 @@ firewall: ...@@ -18,7 +18,10 @@ firewall:
- python-dev - python-dev
- libmemcached-dev - libmemcached-dev
- openvswitch-switch - openvswitch-switch
{% if grains['os'] != 'Debian' %}
{# No such package in Debian Jessie! #}
- openvswitch-controller - openvswitch-controller
{% endif %}
- isc-dhcp-server - isc-dhcp-server
{% endif %} {% endif %}
- git - git
......
salt/graphite/configuration.sls
...@@ -17,7 +17,7 @@ requirements: ...@@ -17,7 +17,7 @@ requirements:
- require: - require:
- user: {{ pillar['graphite']['user'] }} - user: {{ pillar['graphite']['user'] }}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/graphite.service: /etc/systemd/system/graphite.service:
file.managed: file.managed:
......
salt/manager/configuration.sls
...@@ -8,7 +8,7 @@ manager_postactivate: ...@@ -8,7 +8,7 @@ manager_postactivate:
portal.conf: portal.conf:
file.managed: file.managed:
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
- name: /etc/systemd/system/portal.service - name: /etc/systemd/system/portal.service
{% else %} {% else %}
- name: /etc/init/portal.conf - name: /etc/init/portal.conf
...@@ -16,7 +16,7 @@ portal.conf: ...@@ -16,7 +16,7 @@ portal.conf:
- user: root - user: root
- group: root - group: root
- template: jinja - template: jinja
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
{% if pillar['deployment_type'] == 'production' %} {% if pillar['deployment_type'] == 'production' %}
- source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.service - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.service
...@@ -34,7 +34,7 @@ portal.conf: ...@@ -34,7 +34,7 @@ portal.conf:
{% endif %} {% endif %}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/manager.service: /etc/systemd/system/manager.service:
file.managed: file.managed:
- user: root - user: root
......
salt/manager/files/nginx-default-site.conf
...@@ -14,9 +14,6 @@ server { ...@@ -14,9 +14,6 @@ server {
alias /home/{{ pillar['user'] }}/circle/circle/static_collected; # your Django project's static files alias /home/{{ pillar['user'] }}/circle/circle/static_collected; # your Django project's static files
} }
{% endif %} {% endif %}
location /doc {
alias /home/cloud/circle-website/_build/html;
}
location / { location / {
{% if pillar['deployment_type'] == "production" %} {% if pillar['deployment_type'] == "production" %}
......
salt/manager/files/nginx.te 0 → 100644
module nginx 1.0;
require {
type initrc_tmp_t;
type httpd_t;
type initrc_t;
class sock_file write;
class unix_stream_socket connectto;
}
#============= httpd_t ==============
allow httpd_t initrc_t:unix_stream_socket connectto;
#!!!! This avc is allowed in the current policy
allow httpd_t initrc_tmp_t:sock_file write;
salt/manager/init.sls
...@@ -61,7 +61,7 @@ manager: ...@@ -61,7 +61,7 @@ manager:
- enable: True - enable: True
- watch: - watch:
- file: manager_postactivate - file: manager_postactivate
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
- file: /etc/systemd/system/manager.service - file: /etc/systemd/system/manager.service
- file: /etc/systemd/system/managercelery@.service - file: /etc/systemd/system/managercelery@.service
{% else %} {% else %}
......
salt/manager/nginx.sls
nginx: nginx:
service.running: service.running:
- enable: True - enable: True
- require: - watch:
- pkg: nginx - pkg: nginx
- cmd: circlecert - cmd: circlecert
- file: nginxdefault - file: nginxdefault
- file: nginx_home_permission
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- file: nginxconf - file: nginxconf
- cmd: nginx_no_private_temp
{% endif %} {% endif %}
pkg: pkg:
- installed - installed
nginx_home_permission:
file.directory:
- name: /home/{{ pillar['user'] }}
- user: {{ pillar['user'] }}
- dir_mode: 711
circlecert: circlecert:
cmd.run: cmd.run:
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
...@@ -22,17 +30,50 @@ circlecert: ...@@ -22,17 +30,50 @@ circlecert:
- creates: /etc/ssl/certs/circle.pem - creates: /etc/ssl/certs/circle.pem
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
nginx_selinux: nginx_selinux_pkgs:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- policycoreutils - policycoreutils
- policycoreutils-python - policycoreutils-python
nginx_httpd_can_network_connect:
selinux.boolean: selinux.boolean:
- name: httpd_can_network_connect - name: httpd_can_network_connect
- value: True - value: True
- persist: True - persist: True
- require: - require:
- pkg: nginx_selinux - pkg: nginx_selinux_pkgs
nginx_httpd_read_user_content:
selinux.boolean:
- name: httpd_read_user_content
- value: True
- persist: True
- require:
- pkg: nginx_selinux_pkgs
/root/nginx.te:
file.managed:
- source: salt://manager/files/nginx.te
- template: jinja
- mode: 644
nginx_semodule:
cmd.run:
- cwd: /root
- user: root
- name: checkmodule -M -m -o nginx.mod nginx.te; semodule_package -o nginx.pp -m nginx.mod; semodule -i nginx.pp
- unless: semodule -l |grep -qs ^nginx
- require:
- file: /root/nginx.te
- pkg: nginx_selinux_pkgs
nginx_no_private_temp:
cmd.run:
- user: root
- name: sed -i "/PrivateTmp/d" /usr/lib/systemd/system/nginx.service
- require:
- pkg: nginx
{% endif %} {% endif %}
nginxdefault: nginxdefault:
......
salt/manager/pipeline.sls
{% if grains['os'] == 'Ubuntu' %} {% if grains['os'] == 'Ubuntu' or grains['os'] == 'Debian' %}
nodejs-legacy: nodejs-legacy:
pkg.installed pkg.installed
{% endif %} {% endif %}
npm: npm:
{% if grains['os'] == 'Ubuntu' %} {% if grains['os'] == 'Ubuntu' or grains['os'] == 'Debian' %}
pkg.installed: pkg.installed:
- require: - require:
- pkg: nodejs-legacy - pkg: nodejs-legacy
......
salt/monitor-client/configuration.sls
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- group: {{ pillar['user'] }} - group: {{ pillar['user'] }}
- mode: 700 - mode: 700
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/monitor-client.service: /etc/systemd/system/monitor-client.service:
file.managed: file.managed:
- user: root - user: root
......
salt/network/files/fix_dhcp.sh
#!/bin/bash #!/bin/bash
sed -i '/HWADDR=.*/d' /etc/sysconfig/network-scripts/ifcfg-vm sed -i '/HWADDR=.*/d' /etc/sysconfig/network-scripts/ifcfg-vm
sed -i -e \$aNM_CONTROLLED=\"no\" /etc/sysconfig/network-scripts/ifcfg-vm sed -i -e \$aNM_CONTROLLED=\"no\" /etc/sysconfig/network-scripts/ifcfg-vm
/bin/systemctl daemon-reload
ifup vm ifup vm
systemctl restart firewall systemctl restart firewall
systemctl restart dhcpd systemctl restart dhcpd
exit 0 exit 0
salt/network/files/fix_dhcp_Debian.conf 0 → 100644
# systemd service file extras added by CIRCLE Salt installer:
# openvswitch and virtual network interface must be up before
# dhcpd is started
[Unit]
After=openvswitch-switch.service
[Service]
ExecStartPre=-/sbin/ifup vm
{# TODO: change 'vm' to pillar['fwdriver']['vm_if'] ? #}
{# TODO: similar patch for firewall.service ? #}
salt/network/files/network 0 → 100644
NETWORKING_IPV6=yes
IPV6FORWARDING=yes
salt/network/files/reload_firewall.sh
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/activate source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/activate
source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
python /home/{{ pillar['user'] }}/circle/circle/manage.py reload_firewall --sync python /home/{{ pillar['user'] }}/circle/circle/manage.py reload_firewall --sync --timeout={{ pillar['fwdriver']['reload_firewall_timeout'] }}
salt/network/init.sls
...@@ -13,12 +13,26 @@ vm: ...@@ -13,12 +13,26 @@ vm:
- pre_up_cmds: - pre_up_cmds:
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- /bin/systemctl restart openvswitch - /bin/systemctl restart openvswitch
{% elif grains['os'] == 'Debian' %}
- /bin/systemctl restart openvswitch-switch
{% else %} {% else %}
- /etc/init.d/openvswitch-switch restart - /etc/init.d/openvswitch-switch restart
{% endif %} {% endif %}
- require: - require:
- cmd: ovs-if - cmd: ovs-if
{% if grains['os'] == 'Debian' %}
symlink_dhcpd:
file.symlink:
- name: /etc/init.d/dhcpd
- target: /etc/init.d/isc-dhcp-server
- force: True
cmd.run:
- name: /bin/systemctl daemon-reload
- require:
- file: symlink_dhcpd
{% endif %}
firewall2: firewall2:
service: service:
- name: firewall - name: firewall
...@@ -26,24 +40,75 @@ firewall2: ...@@ -26,24 +40,75 @@ firewall2:
- require: - require:
- network: vm - network: vm
salt://network/files/reload_firewall.sh: reload_firewall:
cmd.script: cmd.script:
- name: salt://network/files/reload_firewall.sh
- template: jinja - template: jinja
- user: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- require: - require:
- service: firewall2 - service: firewall2
{% if grains['os'] == 'Debian' %}
- cmd: symlink_dhcpd
{% endif %}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
salt://network/files/fix_dhcp.sh: net_config:
cmd.script file.managed:
- name: /etc/sysconfig/network
- source: salt://network/files/network
- user: root
- group: root
- mode: 644
fix_dhcp:
cmd.script:
- name: salt://network/files/fix_dhcp.sh
- require:
- cmd: reload_firewall
- file: net_config
{% endif %} {% endif %}
isc-dhcp-server: isc-dhcp-server:
service: {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
- running cmd.run:
- name: /bin/systemctl restart dhcpd
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- name: dhcpd - watch:
- cmd: fix_dhcp
{% elif grains['os'] == 'Debian' %}
- watch:
- cmd: fix_dhcp_daemon_reload
{% endif %} {% endif %}
{% endif %}
service.running:
- enable: True - enable: True
- reload: True {% if grains['os_family'] == 'RedHat' %}
- watch:
- cmd: fix_dhcp
{% elif grains['os'] == 'Debian' %}
- watch:
- cmd: fix_dhcp_daemon_reload
{% endif %}
{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
- name: dhcpd
- require:
- cmd: isc-dhcp-server
{% endif %}
{% if grains['os'] == 'Debian' %}
{# For next reboot #}
after_openvswitch_conf:
file.managed:
- name: /etc/systemd/system/isc-dhcp-server.service.d/after_openvswitch.conf
- source: salt://network/files/fix_dhcp_Debian.conf
- user: root
- group: root
- template: jinja
- makedirs: True
fix_dhcp_daemon_reload:
cmd.run:
- name: /bin/systemctl daemon-reload
- require:
- file: after_openvswitch_conf
{% endif %}
salt/node.sls
include: include:
- profile
- agentdriver - agentdriver
- monitor-client - monitor-client
- vmdriver - vmdriver
......
salt/profile.sls 0 → 100644
{% if grains['os']=='Debian' %}
{# For non-interactive shells, virtualenvwrapper commands
('workon' etc.) are not sourced automatically #}
/etc/profile:
file.append:
- text:
- "#Line below added for Debian by CIRCLE Salt installer"
- . /etc/bash_completion
{% endif %}
salt/storagedriver/configuration.sls
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- group: {{ pillar['user'] }} - group: {{ pillar['user'] }}
- mode: 700 - mode: 700
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/storagecelery@.service: /etc/systemd/system/storagecelery@.service:
file.managed: file.managed:
- user: root - user: root
......
salt/vmdriver/configuration.sls
...@@ -9,9 +9,10 @@ include: ...@@ -9,9 +9,10 @@ include:
- group: {{ pillar['user'] }} - group: {{ pillar['user'] }}
- mode: 700 - mode: 700
{% set service_dir = "/etc/systemd/system/" if grains['os_family'] == 'RedHat' else "/etc/init/" %} {% set service_dir = "/etc/systemd/system/" if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' else "/etc/init/" %}
{% set service_files = (("vmcelery@.service", "netcelery@.service", "node.service") {% set service_files = (("vmcelery@.service", "netcelery@.service", "node.service")
if grains['os_family'] == 'RedHat' else if grains['os_family'] == 'RedHat'
or grains['os'] == 'Debian' else
("vmcelery.conf", "netcelery.conf", "node.conf")) %} ("vmcelery.conf", "netcelery.conf", "node.conf")) %}
{% for file in service_files %} {% for file in service_files %}
......
salt/vmdriver/files/org.libvirt.unix.manage.pkla 0 → 100644
[Allow cloud libvirt management permissions]
Identity=unix-user:cloud
Action=org.libvirt.unix.manage;org.libvirt.unix.monitor
ResultAny=yes
ResultInactive=yes
ResultActive=yes
{# TODO: change 'cloud' to ? #}
salt/vmdriver/files/sudoers
{{ pillar['user'] }} ALL = (ALL) NOPASSWD: /usr/bin/ovs-ofctl, /usr/bin/ovs-vsctl, /sbin/ip link set * {{ pillar['user'] }} ALL = (ALL) NOPASSWD: /usr/bin/ovs-ofctl, /usr/bin/ovs-vsctl, /sbin/ip link set *
Defaults: cloud !requiretty Defaults: {{ pillar['user'] }} !requiretty
salt/vmdriver/init.sls
...@@ -32,7 +32,10 @@ vmdriver: ...@@ -32,7 +32,10 @@ vmdriver:
- libxslt1-dev - libxslt1-dev
- openvswitch-common - openvswitch-common
- openvswitch-switch - openvswitch-switch
{% if grains['os'] != 'Debian' %}
{# No such package in Debian Jessie! #}
- openvswitch-controller - openvswitch-controller
{% endif %}
- python-dev - python-dev
- python-libvirt - python-libvirt
- virtualenvwrapper - virtualenvwrapper
...@@ -41,7 +44,7 @@ vmdriver: ...@@ -41,7 +44,7 @@ vmdriver:
{% endif %} {% endif %}
- require_in: - require_in:
- file: /etc/default/libvirt-bin - file: /etc/default/libvirt-bin
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
- service: libvirtd - service: libvirtd
{% else %} {% else %}
- file: /etc/apparmor.d/libvirt/TEMPLATE - file: /etc/apparmor.d/libvirt/TEMPLATE
......
salt/vmdriver/libvirt.sls
...@@ -15,7 +15,7 @@ libvirtconf: ...@@ -15,7 +15,7 @@ libvirtconf:
file.append: file.append:
- text: libvirtd_opts="-d -l" - text: libvirtd_opts="-d -l"
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
libvirtd: libvirtd:
{% else %} {% else %}
libvirt-bin: libvirt-bin:
...@@ -65,6 +65,32 @@ vmdriver_semodule: ...@@ -65,6 +65,32 @@ vmdriver_semodule:
- file: /root/vmdriver.te - file: /root/vmdriver.te
- pkg: selinux_pkgs - pkg: selinux_pkgs
{% elif grains['os'] == 'Debian' %}
/usr/bin/kvm:
file.replace:
- pattern: -enable-kvm
- repl: ""
- watch:
- pkg: vmdriver
policycoreutils:
pkg.installed
{# Note: Debian Jessie has polkit 0.105, which uses pkla format instead of js #}
/etc/polkit-1/localauthority/50-local.d/org.libvirt.unix.manage.pkla:
file.managed:
- source: salt://vmdriver/files/org.libvirt.unix.manage.pkla
- user: root
- group: root
- template: jinja
polkitd:
service:
- running
- watch:
- file: /etc/polkit-1/localauthority/50-local.d/org.libvirt.unix.manage.pkla
{% else %} {% else %}
/etc/apparmor.d/libvirt/TEMPLATE: /etc/apparmor.d/libvirt/TEMPLATE:
......
salt/vmdriver/virtualenv.sls
...@@ -7,10 +7,14 @@ virtualenv_vmdriver: ...@@ -7,10 +7,14 @@ virtualenv_vmdriver:
{% set libvirt_dir = "/usr/lib64/python2.7/site-packages/" if grains['os_family'] == 'RedHat' else "/usr/lib/python2.7/dist-packages/" %} {% 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 {} %}
{% for file in ("libvirtmod_qemu.so", "libvirtmod.so", "libvirt_qemu.py", "libvirt.py", "libvirt_qemu.pyc", "libvirt.pyc") %} {% 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 }}: /home/{{ pillar['user'] }}/.virtualenvs/vmdriver/lib/python2.7/site-packages/{{ file }}:
file.symlink: file.symlink:
- target: {{ libvirt_dir + file }} - target: {{ libvirt_dir + targets[file]|default(file) }}
- require: - require:
- virtualenv: virtualenv_vmdriver - virtualenv: virtualenv_vmdriver
{% endfor %} {% endfor %}
salt/vncproxy/configuration.sls
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- group: {{ pillar['user'] }} - group: {{ pillar['user'] }}
- mode: 700 - mode: 700
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
/etc/systemd/system/vncproxy.service: /etc/systemd/system/vncproxy.service:
file.managed: file.managed:
- user: root - user: root
......
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