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

Make S3 a prototype feature #213

Merged
merged 4 commits into from
Apr 25, 2017
Merged

Conversation

blomquisg
Copy link
Member

Add a configuration to the Settings.yml file that allows administrators to enable or disable Amazon S3 support.

The feature will be disabled by default.

Disabling S3 will disable the S3 manager, which will prevent the S3 refresh worker from starting.

@Ladas
Copy link
Contributor

Ladas commented Apr 18, 2017

@blomquisg hm, this will prevent it from being created. Problem is that we can't add it then from the UI, so that is probably an RFE for later.

@blomquisg
Copy link
Member Author

Looks like I have to add the Settings check to all of the tests, too...

@Ladas
Copy link
Contributor

Ladas commented Apr 18, 2017

@blomquisg hm, you can probably just change the count of :ext_management_systems and only place where we need the setting enabled is https://github.com/Ladas/manageiq-providers-amazon/blob/05c2d067bbe36fba395211f5a9dd27bae7afdeec/spec/models/manageiq/providers/amazon/storage_manager/s3/stubbed_refresher_spec.rb

@Ladas Ladas self-assigned this Apr 21, 2017
Copy link
Contributor

@Ladas Ladas left a comment

Choose a reason for hiding this comment

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

Looks great. @durandom just asked me to do the 0 defaults, so that is super cool it's already done :-)

Copy link
Contributor

@Ladas Ladas left a comment

Choose a reason for hiding this comment

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

Actually, could you run rubocop -a on those spec files? And push it as a separate commit please.

@@ -69,3 +69,6 @@
:ems_refresh_worker_amazon_network: {}
:ems_refresh_worker_amazon_ebs_storage: {}
:ems_refresh_worker_amazon_s3: {}
:prototype:
Copy link
Member

Choose a reason for hiding this comment

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

note that settings will be merged with the core configs...
is there already a top level prototype key?
otherwise I'd put it underems -> ems_amazon -> s3_prototype e.g.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, there's already a prototype key in core settings.

@Ladas Ladas closed this Apr 21, 2017
@Ladas Ladas reopened this Apr 21, 2017
Add a configuration to the Settings.yml file that allows administrators
to enable or disable Amazon S3 support.

The feature will be disabled by default.

Disabling S3 will disable the S3 manager, which will prevent the S3
refresh worker from starting.
S3 tests will now only run is Settings.prototype.amazon.s3 is true.
@miq-bot
Copy link
Member

miq-bot commented Apr 24, 2017

Checked commits blomquisg/manageiq-providers-amazon@a419667~...0c2faca with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
9 files checked, 0 offenses detected
Everything looks good. 🍰

@blomquisg
Copy link
Member Author

@Ladas cops updated, and tests passing.

Copy link
Contributor

@Ladas Ladas left a comment

Choose a reason for hiding this comment

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

looks great now 👍

@Ladas Ladas merged commit 2b92588 into ManageIQ:master Apr 25, 2017
simaishi pushed a commit that referenced this pull request Apr 25, 2017
Make S3 a prototype feature
(cherry picked from commit 2b92588)
@simaishi
Copy link
Contributor

Fine backport details:

$ git log -1
commit 0a8f3b8ac870a4c383a427d646975eb5ac672528
Author: Ladislav Smola <lsmola@redhat.com>
Date:   Tue Apr 25 13:04:41 2017 +0200

    Merge pull request #213 from blomquisg/amazon_s3_prototype
    
    Make S3 a prototype feature
    (cherry picked from commit 2b92588b6de01b14521ebb6d7b02f669feba82c1)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants