浏览代码

Merge 7d4e7cb574 into addd0d2da0

pull/236/merge
M. David Bennett 2 个月前
父节点
当前提交
e0fcc94b0e
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 20 次插入0 次删除
  1. +14
    -0
      README.rst
  2. +6
    -0
      linux/system/repo.sls

+ 14
- 0
README.rst 查看文件

@@ -982,6 +982,20 @@ RedHat-based Linux with additional OpenStack repo:
source: 'http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/epel-6/'
gpgcheck: 0

RedHat-based Linux with Salt Project repo, pinned to version 3006:

.. code-block:: yaml

linux:
system:
...
repo:
saltproject:
enabled: true
gpgkey: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
source: https://packages.broadcom.com/artifactory/saltproject-rpm/
includepkgs: "*3006*"

Ensure system repository to use czech Debian mirror (``default: true``)
Also pin it's packages with priority ``900``:


+ 6
- 0
linux/system/repo.sls 查看文件

@@ -206,6 +206,12 @@ linux_repo_{{ name }}:
{%- if repo.gpgkey is defined %}
- gpgkey: {{ repo.gpgkey }}
{%- endif %}
{%- if repo.includepkgs is defined %}
- includepkgs: "{{ repo.includepkgs }}"
{%- endif %}
{%- if repo.exclude is defined %}
- exclude: "{{ repo.exclude }}"
{%- endif %}
{%- endif %}
{%- else %}
pkgrepo.absent:

正在加载...
取消
保存