Changed IPs to Hostnames where possible, and removed host.present tes…

[setupminimal]

…ts from common/init.sls

This theoretically solves Issue #288. It certainly prevents /etc/hosts from being messed with, and the recommended testing in Vagrant returns all green. I'm still not entirely sure that I didn't miss something, just because I'm unfamiliar with saltfs's code, so I would appreciate some feedback.

---

This change is

[aneeshusa]

Thanks for the PR! We actually have moved off Linode, and are using DNS instead of the hosts file for name resolution, so the hosts dictionary in the map.jinja file should be removed entirely to make sure everything is going through DNS.

[setupminimal]

Fixed. Thank you.

[aneeshusa]

LGTM, please squash these commits together.

[aneeshusa]

Actually, we should use a Salt file.managed state to set up the hosts file; this makes sure that the old entries get flushed out.

I checked on the builders and this should be suitable for the contents of that file:

127.0.0.1           localhost
::1                 localhost
255.255.255.255     broadcasthost

Here are some docs on file.managed: https://docs.saltstack.com/en/2015.5/ref/states/all/salt.states.file.html#salt.states.file.managed
We also use it in many other files if you want some examples.

[setupminimal]

There. All tested, /etc/hosts is managed, all the extraneous stuff is gone, and it's all squashed into one commit. Is there anything else I should do?

[aneeshusa]

We should put these into a file and refer to them using source instead of contents. Please make a common/files directory, and put these into a file called hosts in that directory.

[setupminimal]

I have to go to bed, and a busy day tomorrow, so I will get back to you Thursday or Friday.

Thank you for your help.

[aneeshusa]

Please also add user: root and mode: 644.

The group is variable and depends on the OS, so we need to use Jinja templating to set it up. It should be root on Ubuntu and wheel on OS X.

[jdm]

@setupminimal Any progress? Any questions?

[setupminimal]

I have been banging my head on this for a while, interspersed with studying for finals, and I can't find the problem. I tried to put the /etc/hosts contents in a file, as you said, but then I haven't been able to refer to that file properly. Would you look at what I'm doing and tell me where I went wrong please?

[aneeshusa]

@setupminimal

The way to refer to the file is adding this key/value pair to the file.managed state: - source: salt://{{ tpldir }}/files/hosts.

For reference, here is the docs link again: https://docs.saltstack.com/en/2015.5/ref/states/all/salt.states.file.html#salt.states.file.managed.

I'm not sure where you got the location parameter - that isn't one of the possible arguments to file.managed. The right one to use is source.

source takes a URL value; we want to reference the file from the Salt file tree (instead of a file on the Internet or S3, for example), so we use the salt:// scheme. The {{ tpldir }} part uses Jinja templating to insert the path to the directory the file is in - so, because we're using it from the common/init.sls file, it will resolve to just common. Then the /files/hosts completes the path.

Hopefully that helps; let me know if that's unclear.

[aneeshusa]

This can be /etc/hosts instead, and then the name parameter is unnecessary down below.

[aneeshusa]

There's a trailing " here.

[aneeshusa]

@setupminimal Sorry to leave this hanging, I didn't see you had updated this! This LGTM and should be good to go after a squash.

[aneeshusa]

typo: Actually, this should be {{ tpldir }}.

[aneeshusa]

Also please rebase against master when you squash.

[bors-servo]

☔ The latest upstream changes (presumably #569) made this pull request unmergeable. Please resolve the merge conflicts.

[aneeshusa]

Closing due to lack of response; these commits have been folded into #577.