Salt FIX - graphite new order

README.md

@@ -11,9 +11,20 @@
 
 
 ### Red Hat family
 ### Red Hat family
 
 
+TBD
 
 
 ### Debian family
 ### Debian family
 
 
+For Devenv start a new ubuntu 18.04 with least 4G RAM.
+Set the proper hostname.
+
+In circle VMs you can set the name to mycircel-dev using the following commands.
+```bash
+sudo sed -ie 1,\$s/$(hostname)/mycircle-dev/ /etc/hosts
+sudo bash -c "echo mycircle-dev > /etc/hostname"
+reboot  - it not neccessary because the next step
+```
+
 Refresh your system:
 Refresh your system:
 ```bash
 ```bash
 sudo apt update
 sudo apt update
@@ -35,7 +46,7 @@ git clone https://git.ik.bme.hu/CIRCLE3/salt.git
 
 
 ## Single node quick install
 ## Single node quick install
 ```bash
 ```bash
-sudo salt/install --local
+sudo salt/install --local [--defpass]
 ```
 ```
 
 
 Open the port 443 for the portal 
 Open the port 443 for the portal 
@@ -43,8 +54,6 @@ Open the port 443 for the portal
 ufw allow 443
 ufw allow 443
 ```
 ```
 
 
-
-
 ## Quickstart - Standalone Node
 ## Quickstart - Standalone Node
 
 
 ### Login
 ### Login

pillar/installer.sls

@@ -2,29 +2,29 @@ admin_pass: '12345678'
 admin_user: admin
 admin_user: admin
 amqp:
 amqp:
   host: 127.0.0.1
   host: 127.0.0.1
-  password: vWGoF2wQUeJ6YiT0
+  password: dbtNFSc6OoinjM5e
   port: 5672
   port: 5672
   user: cloud
   user: cloud
   vhost: circle
   vhost: circle
 cache: pylibmc://127.0.0.1:11211/
 cache: pylibmc://127.0.0.1:11211/
 database:
 database:
   name: circle
   name: circle
-  password: qBZbKIfyX9JmauYN
+  password: jgdxM2FGEAS0HRBb
   user: circle
   user: circle
 deployment_type: local
 deployment_type: local
 fwdriver:
 fwdriver:
   external_if: eth0
   external_if: eth0
-  external_net: 10.34.0.85/16
+  external_net: 10.34.0.108/16
   gateway: 10.34.255.254
   gateway: 10.34.255.254
   management_if: ethy
   management_if: ethy
-  queue_name: mycircle-dev
+  queue_name: cloud-17198
   trunk_if: linkb
   trunk_if: linkb
 graphite:
 graphite:
   host: 127.0.0.1
   host: 127.0.0.1
-  password: lv0NtzdTKOfWFqbw
+  password: z9qeb74Go2hHgByL
   port: 5672
   port: 5672
   queue: monitor
   queue: monitor
-  secret_key: y7k6op3Qc2hM0fTn
+  secret_key: R5NlO0KUprq1Z297
   user: monitor
   user: monitor
   vhost: monitor
   vhost: monitor
 init_type: systemd
 init_type: systemd
@@ -33,10 +33,10 @@ nfs:
   enabled: true
   enabled: true
   network: 127.0.0.0/8
   network: 127.0.0.0/8
   server: 127.0.0.1
   server: 127.0.0.1
-proxy_secret: 764OfnrsZ5lU2YMi
-secret_key: CbRqoynxNZTv7uE6
+proxy_secret: 1FfsO9LbWTlagdVG
+secret_key: EC0xuaGiMSY9VhAe
 storagedriver:
 storagedriver:
-  queue_name: mycircle-dev
+  queue_name: cloud-17198
 timezone: Europe/Budapest
 timezone: Europe/Budapest
 user: cloud
 user: cloud
 vmdriver:
 vmdriver:

salt/graphite/files/requirement1.txt

 #
 #
 graphite-web
 graphite-web
-whisper
-carbon
 
 

salt/graphite/files/requirements.txt

+whisper
+carbon
 python-memcached
 python-memcached
-#Django == 3.0.14
-#Twisted == 22.4.0
+Django == 3.0.14
+Twisted == 22.4.0
 txAMQP
 txAMQP
 simplejson
 simplejson
 django-tagging
 django-tagging

salt/graphite/virtualenv.sls

@@ -7,9 +7,11 @@ virtualenv_graphite:
     - cwd: /home/{{ pillar['graphite']['user'] }} 
     - cwd: /home/{{ pillar['graphite']['user'] }} 
     - no_chown: true
     - no_chown: true
     - require:
     - require:
-      - virtualenv: virtualenv_graphite_first
+      - user: {{ pillar['graphite']['user'] }}
+      - file: /home/{{ pillar['graphite']['user'] }}/requirements.txt
+      - file: /opt/graphite
 
 
-virtualenv_graphite_first:
+virtualenv_graphite_web:
   virtualenv.managed:
   virtualenv.managed:
     - python: /usr/bin/python3
     - python: /usr/bin/python3
     - name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite
     - name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite
@@ -21,10 +23,10 @@ virtualenv_graphite_first:
     - env_vars:
     - env_vars:
       PYTHONIOENCODING: 'utf-8'
       PYTHONIOENCODING: 'utf-8'
     - require:
     - require:
+      - virtualenv: virtualenv_graphite
       - user: {{ pillar['graphite']['user'] }}
       - user: {{ pillar['graphite']['user'] }}
       - file: /home/{{ pillar['graphite']['user'] }}/requirement0.txt
       - file: /home/{{ pillar['graphite']['user'] }}/requirement0.txt
       - file: /home/{{ pillar['graphite']['user'] }}/requirement1.txt
       - file: /home/{{ pillar['graphite']['user'] }}/requirement1.txt
-      - file: /home/{{ pillar['graphite']['user'] }}/requirements.txt
       - file: /opt/graphite
       - file: /opt/graphite
 
 
 global-site-packages:
 global-site-packages: