Commit c86de92e by Desztics Armand

fixed symlinks, rabbitmq install, added hypervisortype to pillar

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