On 18-05-03 15:34:31, Marek Marczykowski-Górecki wrote:
> On Thu, May 03, 2018 at 03:22:53PM +0200, viq wrote:
> > On 18-04-26 08:01:00, Patrick Schleizer wrote:
> > > viq:
> > > > I'm somewhat experienced with salt, are there any areas where additional
> > > > set of eyes/hands would be useful?
> > > > 
> > > > Sorry, my python skills are slowly approaching what could be called
> > > > "basic", so don't count on much from that side.
> > > > 
> > > 
> > > The release of Whonix 14 is currently blocked due to missing salt files.
> > > 
> > > Qubes-Whonix 14 SaltStack state files required
> > > 
> > > https://github.com/QubesOS/qubes-issues/issues/3765
> > > 
> > > If you could help out with that one, that would be amazing!
> > 
> > I started looking at it, which led me to anon-whonix state [0] and
> > related, and unless I'm missing something the first, simplest, naive
> > approach would be to append "-14" to all references of templates,
> > something like this commit [1]. Which seems way too simple, so please
> > tell me what am I missing besides the "we want to control it via a
> > variable" :)
> 
> I think it's that simple. But as you've said, better add pillar for
> that, so one could easily switch later to 15 or so.

OK, then an attempt at doing that in another commit [2]. I tried to make it
so that the default version ("14") could be changed in one spot, I'm not
certain that adding to the load macro is the right spot - or is it?
Also, I realised I'm most likely not using it correctly, thus [3], but I
think a single place to define the default version instead of
{{ salt['pillar.get']('qvm:whonix:version', '14') }} throughout multiple
files would be better.
 
> Thanks for looking into it!
> 
> > As a side note, while it may be late for that, I think I'd prefer to have
> > DVM name be closer to AppVM names than template names. When we'd have eg
> > whonix-ws-14 and based on in anon-whonix, DVM for me should be named
> > anon-whonix-dvm, and not whonix-ws-dvm. Or should it be
> > whonix-ws-14-dvm, and anon-whonix preference for DVM adjusted when we
> > get whonix 15?

Part of my modifications creates whonix-ws-{{ version }}-dvm

> > [0] 
> > https://github.com/QubesOS/qubes-mgmt-salt-dom0-virtual-machines/blob/master/qvm/anon-whonix.sls
> > [1] 
> > https://github.com/viq/qubes-mgmt-salt-dom0-virtual-machines/commit/857ee77adef6ce970b5d2948804ff04928164525
[2] 
https://github.com/viq/qubes-mgmt-salt-dom0-virtual-machines/commit/4b7a07ba8e4b1e5f4aa458a9d2a586bd6730340f
[3] 
https://github.com/viq/qubes-mgmt-salt-dom0-virtual-machines/commit/dc5cbf32942548c5753824afce8875c2063b1ef9

-- 
You received this message because you are subscribed to the Google Groups 
"qubes-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/qubes-devel/20180503153628.7tg3mufxexvkhzsg%40hirauchi.
For more options, visit https://groups.google.com/d/optout.

Reply via email to