Browse Source

Gitlab default token

tags/0.4
Ales Komarek 8 years ago
parent
commit
0a1484e458
3 changed files with 18 additions and 2 deletions
  1. +0
    -1
      salt/control/virt.sls
  2. +1
    -1
      salt/files/minion.conf
  3. +17
    -0
      salt/files/virt.conf

+ 0
- 1
salt/control/virt.sls View File

# - id_: {{ node_name }}.{{ cluster.domain }} # - id_: {{ node_name }}.{{ cluster.domain }}
# - unless: virsh list | grep {{ node_name }}.{{ cluster.domain }} # - unless: virsh list | grep {{ node_name }}.{{ cluster.domain }}

{%- endif %} {%- endif %}


{%- endfor %} {%- endfor %}

+ 1
- 1
salt/files/minion.conf View File

gitlab.token: '{{ pillar.gitlab.client.server.token }}' gitlab.token: '{{ pillar.gitlab.client.server.token }}'
{%- elif pillar.get('gitlab', {}).server is defined %} {%- elif pillar.get('gitlab', {}).server is defined %}
gitlab.url: 'https://{{ pillar.gitlab.server.server_name }}/' 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 %} {%- endif %}


{%- if pillar.get('keystone', {}).get('server', {'enabled': False } ).enabled %} {%- if pillar.get('keystone', {}).get('server', {'enabled': False } ).enabled %}

+ 17
- 0
salt/files/virt.conf View File

{% 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

Loading…
Cancel
Save