First try

e56a6953 · Szeberényi Imre · ae1e9385 · e56a6953 · e56a6953 · e56a6953
Commit e56a6953 authored Jan 15, 2022 by Szeberényi Imre
22 changed files
--- a/pillar/agentdriver.sls
+++ b/pillar/agentdriver.sls
 agentdriver:
-  repo_name: https://git.ik.bme.hu/circle/agentdriver.git
+  repo_name: https://git.ik.bme.hu/circle3/agentdriver.git
-  repo_revision: master
+  repo_revision: python3.6
--- a/pillar/common.sls
+++ b/pillar/common.sls
@@ -5,6 +5,7 @@ secret_key: Ga4aex3Eesohngo
 timezone: Europe/Budapest
 deployment_type: local
+init_type: systemd
 admin_user: admin
 admin_pass: 4j23oihreehfd

--- a/pillar/firewall.sls
+++ b/pillar/firewall.sls
 fwdriver:
-  repo_name: https://git.ik.bme.hu/circle/fwdriver.git
+  repo_name: https://git.ik.bme.hu/circle3/fwdriver.git
  repo_revision: master
  user: fw

--- a/pillar/installer.sls
+++ b/pillar/installer.sls
@@ -5,6 +5,7 @@
 #timezone: Europe/Budapest
 #deployment_type: local
+#init_type: systemd
 #admin_user: admin
 #admin_pass: 4j23oihreehfd

--- a/pillar/manager.sls
+++ b/pillar/manager.sls
 manager:
-  repo_name: https://git.ik.bme.hu/circle/cloud.git
+  repo_name: https://git.ik.bme.hu/circle3/cloud.git
  repo_revision: master
--- a/pillar/monitor-client.sls
+++ b/pillar/monitor-client.sls
 monitor-client:
-  repo_name: https://git.ik.bme.hu/circle/monitor-client.git
+  repo_name: https://git.ik.bme.hu/circle3/monitor-client.git
-  repo_revision: master
+  repo_revision: ptyhon3.6
--- a/pillar/storagedriver.sls
+++ b/pillar/storagedriver.sls
 storagedriver:
-  repo_name: https://git.ik.bme.hu/circle/storagedriver.git
+  repo_name: https://git.ik.bme.hu/circle3/storagedriver.git
-  repo_revision: master
+  repo_revision: python3.6
  queue_name: storageserver
--- a/pillar/vmdriver.sls
+++ b/pillar/vmdriver.sls
 vmdriver:
-  repo_name: https://git.ik.bme.hu/circle/vmdriver.git
+  repo_name: https://git.ik.bme.hu/circle3/vmdriver.git
-  repo_revision: master
+  repo_revision: python3.6
  hypervisor_type: kvm
--- a/pillar/vncproxy.sls
+++ b/pillar/vncproxy.sls
 vncproxy:
-  repo_name: https://git.ik.bme.hu/circle/vncproxy.git
+  repo_name: https://git.ik.bme.hu/circle3/vncproxy.git
-  repo_revision: master
+  repo_revision: python3.6
--- a/requirements.txt
+++ b/requirements.txt
-salt==2014.7.1
+salt==3003
-netaddr==0.7.14
+netaddr
-netifaces==0.10.6
+netifaces
-halo==0.0.7
+halo
+virtualenvwrapper
+stevedore
--- a/salt/common.sls
+++ b/salt/common.sls
+include:
+  - profile
 git:
  pkg.installed
--- a/salt/manager/configuration.sls
+++ b/salt/manager/configuration.sls
@@ -5,10 +5,13 @@ manager_postactivate:
      - template: jinja
      - user: {{ pillar['user'] }}
      - mode: 700
+      - require:
+        - virtualenv: virtualenv_manager
 portal.conf:
  file.managed:
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if pillar['init_type'] == 'systemd' %}
    - name: /etc/systemd/system/portal.service
    {% else %}
    - name: /etc/init/portal.conf
@@ -16,14 +19,13 @@ portal.conf:
    - user: root
    - group: root
    - template: jinja
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if pillar['init_type'] == 'systemd' %}
    {% if pillar['deployment_type'] == 'production' %}
    - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.service
    {% else %}
    - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal.service
    {% endif %}
    {% else %}
    {% if pillar['deployment_type'] == 'production' %}
@@ -34,7 +36,7 @@ portal.conf:
    {% endif %}
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if pillar['init_type'] == 'systemd' %}
 /etc/systemd/system/manager.service:
  file.managed:
    - user: root

--- a/salt/manager/files/init.sh
+++ b/salt/manager/files/init.sh
 #!/bin/bash
-source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/activate
+source /etc/profile.d/virtualenvwrapper.sh
-source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
+workon circle
 {% set fw = pillar['fwdriver'] %}
 HOSTNAME=$(hostname -s)

--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
 include:
-  - manager.pipeline
+#  - manager.pipeline
  - manager.gitrepo
-  - manager.agentgit
+#  - manager.agentgit
  - manager.postgres
  - manager.rabbitmq
  - manager.virtualenv
@@ -13,14 +13,13 @@ manager:
    - pkgs:
      - postgresql
      - git
-      - ntp
+      - chrony
      - rabbitmq-server
      - memcached
      - gettext
      - wget
      - swig
      {% if grains['os_family'] == 'RedHat' %}
-      - python2-pip
      - libffi-devel
      - openssl-devel
      - libmemcached-devel
@@ -29,25 +28,22 @@ manager:
      - postgresql-server
      - libxml2-devel
      - libxslt-devel
-      - python-devel
+      - python3-devel
-      - python-virtualenvwrapper
      {% else %}
-      - python-pip
      - libffi-dev
      - libssl-dev
      - libmemcached-dev
      - libpq-dev
      - libxml2-dev
      - libxslt1-dev
-      - python-dev
+      - python3-dev
-      - virtualenvwrapper
      {% endif %}
    - require_in:
      - service: postgres_service
  user:
    - present
    - name: {{ pillar['user'] }}
-    - gid_from_name: True
+    - usergroup: True
    - shell: /bin/bash
    - groups:
      {% if grains['os_family'] == 'RedHat' %}
@@ -56,21 +52,12 @@ manager:
      - sudo
      {% endif %}
  service:
    - running
    - enable: True
    - watch:
      - file: manager_postactivate
-      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+      - sls: manager.configuration
-      - file: /etc/systemd/system/manager.service
-      - file: /etc/systemd/system/managercelery@.service
-      {% else %}
-      - file: /etc/init/manager.conf
-      - file: /etc/init/mancelery.conf
-      - file: /etc/init/moncelery.conf
-      - file: /etc/init/slowcelery.conf
-      {% endif %}
      - sls: manager.gitrepo
 portal:

--- a/salt/manager/pipeline.sls
+++ b/salt/manager/pipeline.sls
-{% if grains['os'] == 'Ubuntu' or grains['os'] == 'Debian' %}
+{% if grains['os'] == 'Ubuntu' or grains['os_family'] == 'Debian' %}
 nodejs-legacy:
  pkg.installed
 {% endif %}
 npm:
-  {% if grains['os'] == 'Ubuntu' or grains['os'] == 'Debian' %}
+  {% if grains['os'] == 'Ubuntu' or grains['os_family'] == 'Debian' %}
  pkg.installed:
    - require:
      - pkg: nodejs-legacy

--- a/salt/manager/rabbitmq.sls
+++ b/salt/manager/rabbitmq.sls
@@ -14,19 +14,21 @@ rabbitmq-server:
      - file: rabbitmq-server
      {% endif %}
+virtual_host:
+  rabbitmq_vhost.present:
+    - name: {{ pillar['amqp']['vhost']}}
+    - require:
+      - service: rabbitmq-server
 rabbitmq_user:
  rabbitmq_user.present:
    - name: {{ pillar['amqp']['user'] }}
    - password: {{ pillar['amqp']['password'] }}
+    - perms: [{ {{ pillar['amqp']['vhost']}}: [.*, .*, .*]}]
+#      - '{{ pillar['amqp']['vhost']}}':
+#        - conf: ".*"
+#        - write: " .*"
+#        - read: ".*"
    - require:
      - service: rabbitmq-server
-virtual_host:
-  rabbitmq_vhost.present:
-    - name: {{ pillar['amqp']['vhost']}}
-    - user: {{ pillar['amqp']['user'] }}
-    - conf: .*
-    - write: .*
-    - read: .*
-    - require:
-      - service: rabbitmq-server
--- a/salt/manager/virtualenv.sls
+++ b/salt/manager/virtualenv.sls
@@ -15,6 +15,7 @@ m2crypto_swig_env:
 virtualenv_manager:
  virtualenv.managed:
+    - python: /usr/bin/python3
    - name: /home/{{ pillar['user'] }}/.virtualenvs/circle
    - requirements: /home/{{ pillar['user'] }}/circle/requirements/{{ pillar['deployment_type'] }}.txt
    - user: {{ pillar['user'] }}
@@ -26,6 +27,11 @@ virtualenv_manager:
      - environ: m2crypto_swig_env
      {% endif %}
+/home/{{ pillar['user'] }}/.virtualenvs/circle/lib/python3.6/site-packages/simplesshkey/models.py:
+  file.patch:
+    - source: file:///home/{{ pillar['user'] }}/circle/requirements/simplesshkey.patch
+    - strip: 5
 salt://manager/files/syncdb.sh:
  cmd.script:
    - template: jinja

--- a/salt/node.sls
+++ b/salt/node.sls
 include:
-    - profile
    - agentdriver
    - monitor-client
    - vmdriver

--- a/salt/profile.sls
+++ b/salt/profile.sls
-{% if grains['os']=='Debian' %}
+/etc/profile.d/virtualenvwrapper.sh:
-{# For non-interactive shells, virtualenvwrapper commands 
+  file.symlink:
-   ('workon' etc.) are not sourced automatically #}
+    - target: /usr/local/bin/virtualenvwrapper.sh
-/etc/profile:
-  file.append:
-    - text:
-      - "#Line below added for Debian by CIRCLE Salt installer"
-      - . /etc/bash_completion
-{% endif %}
--- a/salt/vncproxy/configuration.sls
+++ b/salt/vncproxy/configuration.sls
@@ -6,16 +6,14 @@
    - group: {{ pillar['user'] }}
    - mode: 700
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if pillar['init_type'] == 'systemd' %}
 /etc/systemd/system/vncproxy.service:
  file.managed:
    - user: root
    - group: root
    - template: jinja
    - source: file:///home/{{ pillar['user'] }}/vncproxy/miscellaneous/vncproxy.service
 {% else %}
 /etc/init/vncproxy.conf:
  file.managed:
    - user: root
@@ -23,3 +21,5 @@
    - template: jinja
    - source: file:///home/{{ pillar['user'] }}/vncproxy/miscellaneous/vncproxy.conf
 {% endif %}
--- a/salt/vncproxy/init.sls
+++ b/salt/vncproxy/init.sls
@@ -7,19 +7,19 @@ vncproxy:
  pkg.installed:
    - pkgs:
      - git
-      - ntp
+      - chrony
      - wget
      {% if grains['os_family'] == 'RedHat' %}
-      - python2-pip
+      - python3-pip
      - libffi-devel
      - openssl-devel
-      - python-devel
+      - python3-devel
-      - python-virtualenvwrapper
+      - python3-virtualenvwrapper
      {% else %}
-      - python-pip
+      - python3-pip
      - libffi-dev
      - libssl-dev
-      - python-dev
+      - python3-dev
      - virtualenvwrapper
      {% endif %}
    - require_in:

--- a/salt/vncproxy/virtualenv.sls
+++ b/salt/vncproxy/virtualenv.sls
 virtualenv_vncproxy:
  virtualenv.managed:
+    - python: /usr/bin/python3
    - name: /home/{{ pillar['user'] }}/.virtualenvs/vncproxy
-    - requirements: /home/{{ pillar['user'] }}/vncproxy/requirements.txt
+    - requirements: /home/{{ pillar['user'] }}/vncproxy/requirements/{{ pillar['deployment_type'] }}.txt
+    - cwd: /home/{{ pillar['user'] }}/vncproxy
    - user: {{ pillar['user'] }}
    - no_chown: true