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

docs to clarify cloud configuration #31733

Merged
merged 2 commits into from Mar 9, 2016

Conversation

jacobhammons
Copy link
Contributor

What does this PR do?

  • move previous intro to new quick start topic (topics/cloud/qs.rst)
  • add new intro that explains the salt cloud configuration files
  • add an inheritance and minion startup state example to topics/cloud/config.rst

What issues does this PR fix or reference?

ZD-641 confusion regarding minion settings after creating cloud resources and how settings are inherited.

Tests written?

  • Yes
  • No
  • N/A (docs only)

@ssgward This is ready to be tested

@Ch3LL @rallytime @rickh563 FYI

added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
@jacobhammons jacobhammons added fixed-pls-verify fix is linked, bug author to confirm fix ZD The issue is related to a Zendesk customer support ticket. labels Mar 7, 2016
@ghost
Copy link

ghost commented Mar 8, 2016

Can one of the admins verify this patch?

@rallytime rallytime removed the fixed-pls-verify fix is linked, bug author to confirm fix label Mar 8, 2016
@rallytime
Copy link
Contributor

@jacobhammons There's not a way to add a comment to the image, but the files in /etc/salt/cloud.providers.d/ and /etc/salt/cloud.profiles.d/ shouldn't be *.provider.conf or *.profile.conf. They should just be *.conf in their respective directories.

that apply to all cloud hosts. See :ref:`Salt Cloud Configuration
<salt-cloud-config>`.

- ``/etc/salt/cloud.providers.d/*.provider.conf``: Contains settings that
Copy link
Contributor

Choose a reason for hiding this comment

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

This should just be /etc/salt/cloud.providers.d/*.conf (no provider after the *)

@rallytime
Copy link
Contributor

@jacobhammons Ok, I've read over all of these changes and this looks really good. The overall example of how the various cloud files interact is much more clear now. I've added a bunch of comments that should be addressed, but once those are cleaned up, we'll get this in.

Let me know if you have any questions.

@rallytime rallytime added the pending-changes The pull request needs additional changes before it can be merged label Mar 8, 2016
@rallytime
Copy link
Contributor

Looks great!

rallytime pushed a commit that referenced this pull request Mar 9, 2016
docs to clarify cloud configuration
@rallytime rallytime merged commit ec90294 into saltstack:2015.8 Mar 9, 2016
@jacobhammons jacobhammons deleted the cloud-docs branch March 15, 2016 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pending-changes The pull request needs additional changes before it can be merged ZD The issue is related to a Zendesk customer support ticket.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants