Gitlab default token

salt/control/virt.sls

@@ -47,7 +47,6 @@ salt_control_virt_{{ cluster_name }}_{{ node_name }}:
 #  - id_: {{ node_name }}.{{ cluster.domain }}
 #  - unless: virsh list | grep {{ node_name }}.{{ cluster.domain }}
   
-
 {%- endif %}
 
 {%- endfor %}

salt/files/minion.conf

@@ -121,7 +121,7 @@ gitlab.url: 'https://{{ pillar.gitlab.client.server.host }}/'
 gitlab.token: '{{ pillar.gitlab.client.server.token }}'
 {%- elif pillar.get('gitlab', {}).server is defined %}
 gitlab.url: 'https://{{ pillar.gitlab.server.server_name }}/'
-gitlab.token: '{{ pillar.gitlab.server.token }}'
+gitlab.token: '{{ pillar.gitlab.server.get('token', 'Set token in pillar') }}'
 {%- endif %}
 
 {%- if pillar.get('keystone', {}).get('server', {'enabled': False } ).enabled %}

salt/files/virt.conf

@@ -0,0 +1,17 @@
+{% from "salt/map.jinja" import control with context %}
+
+virt:
+  nic:
+	test:
+      eth0:
+        bridge: virbr0
+        model: virtio
+      eth0:
+        bridge: virbr0
+        model: virtio
+  disk:
+    database:
+      - system:
+          size: 8192
+      - data:
+          size: 30720