From 13ea551011f06f03caab0ba83cf0acc5e928f223 Mon Sep 17 00:00:00 2001 From: Ivan Kadochnikov Date: Fri, 7 Oct 2016 15:55:15 +0300 Subject: [PATCH 1/4] Simplify pkgrepo logic, made possible by 3b265a544 --- salt/pkgrepo/absent.sls | 2 +- salt/pkgrepo/init.sls | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/salt/pkgrepo/absent.sls b/salt/pkgrepo/absent.sls index d79b15f..b66c8e3 100644 --- a/salt/pkgrepo/absent.sls +++ b/salt/pkgrepo/absent.sls @@ -1,2 +1,2 @@ include: - - .{{ grains['os']|lower }}.absent + - .{{ grains['os_family']|lower }}.absent diff --git a/salt/pkgrepo/init.sls b/salt/pkgrepo/init.sls index e6eeb3c..b2c794c 100644 --- a/salt/pkgrepo/init.sls +++ b/salt/pkgrepo/init.sls @@ -1,6 +1,2 @@ -{% set name = { - 'RedHat': 'redhat', - 'Debian': grains['os_family']|lower, -}.get(grains.os_family) %} include: - - .{{ name }} + - .{{ grains['os_family']|lower }} From fcefad089941423d9dce26efc76a24550162d14a Mon Sep 17 00:00:00 2001 From: Ivan Kadochnikov Date: Fri, 7 Oct 2016 15:55:44 +0300 Subject: [PATCH 2/4] Delete pkgrepo/ubuntu, not used anymore --- salt/pkgrepo/ubuntu/absent.sls | 5 ----- salt/pkgrepo/ubuntu/init.sls | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 salt/pkgrepo/ubuntu/absent.sls delete mode 100644 salt/pkgrepo/ubuntu/init.sls diff --git a/salt/pkgrepo/ubuntu/absent.sls b/salt/pkgrepo/ubuntu/absent.sls deleted file mode 100644 index 1b63537..0000000 --- a/salt/pkgrepo/ubuntu/absent.sls +++ /dev/null @@ -1,5 +0,0 @@ -drop-saltstack-pkgrepo: - pkgrepo.absent: - - name: deb http://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main - - file: /etc/apt/sources.list.d/saltstack.list - - key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub \ No newline at end of file diff --git a/salt/pkgrepo/ubuntu/init.sls b/salt/pkgrepo/ubuntu/init.sls deleted file mode 100644 index 0fc7519..0000000 --- a/salt/pkgrepo/ubuntu/init.sls +++ /dev/null @@ -1,5 +0,0 @@ -saltstack-pkgrepo: - pkgrepo.managed: - - name: deb https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest {{ grains['lsb_distrib_codename'] }} main - - file: /etc/apt/sources.list.d/saltstack.list - - key_url: https://repo.saltstack.com/apt/ubuntu/{{ grains['lsb_distrib_release'] }}/amd64/latest/SALTSTACK-GPG-KEY.pub \ No newline at end of file From e18eeffb5ecfc9937abcaaecf93b05b14a19d81a Mon Sep 17 00:00:00 2001 From: Ivan Kadochnikov Date: Fri, 7 Oct 2016 15:58:47 +0300 Subject: [PATCH 3/4] Delete debian saltstack repo gpg, not used since 87f3e849d23d --- salt/pkgrepo/debian/saltstack.gpg | Bin 2212 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 salt/pkgrepo/debian/saltstack.gpg diff --git a/salt/pkgrepo/debian/saltstack.gpg b/salt/pkgrepo/debian/saltstack.gpg deleted file mode 100644 index 78da01e4d02e76b880acf2cdbab719da0851dd75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2212 zcmV;V2wV4=0u2OFep)O65CFlTb!7VIqTBoob+53rKJO^krL|RpjInKfc58&6WdASR z<C66P27Rw|$CP+&L$_!Vi#NF0bLk77d6j+2a^=e>r!LeP z)t)SK=Zxo4@IZn`3Sli5I6@gEeLQrCcH{qF;iwkeL|uu9QV{r{mDU%04YzR3*JWoR z8qpP^Sr`In$|YD$-Xkr?gE=8GHWEYzw^zy&`FT5_pf@OAuOT{I*wDX%BcqYOo2QMIl`lGw|)9v8QnTw4k z>4B20+~*~rVgf=xEOz2sAbuIKz2eCTdekFRO>T9402m3zkEM2ZcYbm73;j75D7bpD z4Y6r8aR=F-$0_2&R@-o7G5?Ja?p1aRr%PCV&Wn@Vl+t`@P0D)I{CwlfelD8K0ZDE% zYSx?B66}ybNoII6Y`;#^@fzz7PfcH^{u% z^59EpXHAd9+6xX_>5_5RNAVbPA}u2ZIZ*4w_0yhK` z0SEvg1p-liS}Xz^0|g5S2nPcN6$%Lm3k4Pe0|5X69svRufB*^!5U`#=u=1{Ixhe4w z0JDU+Lo%CMt^P6_5`}jjsWr@xL(wh#Ka0D3c+ZEW4s$d#8b$$NG70wc9Z+KeOoE-@ zV#oFf>mTi)M==XYDxgU(-ItFN8!Vjqd5zZ*>O z0%=H1tpvT`ruTFE5AFcfZG?;vE#cxwCEGazUZe|(v>yPY06?s{^K1Q%*_G8sZNV9q z%I8^L2LRTRiI}Im8=^EGii151~6tDsS1GxeX z1W|rkECCPzs6JR{Ebhp2lLdHokWzR6GeFE1PnnG#$?zY^l7hnT7Qjew)&Qp|w=F_J`pBSY(j>gOigd7cE|20ZCtGZo{+B~v>)0bZnDcr!)b(ZT>M z;xP>n)T`CdERoHKj}BtpKED_Cl5p0wG^4ZinW%0}S4A@CtYC{-e@EST0X(W}xX1tL z81z6OIw2NojHdx_PvW?lA2%ZiD8n7mt7cbg)5pypSj|MeBTmQFg`ZqjlNN1!*ghjo z(zP)yu@yFOU5indiy76fj`vwOqoTDe0;F&M-lesT;A;QtS)wiJC$_YXQw@HWJ2r1cp8k)i?I?i zBk%v)+pJelDpoKr&jNk5*TlS$s zcs?KQ9dUh}hMoZ3wXm2Nqu4tM)F>gb{kG7(o5>R($@5XEcOO+}&=_Mqo6p<^hvS7F z*O9X(g};{tT_nP&4z26-qWh|##IxC%9Ik8DVTUI&?-Nx|ifU8-B7?8}6MV=V8!wyw ze0#|S^3@|n_%BPP^K4ISGET3qm18Wbn^##*^c`!Me3>>;wwyNdZAtnHzHK!z=x$*+ z*jT@KXE)klq=vwJ-=x6c^qCH;xGJlgPWJ*fM_x=xhxbSsi49~1r~Q8fpaYG80D|Cg zM!wsT%;Xe}3P(~u_u+>(S0j-ItG6Up#zKR6rF3VNzDtx6T|cU}q9ie&x$CI|#K43r zhc(MLzyw2+$D32^UFa5++*=)v0Ix0KSywBhEN=L!G%V^MtcORd*YIvedZMhl9G~W= zRKoiJFj>=pcw#`zlrQ9FT#SVqMNjDcb2$tp{rFb(8oXf{(2#yZREtib1ny@$^=!T@ zUnL;}yh(zXaQXa9>wb^dqhh}P$I>EPCdy*I5E6q4o~&cf?5(f)e6{=r<&9Z!_S-b< z@^xbIY)#pD@NV&wU5wFzp%oRoQ8uI4jjs#i+Qqj mf)Sd95cb^dnQt*8|E^>FPOoRgrH_-IR#z)S(H_dM0ssSe2_Yi@ From fd0b200fea1c7638b3f1e9ae5d09216b5b4b9e32 Mon Sep 17 00:00:00 2001 From: Ivan Kadochnikov Date: Fri, 7 Oct 2016 16:12:20 +0300 Subject: [PATCH 4/4] Delete repotype from map.jinja, unused after 8f2191471 --- salt/map.jinja | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/map.jinja b/salt/map.jinja index f237dde..e402581 100644 --- a/salt/map.jinja +++ b/salt/map.jinja @@ -71,7 +71,6 @@ that differ from whats in defaults.yaml 'master': { 'gitfs_provider': 'pygit2' }, - 'repotype': 'epel', }, 'Suse': {}, 'Gentoo': {