-
Notifications
You must be signed in to change notification settings - Fork 23.7k
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
Improvements to OpenStack inventory script #7444
Merged
bcoca
merged 4 commits into
ansible:devel
from
carsongee:cg/nova_inventory_improvements
Apr 14, 2015
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
eccb48c
Improvements to OpenStack inventory script
carsongee cd5edc4
nova.py: Set defaults for OpenStack settings
msabramo 1560b96
nova.py: Support OS_AUTH_SYSTEM and OS_REGION_NAME
msabramo 7cc5eca
nova.ini: Distinguish between required and optional settings
msabramo File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,45 @@ | ||
# Ansible OpenStack external inventory script | ||
|
||
[openstack] | ||
|
||
#------------------------------------------------------------------------- | ||
# Required settings | ||
#------------------------------------------------------------------------- | ||
|
||
# API version | ||
version = 2 | ||
|
||
# OpenStack nova username | ||
username = | ||
|
||
# OpenStack nova api_key | ||
# OpenStack nova api_key or password | ||
api_key = | ||
|
||
# OpenStack nova auth_url | ||
auth_url = | ||
|
||
# Authentication system | ||
auth_system = | ||
# OpenStack nova project_id or tenant name | ||
project_id = | ||
|
||
#------------------------------------------------------------------------- | ||
# Optional settings | ||
#------------------------------------------------------------------------- | ||
|
||
# OpenStack nova project_id | ||
project_id = | ||
# Authentication system | ||
# auth_system = keystone | ||
|
||
# Serverarm region name to use | ||
region_name = | ||
# region_name = | ||
|
||
# Specify a preference for public or private IPs (public is default) | ||
# prefer_private = False | ||
|
||
# What service type (required for newer nova client) | ||
# service_type = compute | ||
|
||
|
||
# TODO: Some other options | ||
# insecure = | ||
# endpoint_type = | ||
# extensions = | ||
# service_type = | ||
# service_name = |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I tested your PR and adding
service_type
and not creating a default for it causes it to fail with an older .ini file that doesn't specifyservice_type
. I submitted the following PR to fix this issue: carsongee#1