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 Oracle as a vendor and OS Type #21080

Merged
merged 1 commit into from
Feb 24, 2021
Merged

Add Oracle as a vendor and OS Type #21080

merged 1 commit into from
Feb 24, 2021

Conversation

agrare
Copy link
Member

@agrare agrare commented Feb 24, 2021 •
edited by Fryguy
Loading

Add Oracle as a supported vendor and oracle linux as a supported OperatingSystem type

Required for:

@agrare agrare requested review from Fryguy and kbrock as code owners February 24, 2021 18:28
@agrare
Copy link
Member Author

agrare commented Feb 24, 2021

So we have a line-item for this in the pluggability checklist #19440 but since this is a rails validation I'm getting a cyclic dependency error when trying to load up leaf_subclasses

@Fryguy
Copy link
Member

Fryguy commented Feb 24, 2021 •
edited
Loading

If you have a vendor image we should also add that to decorators for consistency: https://github.com/ManageIQ/manageiq-decorators/tree/master/app/assets/images/svg

@Fryguy
Copy link
Member

Fryguy commented Feb 24, 2021

oh actually it's already there - https://github.com/ManageIQ/manageiq-decorators/blob/master/app/assets/images/svg/vendor-oracle_cloud.svg

@Fryguy Fryguy self-assigned this Feb 24, 2021
@agrare
Copy link
Member Author

agrare commented Feb 24, 2021

Well that's convenient 😄

@Fryguy
Copy link
Member

Fryguy commented Feb 24, 2021

Oh wait, I thought this was a vendor... (i.e. oracle cloud), as opposed to an OS (oracle linux). we don't have an image for oracle linux.

Fryguy
Fryguy reviewed Feb 24, 2021
View reviewed changes
app/models/vm_or_template.rb
@@ -44,6 +44,7 @@ class VmOrTemplate < ApplicationRecord
"amazon" => "Amazon",
"redhat" => "RedHat",
"openstack" => "OpenStack",
"oracle" => "Oracle",
Copy link
Member

Choose a reason for hiding this comment

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

To clarify, this is Oracle Cloud.

Copy link
Member Author

Choose a reason for hiding this comment

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

👍 the vendor-oracle.svg is being picked up already
Screenshot from 2021-02-24 14-40-44

Fryguy
Fryguy reviewed Feb 24, 2021
View reviewed changes
app/models/operating_system.rb
@@ -28,6 +28,7 @@ class OperatingSystem < ApplicationRecord
["linux_coreos", %w(coreos)],
["linux_esx", %w(vmnixx86 vmwareesxserver esxserver vmwareesxi)],
["linux_solaris", %w(solaris)],
["linux_oracle", %w(oracle)],
Copy link
Member

Choose a reason for hiding this comment

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

And this is Oracle Linux.

Copy link
Member Author

Choose a reason for hiding this comment

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

So we just need a os-linux_oracle icon

Copy link
Member

Choose a reason for hiding this comment

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

you can probably symlink like we do for other images.

Copy link
Member Author

Choose a reason for hiding this comment

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

ManageIQ/manageiq-decorators#46

@agrare agrare mentioned this pull request Feb 24, 2021
Merged
@miq-bot
Copy link
Member

miq-bot commented Feb 24, 2021

Checked commit agrare@ac236a2 with ruby 2.6.3, rubocop 0.82.0, haml-lint 0.35.0, and yamllint
2 files checked, 1 offense detected

app/models/operating_system.rb

@Fryguy Fryguy merged commit 633ccf4 into ManageIQ:master Feb 24, 2021
@agrare agrare deleted the add_oracle_vendor branch February 24, 2021 20:46
agrare pushed a commit to agrare/manageiq that referenced this pull request Aug 30, 2021
@Fryguy @agrare
Merge pull request ManageIQ#21080 from agrare/add_oracle_vendor
541e9e7 
Add Oracle as a vendor and OS Type

(cherry picked from commit 633ccf4)
@agrare agrare mentioned this pull request Aug 30, 2021
Closed
@Fryguy
Copy link
Member

Fryguy commented Aug 31, 2021

Backported to morphy in commit 267d4c2.

commit 267d4c2bdebbd496343ff02913d7c0686c9898ca
Author: Jason Frey <[email protected]>
Date:   Wed Feb 24 15:41:50 2021 -0500

    Merge pull request #21080 from agrare/add_oracle_vendor
    
    Add Oracle as a vendor and OS Type
    
    (cherry picked from commit 633ccf4788c16d3ac95047f4d32e0776f0509e5f)

Fryguy added a commit that referenced this pull request Aug 31, 2021
@Fryguy
Merge pull request #21080 from agrare/add_oracle_vendor
267d4c2 
Add Oracle as a vendor and OS Type

(cherry picked from commit 633ccf4)
@chessbyte chessbyte added this to the Morphy milestone Sep 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fryguy Fryguy Fryguy approved these changes

@kbrock kbrock Awaiting requested review from kbrock kbrock is a code owner

Assignees

@Fryguy Fryguy

Labels
enhancement morphy/backported providers/cloud
Projects
None yet
Milestone
Morphy
Development

Successfully merging this pull request may close these issues.
4 participants
@agrare @Fryguy @miq-bot @chessbyte