* Add\fix __virtual__ for modules * Remove unneded multiline for repo.sls Change-Id: I1f8d321b68dfe6a44264b4ddcd6cd0c576938da1pull/165/head
@@ -6,6 +6,9 @@ host names/alias by FQDN first and alphabetically | |||
from jinja2 import Undefined | |||
def __virtual__(): | |||
return 'linux_hosts' | |||
def fqdn_sort_fn(n1, n2): | |||
l1 = n1.split('.') | |||
l2 = n2.split('.') |
@@ -2,6 +2,8 @@ | |||
import re | |||
def __virtual__(): | |||
return 'linux_netlink' | |||
def ls(regex): | |||
""" |
@@ -75,8 +75,7 @@ linux_repo_{{ name }}_pin: | |||
linux_repo_{{ name }}_key: | |||
{% set repo_key = salt['hashutil.base64_b64encode'](repo.key) %} | |||
cmd.run: | |||
- name: | | |||
echo '{{ repo_key }}' | base64 -d | apt-key add - | |||
- name: "echo '{{ repo_key }}' | base64 -d | apt-key add -" | |||
- require_in: | |||
{%- if repo.get('default', False) %} | |||
- file: default_repo_list |