Conflict with git formula

[davidkarlsen]

Please see this discussion:
https://groups.google.com/forum/#!topic/salt-users/Mlr7oITFqZw
basically the guitlab formula conflicts with the git formula and should rather include/depend on it.

[gravyboat]

Quick fix here: #4

[viq]

@davidkarlsen this should be fixed now, please verify.

[davidkarlsen]

Doesn´t work for me:

EBUG   ] Rendered data from file: /var/cache/salt/minion/files/base/gitlab/nginx.sls:





nginx:
  pkg:
    - installed
  service:
    - running
    - enable: True
    - require:
      - pkg: nginx
      - user: nginx
    - watch:
      - file: gitlab-nginx
  file.absent:
    - name: /etc/nginx/sites-enabled/default.conf
  user.present:
    - name: www-data
    - groups:
      - git
    - require:
      - pkg: nginx

# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab
gitlab-nginx:
  file.managed:
    - name: /etc/nginx/sites-enabled/gitlab.conf
    - source: salt://gitlab/files/gitlab-nginx
    - template: jinja
    - user: root
    - group: root
    - mode: 644
    - require:
      - pkg: nginx




[DEBUG   ] Results of YAML rendering: 
OrderedDict([('nginx', OrderedDict([('pkg', ['installed']), ('service', ['running', OrderedDict([('enable', True)]), OrderedDict([('require', [OrderedDict([('pkg', 'nginx')]), OrderedDict([('user', 'nginx')])])]), OrderedDict([('watch', [OrderedDict([('file', 'gitlab-nginx')])])])]), ('file.absent', [OrderedDict([('name', '/etc/nginx/sites-enabled/default.conf')])]), ('user.present', [OrderedDict([('name', 'www-data')]), OrderedDict([('groups', ['git'])]), OrderedDict([('require', [OrderedDict([('pkg', 'nginx')])])])])])), ('gitlab-nginx', OrderedDict([('file.managed', [OrderedDict([('name', '/etc/nginx/sites-enabled/gitlab.conf')]), OrderedDict([('source', 'salt://gitlab/files/gitlab-nginx')]), OrderedDict([('template', 'jinja')]), OrderedDict([('user', 'root')]), OrderedDict([('group', 'root')]), OrderedDict([('mode', 644)]), OrderedDict([('require', [OrderedDict([('pkg', 'nginx')])])])])]))])
[DEBUG   ] Loaded no_out as virtual quiet
[DEBUG   ] Loaded json_out as virtual json
[DEBUG   ] Loaded yaml_out as virtual yaml
[DEBUG   ] Loaded pprint_out as virtual pprint
local:
    Data failed to compile:
----------
    No matching sls found for 'gitlab' in env 'base'
----------
    No matching sls found for 'gitlab' in env 'base'
root@main:/srv/pillar# 

[viq]

Could you wrap it in a code block? This formatting makes it hard to read.

[davidkarlsen]

@viq OK, done

[davidkarlsen]

ping?

[tinuva]

Just out of interest sake. If gitlab is to depend on the git formula, the git formula will need some changes for gitlab to work on CentOS ect. in the future.

For example the inclusion of the PUIAS_6_computational repository, is specifically to get a new enough version of GIT that is compatible with Gitlab. If Gitlab requires on another Git formula, this repository needs to be included in said formula.

[whiteinge]

Hm. Gitlab does require Git 1.8 or newer. CentOS 6 is currently on 1.7.1. This version incompatibility was present before #4 was merged and should be a new issue.

@tinuva how have you configured CentOS to run GitLab? Mind filing a new issue with details?

[viq]

I was told it should actually work with what's available on CentOS, but I have not presonally verified yet - especially as I haven't yet managed on CentOS to make gitlab pick up a ruby new enough to work.

[tinuva]

@whiteinge I am still busy working out all the broken states that I have to get there. Will do once I have everything working.

[viq]

@tinuva how are you getting a ruby new enough to run gitlab on CentOS?

[viq]

@davidkarlsen uhm, sorry. No, I don't really know why that's happening for you. What's your directory structure, where's your gitlab formula/state located?

[davidkarlsen]

I use gitfs:

gitfs_remotes:
  ....
  - git@github.com:davidkarlsen/git-formula.git
  - git@github.com:davidkarlsen/gitlab-formula.git
  ....

and have this in my state map:
  'roles:gitlab':
    - match: grain
    - gitlab

and my grains:
root@main:/srv/salt# cat /etc/salt/grains 
roles:
  - dnsserver
  - javabuild
  - smtpserver
  - saltmaster
  - gitlab

[viq]

@davidkarlsen it seems that one of the things gitlab formula references is not there - see #13236

I am working on refreshing the gitlab formula somewhat, and making sure the stuff it uses is either self-contained or explicitly mentioned, but it's currently work in progress.

[davidkarlsen]

@viq Which #13236 ?