fix pillars

pillar/common.sls

@@ -6,6 +6,9 @@ timezone: Europe/Budapest
 
 
 deployment_type: local
 deployment_type: local
 
 
+admin_user: admin
+admin_pass: 4j23oihreehfd
+
 database:
 database:
   name: circle
   name: circle
   user: circle
   user: circle
@@ -15,6 +18,7 @@ graphite:
   secret_key: ahf2aim7ahLeo8n
   secret_key: ahf2aim7ahLeo8n
 
 
 nfs:
 nfs:
+  enabled: false
   server: localhost
   server: localhost
   network: 192.168.1.0/24
   network: 192.168.1.0/24
   directory: /datastore
   directory: /datastore

pillar/installer.sls

+#amqp:
+#  user: cloud
+#  password: password
+#  host: 127.0.0.1
+#  port: 5672
+#  vhost: circle
+
+#graphite:
+#  user: monitor
+#  password: monitor
+#  host: 127.0.0.1
+#  port: 5672
+#  vhost: monitor
+#  queue: monitor
+
+#cache: pylibmc://127.0.0.1:11211/
+
+#nfs:
+#  enabled: true
+#  server: localhost
+#  network: 192.168.1.0/24
+#  directory: /datastore
+
+#fwdriver:
+#  queue_name: cloud
+
+#storagedriver:
+#  queue_name: cloud

pillar/installer.sls.example

-amqp:
-  user: cloud
-  password: password
-  host: 10.0.0.26
-  port: 5672
-  vhost: circle
-
-graphite:
-  user: monitor
-  password: monitor
-  host: 10.0.0.26
-  port: 5672
-  vhost: monitor
-  queue: monitor
-
-cache: pylibmc://10.0.0.26:11211/
-
-nfs:
-  server: 10.0.0.26

pillar/storagedriver.sls

 storagedriver:
 storagedriver:
   repo_name: https://git.ik.bme.hu/circle/storagedriver.git
   repo_name: https://git.ik.bme.hu/circle/storagedriver.git
   repo_revision: master
   repo_revision: master
+  queue_name: storageserver

pillar/top.sls

@@ -7,4 +7,7 @@ base:
     - vncproxy
     - vncproxy
     - monitor-client
     - monitor-client
     - vmdriver
     - vmdriver
+    - firewall
+    - manager
     - common
     - common
+    - installer