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.

Sign up for GitHub

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

Jump to bottom

Update os_image documentation #49705

Merged
merged 2 commits into from May 10, 2019
Merged

Update os_image documentation #49705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daadff6
Update os_image.py
akshay1610 Dec 10, 2018
6488201
incorporate Akasurde PR feedback
acozine May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/ansible/modules/cloud/openstack/os_image.py
View file
Open in desktop
Expand Up @@ -91,6 +91,8 @@
username: admin
password: passme
project_name: admin
os_user_domain_name: Default
acozine marked this conversation as resolved.
Show resolved Hide resolved
os_project_domain_name: Default
name: cirros
container_format: bare
disk_format: qcow2
Expand Down
3 changes: 2 additions & 1 deletion lib/ansible/plugins/doc_fragments/openstack.py
View file
Open in desktop
Expand Up @@ -24,7 +24,8 @@ class ModuleDocFragment(object):
- Dictionary containing auth information as needed by the cloud's auth
plugin strategy. For the default I(password) plugin, this would contain
I(auth_url), I(username), I(password), I(project_name) and any
information about domains if the cloud supports them. For other plugins,
information about domains (for example, I(os_user_domain_name) or I(os_project_domain_name)) if the cloud supports them.
For other plugins,
this param will need to contain whatever parameters that auth plugin
requires. This parameter is not needed if a named cloud is provided or
OpenStack OS_* environment variables are present.
Expand Down