Commit 1b603e02 by Your Name

libvirt config fix

parent 613499eb
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
# directory: /datastore # directory: /datastore
#storagedriver: #storagedriver:
# queue_name: cloud-41118 # queue_name: cloud-41125
#fwdriver: #fwdriver:
# queue_name: cloud-41118 # queue_name: cloud-41125
# gateway: 10.0.255.254 # gateway: 10.0.255.254
# external_net: 10.9.0.87/16 # external_net: 10.9.0.142
# external_if: eth0 # external_if: eth0
# trunk_if: linkb # trunk_if: linkb
# management_if: ethy # management_if: ethy
storagedriver: storagedriver:
repo_name: https://git.ik.bme.hu/circle3/storagedriver.git repo_name: https://git.ik.bme.hu/circle3/storagedriver.git
repo_revision: master repo_revision: master
queue_name: storageserver
...@@ -21,6 +21,13 @@ ...@@ -21,6 +21,13 @@
- template: jinja - template: jinja
- source: file:///home/{{ pillar['user'] }}/agentdriver/miscellaneous/agentdriver.service - source: file:///home/{{ pillar['user'] }}/agentdriver/miscellaneous/agentdriver.service
agentdriver:
service.running:
- enable: true
- reload: true
- require:
- file: /etc/systemd/system/agentdriver.service
{% else %} {% else %}
/etc/init/agentdriver.conf: /etc/init/agentdriver.conf:
......
...@@ -3,11 +3,11 @@ include: ...@@ -3,11 +3,11 @@ include:
- agentdriver.virtualenv - agentdriver.virtualenv
- agentdriver.configuration - agentdriver.configuration
agentdriver: init_agentdriver:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- ntp - chrony
- incron - incron
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- libmemcached-devel - libmemcached-devel
......
...@@ -2,8 +2,7 @@ virtualenv_monitor-client: ...@@ -2,8 +2,7 @@ virtualenv_monitor-client:
virtualenv.managed: virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/monitor-client - name: /home/{{ pillar['user'] }}/.virtualenvs/monitor-client
- python: /usr/bin/python3 - python: /usr/bin/python3
# - requirements: /home/{{ pillar['user'] }}/monitor-client/requirements/{{ pillar['deployment_type'] }}.txt - requirements: /home/{{ pillar['user'] }}/monitor-client/requirements/{{ pillar['deployment_type'] }}.txt
- requirements: /home/{{ pillar['user'] }}/monitor-client/requirements.txt
- user: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- cwd: /home/{{ pillar['user'] }}/monitor-client/ - cwd: /home/{{ pillar['user'] }}/monitor-client/
- no_chown: true - no_chown: true
......
...@@ -3,13 +3,13 @@ augeas_dependency: ...@@ -3,13 +3,13 @@ augeas_dependency:
- pkgs: - pkgs:
- python-augeas - 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:
......
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