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

Make it easier when using salt-ssh #214

Merged
merged 4 commits into from
Jul 4, 2019
Merged

Make it easier when using salt-ssh #214

merged 4 commits into from
Jul 4, 2019

Conversation

remichristiaan
Copy link

Using the tplroot method (borrowed from the ufw-formula) prevents having to set --extra-filerefs when using the formula with salt-ssh.

I've only tested it on my own salt deployment which worked without a hitch.

…ing to set --extra-filerefs when using the formula with salt-ssh.
Skipping acquire of configured file 'stable/binary-i386/Packages' as repository 'https://download.docker.com/linux/ubuntu bionic InRelease' doesn't support architecture 'i386'

Adding [arch=<osarch>] between deb and https solved this problem.
@remichristiaan
Copy link
Author

I've added a fix for the sources list.

Skipping acquire of configured file 'stable/binary-i386/Packages' as repository 'https://download.docker.com/linux/ubuntu bionic InRelease' doesn't support architecture 'i386'

Adding [arch=<osarch>] between deb and https solved this problem.
docker/repo.sls Outdated Show resolved Hide resolved
# Conflicts:
#	docker/repo.sls
Copy link
Member

@noelmcloughlin noelmcloughlin left a comment

Choose a reason for hiding this comment

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

LGTM. Please confirm when re-tested successfully and I am happy to merge.
thanks @remichristiaan

@remichristiaan
Copy link
Author

Travis failed, seems not all packages are installed, complained about not having jinja/yaml.

@noelmcloughlin
Copy link
Member

noelmcloughlin commented Jul 4, 2019

Travis failed, seems not all packages are installed, complained about not having jinja/yaml.

See #182 ;-) . If you could test manually that would be appreciated.

@remichristiaan
Copy link
Author

Tested on my dev env with salt-ssh ... no problems observed.

@noelmcloughlin
Copy link
Member

Thanks @remichristiaan for this.

@noelmcloughlin noelmcloughlin merged commit 9b8feb3 into saltstack-formulas:master Jul 4, 2019
@remichristiaan
Copy link
Author

I've ran more tests and there is a hitch ... need to add some code in other places too. Sorry, tomorrow I'll send in the right pull-request.

@noelmcloughlin
Copy link
Member

No problem - I have reverted.
Unfortunately Travis is broken so extra pressure on PR submitter to ensure fixes work.
Send in a correct PR when you are ready.

@myii
Copy link
Member

myii commented Jul 4, 2019

@remichristiaan I'm aware that this PR has been reverted in #215. As a note, the canonical source to refer back to is https://github.com/saltstack-formulas/template-formula/blob/master/template/map.jinja. This has been crafted to work for salt-ssh as well. However, it will take some effort to apply here in this formula. In terms of Kitchen/Travis, it will be a lot easier if we apply the inspec-based testing from the template-formula as well. Again, this will take some time and effort.

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