Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(salt-minion): remove old code, rearrange & reformat #416

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

myii
Copy link
Member

@myii myii commented May 14, 2019

As discussed on Slack: https://freenode.logbot.info/saltstack-formulas/20190514#c2178003.

This is only the first stage. I believe this should be followed up by splitting this into multiple files. As pointed out in the discussion:

< aboe76 > it's from the FAQ: https://docs.saltstack.com/en/latest/faq.html#restart-using-states
...
< myii > BTW @​gtmanfred, what's the current guidance for restarting salt-minion -- is it still ^?
< gtmanfred > if the init system is systemd, you can just do a regular service.restart salt-minion
< gtmanfred > so you can use service.running, and listen or watch

@myii myii requested review from javierbertoli, daks and aboe76 May 14, 2019 20:30
@aboe76
Copy link
Member

aboe76 commented May 15, 2019

@myii this should be thoroughly tested on windows....and macos

@myii
Copy link
Member Author

myii commented May 15, 2019

@aboe76 That's a great idea and I've been asking around for how to get this done. Do you know the best way for this?

@myii
Copy link
Member Author

myii commented May 17, 2019

Some feedback on Slack about MacOS:

- - -
09:50 myii I submitted a PR to refactor that file. It's working nicely with the CI now. I didn't change anything that should affect MacOS but do you have any suggestions about how I could test it without actually having a Mac available?
09:54 noel.mcloughlin There is a dedicated macos slack channel - those guys should know.
10:07 myii We've got some changes to make on https://github.com/saltstack-formulas/salt-formula. We already test on the various Linux distros (https://travis-ci.com/saltstack-formulas/salt-formula) but are there any suggestions on how we can test on MacOS as well?
16:16 Vernon Cole @​myii the bash script in https://github.com/salt-bevy/salt-bevy/blob/master/configure_machine/macos_install_P3_salt.sh will install the latest version of Salt minion on MacOS. There is also a complete script to provision a VirtualBox MacOS VM in that repo's vagrantfile.

@myii
Copy link
Member Author

myii commented May 17, 2019

MacOS (and Windows) also supported by Cirrus CI, which is currently being evaluated in saltstack-formulas/template-formula#118.

@sticky-note
Copy link
Member

When can we get chance to have this merged ?

@myii
Copy link
Member Author

myii commented Jul 11, 2019

@sticky-note We need to get some testing done on MacOS and Windows; I don't have those available. Maybe @noelmcloughlin can help with MacOS? Not sure who has access to Windows minions at this current time. I did have a nice large pool of Windows minions, not so long ago.

@myii myii force-pushed the refactor/salt-minion branch from 79bc1c6 to 07d3113 Compare July 11, 2019 12:45
@myii
Copy link
Member Author

myii commented Jul 11, 2019

OK, I've rebased this to remove the conflict so this is ready for testing again.

Copy link
Member

@aboe76 aboe76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good, I see no issues, except for testing...

@myii
Copy link
Member Author

myii commented Jul 21, 2019

Well, this formula doesn't appear to be working too well on MacOS anyway (ref: #352, with a recent update from @noelmcloughlin). So just need to get this code tested on Windows.

@noelmcloughlin
Copy link
Member

I created PR #425 to cleanup pkgrepo state/rendering errors on MacOS/Arch/FreeBSD. I will address further issues on those OS in future PR to address at least #352

@noelmcloughlin
Copy link
Member

Could this be merged so I can fix (expected) conflicts in #426

@myii
Copy link
Member Author

myii commented Aug 1, 2019

@noelmcloughlin I would like to but this still hasn't been tested for breakages on Windows minions. I used to have access to a whole bunch of them but not at the current time. Unless we can find someone to do that. Any suggestions? Or should we ask in the Windows room in Slack?

@noelmcloughlin
Copy link
Member

MacOS issues can be tracked in #352 - problems remain.
Window issues could be tracked in a different issue.

@@ -50,11 +50,17 @@ salt-minion:
- name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version %}
- version: {{ salt_settings.version }}
{%- endif %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I resolved the conflict but missed this - line 53 needs to be deleted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants