Commit c86de92e by Desztics Armand

fixed symlinks, rabbitmq install, added hypervisortype to pillar

parent 7a927e92
vmdriver: vmdriver:
repo_name: https://git.ik.bme.hu/circle/vmdriver.git repo_name: https://git.ik.bme.hu/circle/vmdriver.git
repo_revision: master repo_revision: master
hypervisor: kvm
...@@ -55,8 +55,9 @@ include: ...@@ -55,8 +55,9 @@ include:
- user: {{ pillar['fwdriver']['user'] }} - user: {{ pillar['fwdriver']['user'] }}
- group: {{ pillar['fwdriver']['user'] }} - group: {{ pillar['fwdriver']['user'] }}
{% if grains['osfinger'] == 'Ubuntu-16.04' %}
symlink_dhcpd: symlink_dhcpd:
{% if grains['osfinger'] == 'Ubuntu-16.04' %}
file.symlink: file.symlink:
- name: /etc/systemd/system/dhcpd.service - name: /etc/systemd/system/dhcpd.service
- target: /lib/systemd/system/isc-dhcp-server.service - target: /lib/systemd/system/isc-dhcp-server.service
...@@ -68,7 +69,8 @@ symlink_dhcpd: ...@@ -68,7 +69,8 @@ symlink_dhcpd:
- require: - require:
- file: symlink_dhcpd - file: symlink_dhcpd
{% elif grains['os'] == 'Debian' %} {% elif grains['os'] == 'Debian' %}
symlink_dhcpd:
file.symlink: file.symlink:
- name: /etc/init.d/dhcpd - name: /etc/init.d/dhcpd
- target: /etc/init.d/isc-dhcp-server - target: /etc/init.d/isc-dhcp-server
...@@ -78,14 +80,15 @@ symlink_dhcpd: ...@@ -78,14 +80,15 @@ symlink_dhcpd:
- require: - require:
- file: symlink_dhcpd - file: symlink_dhcpd
{% elif grains['os_family'] != 'RedHat' %} {% elif grains['os_family'] != 'RedHat' %}
symlink_dhcpd:
file.symlink: file.symlink:
- name: /etc/init.d/isc-dhcp-server - name: /etc/init.d/isc-dhcp-server
- target: /lib/init/upstart-job - target: /lib/init/upstart-job
- force: True - force: True
- require_in: - require_in:
- service: isc-dhcp-server - service: isc-dhcp-server
{% endif %} {% endif %}
/etc/sysctl.d/60-circle-firewall.conf: /etc/sysctl.d/60-circle-firewall.conf:
file.managed: file.managed:
......
{% set amqp_islocal = (pillar['amqp']['host'] in ('localhost', '127.0.0.1')) %}
include: include:
- manager.pipeline - manager.pipeline
- manager.gitrepo - manager.gitrepo
- manager.agentgit - manager.agentgit
- manager.postgres - manager.postgres
{% if amqp_islocal %}
- manager.rabbitmq - manager.rabbitmq
{% endif %}
- manager.virtualenv - manager.virtualenv
- manager.configuration - manager.configuration
- manager.nginx - manager.nginx
...@@ -15,7 +19,9 @@ manager: ...@@ -15,7 +19,9 @@ manager:
- git - git
- python-pip - python-pip
- ntp - ntp
{% if amqp_islocal %}
- rabbitmq-server - rabbitmq-server
{% endif %}
- memcached - memcached
- gettext - gettext
- wget - wget
......
...@@ -35,7 +35,7 @@ reload_firewall: ...@@ -35,7 +35,7 @@ reload_firewall:
- user: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- require: - require:
- service: firewall2 - service: firewall2
{% if grains['os'] == 'Debian' %} {% if grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04'%}
- cmd: symlink_dhcpd - cmd: symlink_dhcpd
{% endif %} {% endif %}
......
export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }} export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
export CACHE_URI={{ pillar['cache'] }} export CACHE_URI={{ pillar['cache'] }}
export LIBVIRT_URI=qemu:///system export LIBVIRT_URI=qemu:///system
export HYPERVISOR_TYPE=kvm export HYPERVISOR_TYPE={{ pillar['vmdriver']['hypervisor'] }}
export NATIVE_OVS=True export NATIVE_OVS=True
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