Browse Source

Add SmartOS salt-master and gitfs support

tags/v0.57.0
Matt Willsher 8 years ago
parent
commit
5b87c50e46
3 changed files with 24 additions and 2 deletions
  1. +1
    -0
      salt/defaults.yaml
  2. +4
    -2
      salt/gitfs/dulwich.sls
  3. +19
    -0
      salt/map.jinja

+ 1
- 0
salt/defaults.yaml View File

@@ -23,6 +23,7 @@ salt:
salt_ssh: salt-ssh

python_git: python-git
python_dulwich: python-dulwich

master:
gitfs_provider: gitpython

+ 4
- 2
salt/gitfs/dulwich.sls View File

@@ -15,7 +15,9 @@ install-dulwich:
- name: dulwich

{% else %}
# install from package
# TODO haven't actually found a distro that has a good version to test

python-dulwich:
pkg.installed:
- name: {{ salt_settings.python_dulwich }}

{% endif %}

+ 19
- 0
salt/map.jinja View File

@@ -142,6 +142,25 @@ that differ from whats in defaults.yaml
salt['grains.get']('os_family')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/armhf/latest ' + salt['grains.get']('oscodename') + ' main',
'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os_family')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/armhf/latest/SALTSTACK-GPG-KEY.pub',
},
'SmartOS': {
'salt_master': 'salt',
'salt_minion': 'salt',
'salt_syndic': 'salt',
'salt_cloud': 'salt',
'salt_api': 'salt',
'salt_ssh': 'salt',
'minion_service': 'salt:minion',
'master_service': 'salt:master',
'python_dulwich': 'py27-dulwich',
'gitfs': {
'dulwich': {
'install_from_source': False,
}
},
'master': {
'gitfs_provider': 'dulwich'
},
}
}, grain='os', merge=salt['pillar.get']('salt:lookup')))
%}


Loading…
Cancel
Save