This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Re-add openstack as a provider option #1183
Merged
Conversation
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
This was missed during some of the refactoring, adding this option back in so custom openstack clouds can be utilized. Fixes #1171 Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
This is a small refactor to keep the list of 'provider types' in a single area. Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
johnsca
suggested changes
Oct 10, 2017
conjureup/controllers/clouds/gui.py
Outdated
| @@ -18,7 +18,7 @@ def finish(self, cloud): | |||
| """ | |||
| self.cancel_monitor.set() | |||
|
|
|||
| if cloud in ['localhost', 'vsphere', 'maas']: | |||
| if cloud in ['localhost', 'vsphere', 'maas', 'openstack']: | |||
There was a problem hiding this comment.
This should use the new list in consts.
conjureup/consts.py
Outdated
| @@ -4,6 +4,7 @@ | |||
| JAAS_CLOUDS = {'ec2', 'azure', 'gce'} | |||
| JAAS_DOMAIN = 'jimm.jujucharms.com' | |||
| JAAS_ENDPOINT = JAAS_DOMAIN + ':443' | |||
| PROVIDER_TYPES = ['localhost', 'maas', 'vsphere', 'openstack'] | |||
There was a problem hiding this comment.
I'm not sure this is the best name, since it is a bit confusing with the list of Provider models. Maybe something like CUSTOM_CLOUDS?
Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
johnsca
approved these changes
Oct 10, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This was missed during some of the refactoring, adding this option back in so
custom openstack clouds can be utilized.
Fixes #1171
Signed-off-by: Adam Stokes battlemidget@users.noreply.github.com