Merge pull request #2 from rbkmoney/prep-other-hosts

split master configuration into common and not-common
This commit is contained in:
Andrey Abramov 2019-09-24 19:46:44 +03:00 committed by GitHub
commit f20104f75a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -1,7 +1,9 @@
{{ saltenv }}:
salt-master.linode.rbkmoney.dev:
'*':
- gentoo.portage.packages
- gentoo.makeconf.default
- gentoo.arch.linode
- salt.minion
salt-master.linode.rbkmoney.dev:
- salt.master

View File

@ -5,6 +5,7 @@ MAKEOPTS="-j2"
FEATURES="xattr sandbox userfetch parallel-fetch parallel-install clean-logs compress-build-logs unmerge-logs splitdebug compressdebug fail-clean unmerge-orphans getbinpkg -news"
USE="argon2 audit caps cgroups cracklib ecdsa efi filecaps json gnupg http2 iproute2 leaps_timezone logrotate lz4 lzma lzo multitarget netlink nettle nfsv4 nfsv41 numa openssl pcre16 sctp seccomp smp sqlite threads udev xattr xfs -X -bindist -dbus -gnutls -tcpd -alsa -cups -gtk -webstart -introspection"
PKGDIR="/usr/portage/packages"
DISTDIR="/var/cache/distfiles"
EMERGE_DEFAULT_OPTS="--quiet-build --verbose --keep-going -K"
PORT_LOGDIR="/var/log/portage"
PORTAGE_BINHOST="https://pkgs.rbk.money/gentoo-packages/amd64/sandybridge/packages"

View File

@ -1,5 +1,5 @@
{{ saltenv }}:
salt-master.linode.rbkmoney.dev:
'*':
- gentoo
- openrc
- core
@ -7,4 +7,6 @@
- ssl
- ssh
- salt.minion
salt-master.linode.rbkmoney.dev:
- salt.master