salt fix + HOWTO

NEW_DEVENV.TXT

+#
+# HOW-TO create a new devenv 
+#
+
+#Start a new virt. machine (min 6 RAM, 1 vCPU, 30G Disk)
+
+#rename the fresh virt. hosts if neccesary. eg: 
+sed -ie 1,\$s/$(hostname)/mycircle-dev/ /etc/hosts
+sudo bash -c "echo mycircle-dev > /etc/hostname"
+
+#update the OS
+sudo apt-get update && sudo apt-get upgrade -y
+sudo reboot
+
+#install python and git
+sudo apt install python3 python3-pip git python3-dev -y
+
+#cloden the CIRClE repo
+git clone https://git.ik.bme.hu/CIRCLE3/salt.git
+
+#start the CIRCLE install 
+sudo salt/install --local # --defpass 
+
+#
+sudo ufw disable
+
+# connet to the portal 

install.py

@@ -121,6 +121,8 @@ parser.add_argument('--local', action='store_true',
                     help='Installs Local version')
                     help='Installs Local version')
 parser.add_argument('--upstart', action='store_true', 
 parser.add_argument('--upstart', action='store_true', 
                     help='Installs UpStart version')
                     help='Installs UpStart version')
+parser.add_argument('--defpass', action='store_true',
+                    help='Set admin passwd:12345678')
 
 
 args = parser.parse_args()
 args = parser.parse_args()
 
 
@@ -140,7 +142,7 @@ installer_sls = {
     'deployment_type': deployment_type,
     'deployment_type': deployment_type,
     'init_type': 'upstart' if args.upstart else 'systemd',
     'init_type': 'upstart' if args.upstart else 'systemd',
     'admin_user': 'admin',
     'admin_user': 'admin',
-    'admin_pass': input_admin_password(),
+    'admin_pass': '12345678' if args.defpass else input_admin_password(),
     'database': {
     'database': {
         'name': 'circle',
         'name': 'circle',
         'user': 'circle',
         'user': 'circle',

pillar/agentdriver.sls

 agentdriver:
 agentdriver:
   repo_name: https://git.ik.bme.hu/circle3/agentdriver.git
   repo_name: https://git.ik.bme.hu/circle3/agentdriver.git
-  repo_revision: master
+  repo_revision: python3.6

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: R6vXml2rkGuJ817I
+  password: BXaVnWQzrlvifuEL
   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: x0B5eVNY6ubFSZcU
+  password: Pl3S0bayRhO0gFfr
   user: circle
   user: circle
 deployment_type: local
 deployment_type: local
 fwdriver:
 fwdriver:
   external_if: eth0
   external_if: eth0
-  external_net: 10.9.0.101/16
+  external_net: 10.9.0.6/16
   gateway: 10.9.255.254
   gateway: 10.9.255.254
   management_if: ethy
   management_if: ethy
-  queue_name: dev-janos
+  queue_name: test-dev
   trunk_if: linkb
   trunk_if: linkb
 graphite:
 graphite:
   host: 127.0.0.1
   host: 127.0.0.1
-  password: GZgcS9l0XPsDqMQf
+  password: UO3xLYBunH1096wt
   port: 5672
   port: 5672
   queue: monitor
   queue: monitor
-  secret_key: WsJOiKxfND5oSpjX
+  secret_key: sfM40GA2U9xvHleY
   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: KqSWakUfEb6RZQYj
-secret_key: NaiuQC6MK5UlcGAB
+proxy_secret: eG9XdDVJiRcA1ahy
+secret_key: hfRBwmFxnj2MPYoT
 storagedriver:
 storagedriver:
-  queue_name: dev-janos
+  queue_name: test-dev
 timezone: Europe/Budapest
 timezone: Europe/Budapest
 user: cloud
 user: cloud
 vmdriver:
 vmdriver:

salt/manager/files/compile.sh

 #!/bin/bash
 #!/bin/bash
+
+#set -e
+
+PATH=$PATH:/usr/bin
 cd /home/{{ pillar['user'] }}/circle/circle/
 cd /home/{{ pillar['user'] }}/circle/circle/
-workon circle
+source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/activate
+source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
 
 
 MANAGE="python /home/{{ pillar['user'] }}/circle/circle/manage.py"
 MANAGE="python /home/{{ pillar['user'] }}/circle/circle/manage.py"
 bower install
 bower install
@@ -23,3 +28,4 @@ else
 fi
 fi
 
 
 echo "changed=$CHANGED comment='copied: $COLLECTED'"
 echo "changed=$CHANGED comment='copied: $COLLECTED'"
+

salt/manager/virtualenv.sls

@@ -54,6 +54,7 @@ salt://manager/files/syncdb.sh:
     - stateful: true
     - stateful: true
     - require:
     - require:
       - virtualenv: virtualenv_manager
       - virtualenv: virtualenv_manager
+      - file: /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
 
 
 salt://manager/files/compile.sh:
 salt://manager/files/compile.sh:
   cmd.script:
   cmd.script:
@@ -64,3 +65,5 @@ salt://manager/files/compile.sh:
     - stateful: true
     - stateful: true
     - require:
     - require:
       - virtualenv: virtualenv_manager
       - virtualenv: virtualenv_manager
+      - file: /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
+

salt/vmdriver/init.sls

@@ -68,16 +68,16 @@ vmdriver:
 #      - pkg: ev_repo_for_vmdriver
 #      - pkg: ev_repo_for_vmdriver
 #    {% endif %}
 #    {% endif %}
 
 
-#agentdriver_service:
-#  service:
-#    - name: agentdriver
-#    - running
-#    - enable: true
-#    - watch:
-#      - pkg: agentdriver
-#      - sls: agentdriver.gitrepo
-#      - sls: agentdriver.virtualenv
-#      - sls: agentdriver.configuration
+agentdriver_service:
+  service:
+    - name: agentdriver
+    - running
+    - enable: true
+    - watch:
+      - pkg: agentdriver
+      - sls: agentdriver.gitrepo
+      - sls: agentdriver.virtualenv
+      - sls: agentdriver.configuration
 
 
 node:
 node:
   service:
   service: