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