Skip to content

CIRCLE3 / salt

Go to a project
Commit 70870406 by Szeberényi Imre
Options

component integration and reorg.

parent a477ae1b
Showing with 81 additions and 71 deletions
pillar/installer.sls
......@@ -8,7 +8,7 @@
#init_type: systemd
#admin_user: admin
#admin_pass: 4j23oihreehfd
#admin_pass: admin
#database:
# name: circle
......@@ -40,12 +40,12 @@
# directory: /datastore
#storagedriver:
# queue_name: cloud-6605
# queue_name: cloud-41118
#fwdriver:
# queue_name: cloud-6605
# queue_name: cloud-41118
# gateway: 10.0.255.254
# external_net: 10.0.0.115/16
# external_net: 10.9.0.87/16
# external_if: eth0
# trunk_if: linkb
# management_if: ethy
pillar/monitor-client.sls
monitor-client:
repo_name: https://git.ik.bme.hu/circle3/monitor-client.git
repo_revision: ptyhon3.6
repo_revision: master
pillar/storagedriver.sls
storagedriver:
repo_name: https://git.ik.bme.hu/circle3/storagedriver.git
repo_revision: python3.6
repo_revision: master
queue_name: storageserver
pillar/vmdriver.sls
vmdriver:
repo_name: https://git.ik.bme.hu/circle3/vmdriver.git
repo_revision: python3.6
hypervisor_type: kvm
repo_revision: master
hypervisor_type: qemu
salt/agentdriver/configuration.sls
......@@ -13,7 +13,7 @@
- user: root
- group: root
{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
{% if pillar['init_type'] == 'systemd' %}
/etc/systemd/system/agentdriver.service:
file.managed:
- user: root
......
salt/agentdriver/init.sls
......@@ -10,16 +10,12 @@ agentdriver:
- ntp
- incron
{% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libmemcached-devel
- python-devel
- python-virtualenvwrapper
- python3-devel
- zlib-devel
{% else %}
- libmemcached-dev
- python-dev
- virtualenvwrapper
- python-pip
- python3-dev
- zlib1g-dev
{% endif %}
- require_in:
......@@ -28,7 +24,7 @@ agentdriver:
user:
- present
- name: {{ pillar['user'] }}
- gid_from_name: True
- usergroup: True
- shell: /bin/bash
- groups:
{% if grains['os_family'] == 'RedHat' %}
......
salt/agentdriver/virtualenv.sls
virtualenv_agentdriver:
virtualenv.managed:
- python: /usr/bin/python3
- name: /home/{{ pillar['user'] }}/.virtualenvs/agentdriver
- requirements: /home/{{ pillar['user'] }}/agentdriver/requirements.txt
- requirements: /home/{{ pillar['user'] }}/agentdriver/requirements/{{ pillar['deployment_type'] }}.txt
- cwd: /home/{{ pillar['user'] }}/agentdriver
- user: {{ pillar['user'] }}
- no_chown: true
salt/manager/init.sls
include:
# - manager.pipeline
- manager.pipeline
- manager.gitrepo
# - manager.agentgit
- manager.postgres
......
salt/manager/pipeline.sls
{% if grains['os'] == 'Ubuntu' or grains['os_family'] == 'Debian' %}
nodejs-legacy:
pkg.installed
{% endif %}
npm:
{% if grains['os'] == 'Ubuntu' or grains['os_family'] == 'Debian' %}
npm_installed:
pkg.installed:
- require:
- pkg: nodejs-legacy
{% else %}
pkg.installed
{% endif %}
- pkgs:
- nodejs
- npm
bower:
npm_pkgs:
npm.installed:
- pkgs:
- bower
- less
- yuglify
- require:
- pkg: npm
- pkg: npm_installed
less:
npm.installed:
- require:
- pkg: npm
yuglify:
npm.installed:
- require:
- pkg: npm
#{% if grains['os'] == 'Ubuntu' or grains['os_family'] == 'Debian' %}
#nodejs-legacy:
# pkg.installed
#{% endif %}
#
#npm:
# {% if grains['os'] == 'Ubuntu' or grains['os_family'] == 'Debian' %}
# pkg.installed:
# - require:
# - pkg: nodejs-legacy
# {% else %}
# pkg.installed
# {% endif %}
#
#bower:
# npm.installed:
# - require:
# - pkg: npm
#
#less:
# npm.installed:
# - require:
# - pkg: npm
#
#yuglify:
# npm.installed:
# - require:
# - pkg: npm
salt/monitor-client/configuration.sls
......@@ -6,7 +6,7 @@
- group: {{ pillar['user'] }}
- mode: 700
{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
{% if pillar['init_type'] == 'systemd' %}
/etc/systemd/system/monitor-client.service:
file.managed:
- user: root
......
salt/monitor-client/init.sls
......@@ -9,15 +9,6 @@ monitor-client:
- git
- ntp
- wget
{% if grains['os_family'] == 'RedHat' %}
- python2-pip
- python-devel
- python-virtualenvwrapper
{% else %}
- python-pip
- python-dev
- virtualenvwrapper
{% endif %}
- require_in:
- git: gitrepo_monitor-client
- virtualenv: virtualenv_monitor-client
......
salt/monitor-client/virtualenv.sls
virtualenv_monitor-client:
virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/monitor-client
- python: /usr/bin/python3
# - requirements: /home/{{ pillar['user'] }}/monitor-client/requirements/{{ pillar['deployment_type'] }}.txt
- requirements: /home/{{ pillar['user'] }}/monitor-client/requirements.txt
- user: {{ pillar['user'] }}
- cwd: /home/{{ pillar['user'] }}/monitor-client/
- no_chown: true
- reqire:
- git: gitrepo_monitor-client
salt/network/init.sls
......@@ -21,7 +21,7 @@ vm:
- require:
- cmd: ovs-if
{% if grains['os'] == 'Debian' %}
{% if grains['os_family'] == 'Debian' %}
symlink_dhcpd:
file.symlink:
- name: /etc/init.d/dhcpd
......@@ -47,7 +47,7 @@ reload_firewall:
- user: {{ pillar['user'] }}
- require:
- service: firewall2
{% if grains['os'] == 'Debian' %}
{% if grains['os_family'] == 'Debian' %}
- cmd: symlink_dhcpd
{% endif %}
......@@ -69,13 +69,13 @@ fix_dhcp:
{% endif %}
isc-dhcp-server:
{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
{% if grains['os_family'] == 'RedHat' or grains['os_family'] == 'Debian' %}
cmd.run:
- name: /bin/systemctl restart dhcpd
{% if grains['os_family'] == 'RedHat' %}
- watch:
- cmd: fix_dhcp
{% elif grains['os'] == 'Debian' %}
{% elif grains['os_family'] == 'Debian' %}
- watch:
- cmd: fix_dhcp_daemon_reload
{% endif %}
......@@ -85,17 +85,17 @@ isc-dhcp-server:
{% if grains['os_family'] == 'RedHat' %}
- watch:
- cmd: fix_dhcp
{% elif grains['os'] == 'Debian' %}
{% elif grains['os_family'] == 'Debian' %}
- watch:
- cmd: fix_dhcp_daemon_reload
{% endif %}
{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
{% if grains['os_family'] == 'RedHat' or grains['os_family'] == 'Debian' %}
- name: dhcpd
- require:
- cmd: isc-dhcp-server
{% endif %}
{% if grains['os'] == 'Debian' %}
{% if grains['os_family'] == 'Debian' %}
{# For next reboot #}
after_openvswitch_conf:
file.managed:
......
salt/storagedriver/configuration.sls
......@@ -6,7 +6,7 @@
- group: {{ pillar['user'] }}
- mode: 700
{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
{% if pillar['init_type'] == 'systemd' %}
/etc/systemd/system/storagecelery@.service:
file.managed:
- user: root
......
salt/storagedriver/init.sls
......@@ -2,7 +2,7 @@ include:
- storagedriver.gitrepo
- storagedriver.virtualenv
- storagedriver.configuration
- storagedriver.nfs-server
# - storagedriver.nfs-server
{% if grains['os_family'] == 'RedHat' %}
......@@ -17,18 +17,14 @@ storagedriver:
- git
- ntp
{% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libmemcached-devel
- python-devel
- python-virtualenvwrapper
- python3-devel
- qemu-img-ev
- zlib-devel
{% else %}
- python-pip
- libmemcached-dev
- python-dev
- python3-dev
- qemu-utils
- virtualenvwrapper
- zlib1g-dev
{% endif %}
- require_in:
......
salt/storagedriver/virtualenv.sls
virtualenv_storagedriver:
virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/storagedriver
- requirements: /home/{{ pillar['user'] }}/storagedriver/requirements/production.txt
- python: /usr/bin/python3
- requirements: /home/{{ pillar['user'] }}/storagedriver/requirements/{{ pillar['deployment_type'] }}.txt
- user: {{ pillar['user'] }}
- cwd: /home/{{ pillar['user'] }}/storagedriver
- no_chown: true
salt/vmdriver/init.sls
......@@ -33,6 +33,7 @@ vmdriver:
{% else %}
- qemu-kvm
# - libvirt-bin
- libvirt-dev
- virt-manager
- libmemcached-dev
- libxml2-dev
......
salt/vmdriver/virtualenv.sls
......@@ -17,7 +17,7 @@ virtualenv_vmdriver_install_first:
virtualenv.managed:
- python: /usr/bin/python3
- name: /home/{{ pillar['user'] }}/.virtualenvs/vmdriver
- requirements: /home/{{ pillar['user'] }}/circle/requirements/install_first.txt
- requirements: /home/{{ pillar['user'] }}/vmdriver/requirements/install_first.txt
- user: {{ pillar['user'] }}
- cwd: /home/{{ pillar['user'] }}/vmdriver
- no_chown: true
......
salt/vncproxy/init.sls
......@@ -10,17 +10,13 @@ vncproxy:
- chrony
- wget
{% if grains['os_family'] == 'RedHat' %}
- python3-pip
- libffi-devel
- openssl-devel
- python3-devel
- python3-virtualenvwrapper
{% else %}
- python3-pip
- libffi-dev
- libssl-dev
- python3-dev
- virtualenvwrapper
{% endif %}
- require_in:
- git: gitrepo_vncproxy
......
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