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

Add blockstorage version for openstack #5776

Merged
merged 1 commit into from
Nov 6, 2017
Merged

Add blockstorage version for openstack #5776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions inventory/byo/hosts.origin.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_cloudprovider_openstack_region=region
#openshift_cloudprovider_openstack_lb_subnet_id=subnet_id
#
# Note: If you're getting a "BS API version autodetection failed" when provisioning cinder volumes you may need this setting
#openshift_cloudprovider_openstack_blockstorage_version=v2
#
# GCE
#openshift_cloudprovider_kind=gce

Expand Down
3 changes: 3 additions & 0 deletions inventory/byo/hosts.ose.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_cloudprovider_openstack_region=region
#openshift_cloudprovider_openstack_lb_subnet_id=subnet_id
#
# Note: If you're getting a "BS API version autodetection failed" when provisioning cinder volumes you may need this setting
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this note could be a little clearer.

Let's include the affected versions as mentioned in kubernetes/website#5925

Or perhaps we should wait to see what the approved text is from kubernetes, if that patch ships soon.

#openshift_cloudprovider_openstack_blockstorage_version=v2
#
# GCE
#openshift_cloudprovider_kind=gce

Expand Down
4 changes: 4 additions & 0 deletions roles/openshift_cloud_provider/templates/openstack.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ region = {{ openshift_cloudprovider_openstack_region }}
[LoadBalancer]
subnet-id = {{ openshift_cloudprovider_openstack_lb_subnet_id }}
{% endif %}
{% if openshift_cloudprovider_openstack_blockstorage_version is defined %}
[BlockStorage]
bs-version={{ openshift_cloudprovider_openstack_blockstorage_version }}
{% endif %}