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

Using mariadb in OpenSuSE >= 13.1. #572

Conversation

sharumpe
Copy link
Contributor

I would like to use MariaDB instead of MySQL on OpenSuSE 13.1. Looking at what has been done for other operatingsystem versions in the source (manifests/params.pp), it appears that you have settled on using operatingsystemrelease to determine when to select mariadb packages, so I have done the same for OpenSuSE. Hopefully I have done this is a way that works for your process; I'm kind of new to contributing to other folks' projects.

Ticket: https://tickets.puppetlabs.com/browse/MODULES-1337

@igalic
Copy link
Contributor

igalic commented Sep 29, 2014

@cmurphy thoughts?

/(SLES|SLED)/ => 'mysql',
case $::operatingsystem {
'OpenSuSE': {
if ( versioncmp( $::operatingsystemrelease, '13.1' ) >= 0 ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Does the version need to be so specific? Could we do

if $::operatingsystemmajrelease >= 13 {

?

@cmurphy
Copy link
Contributor

cmurphy commented Nov 26, 2014

@sharumpe if you rebase against master I believe the 1.8.7 tests will pass.

@igalic Should this also include setting the $provider = 'mariadb' ?

@igalic
Copy link
Contributor

igalic commented Nov 26, 2014

i don't think so, i've moved to removing the mariadb provider, as i think it's simpler to handle it all in one.

@cmurphy
Copy link
Contributor

cmurphy commented Nov 26, 2014

@sharumpe we just merged #610 which will cause merge conflicts here, sorry. If you can rebase and address the question about using 13.1 vs 13 we can get this support in. Thanks!

@sharumpe
Copy link
Contributor Author

Sorry for the delay in responding.

MariaDB became a standard option in OpenSuSE 13.1, the first "13" release,
so I think that would be just fine.

I'll try to rebase it when I get home this evening. I'm still new to the
git stuff, so I will need to look up what that entails.

Thanks!
Tim

On Wed, Nov 26, 2014 at 1:13 PM, Colleen Murphy notifications@github.com
wrote:

@sharumpe https://github.com/sharumpe we just merged #610
#610 which will
cause merge conflicts here, sorry. If you can rebase and address the
question about using 13.1 vs 13 we can get this support in. Thanks!


Reply to this email directly or view it on GitHub
#572 (comment)
.

@cmurphy
Copy link
Contributor

cmurphy commented Dec 1, 2014

@sharumpe let us know if you need any help.

@sharumpe
Copy link
Contributor Author

Well, long delay. Sorry. I am really not sure what needs to be done to
re-base, however, it looks like there are very few differences between the
current params.pp file and what I have, specifically in the section that
chooses the packages for OpenSuSE.

If it's not too much trouble, could you tell me what I need to do to rebase
my fork?

If not, I may just start a new fork from the current head and re-apply my
changes. Seems to be the simplest, if not the most "correct", way to go.

Sorry for my lack of knowledge -- most of my work in the past has been on
my own, but I'm trying to learn. :)

Thanks,
Tim

On Mon, Dec 1, 2014 at 8:59 AM, Colleen Murphy notifications@github.com
wrote:

@sharumpe https://github.com/sharumpe let us know if you need any help.


Reply to this email directly or view it on GitHub
#572 (comment)
.

@underscorgan
Copy link
Contributor

Hi @sharumpe, so to rebase you'll need to do something like

git fetch upstream
git rebase upstream/master

then resolve the conflicts, and

git add <conflicting file>
git rebase --continue
git push -f origin ticket/MODULES-1337-MariaDB_for_OpenSuSE_13.1

@DavidS
Copy link
Contributor

DavidS commented May 28, 2015

Hi @sharumpe , thanks for the work you have put in to this pull request. However due to inactivity and this cannot be merged as is this pull request is being closed. If you want to re-submit this PR with the necessary changes, we will gladly look at the new pull request.

@DavidS DavidS closed this May 28, 2015
@sharumpe
Copy link
Contributor Author

Wow time flies. I have re-done this change against a new clone of this module from a few days ago. Should I re-open the previous issue or create a new one?

1 similar comment
@sharumpe
Copy link
Contributor Author

Wow time flies. I have re-done this change against a new clone of this module from a few days ago. Should I re-open the previous issue or create a new one?

@DavidS
Copy link
Contributor

DavidS commented Nov 20, 2015

@sharumpe thanks! It would be great if you could (force) push to here and re-open, so the context is preserved.

@DavidS DavidS reopened this Nov 20, 2015
@sharumpe
Copy link
Contributor Author

OK, I've pushed the updated code to that same branch, and it looks like the Travis checks are good.

igalic added a commit that referenced this pull request Dec 2, 2015
…_OpenSuSE_13.1

Using mariadb in OpenSuSE >= 13.1.
@igalic igalic merged commit f06cc12 into puppetlabs:master Dec 2, 2015
@igalic
Copy link
Contributor

igalic commented Dec 2, 2015

\o/ thanks @sharumpe!

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.

5 participants