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

Improved support for Enterprise Linux family OSs (CentOS, RHEL etc) #139

Merged
merged 1 commit into from
Jun 4, 2015
Merged

Improved support for Enterprise Linux family OSs (CentOS, RHEL etc) #139

merged 1 commit into from
Jun 4, 2015

Conversation

mattwillsher
Copy link
Contributor

  • Install pygit from package
  • Add Official Salt ZeroMQ 4 COPR repository

Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example

* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository

Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example
puneetk added a commit that referenced this pull request Jun 4, 2015
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
@puneetk puneetk merged commit 8d8371f into saltstack-formulas:master Jun 4, 2015
@mattwillsher mattwillsher deleted the centos branch June 4, 2015 17:45
include:
- .{{ grains['os']|lower }}
{% endif %}
- .{{ name }}
Copy link
Contributor

Choose a reason for hiding this comment

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

You probably could have just changed grains['os']|lower to grains['os_family']|lower

Copy link
Contributor

Choose a reason for hiding this comment

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

Nevermind, I didn't realize there was already stuff for not just Debian there.

@aboe76
Copy link
Member

aboe76 commented Jun 6, 2015

@mattwillsher did the master config part in map.jinja work on rhel/centos?
because I don't see f_defaults.conf change with pygit2 instead of gitpython...

@mattwillsher
Copy link
Contributor Author

Now you mention it, no I think it got left unset. I can take a look tomorrow. From memory, it being unset meant that pygit2 got used as it was available.

What is it it you see? That when gitpython is set it gets left as it is rather that replaced by pygit?


From: Niels Abspoel <notifications@github.commailto:notifications@github.com>
Sent: Saturday, June 6, 2015 10:35 am
Subject: Re: [salt-formula] Improved support for Enterprise Linux family OSs (CentOS, RHEL etc) (#139)
To: saltstack-formulas/salt-formula <salt-formula@noreply.github.commailto:salt-formula@noreply.github.com>
Cc: Matt Willsher <matt@willsher.systemsmailto:matt@willsher.systems>

@mattwillsherhttps://github.com/mattwillsher did the master config part in map.jinja work on rhel/centos?
because I don't see f_defaults.conf change with pygit2 instead of gitpython...

Reply to this email directly or view it on GitHubhttps://github.com//pull/139#issuecomment-109557991.

@aboe76
Copy link
Member

aboe76 commented Jun 6, 2015

You have set the map.jinja redhat default master: gitfs_provider: pygit2,

What I would think that should happen is that the f_defaults.conf picks this up and uses the parameter.
From what I can see is that all master settings in map.jinja aren't used in the template files.
only in the state part.

@mattwillsher
Copy link
Contributor Author

pygit2 is the default in any case. map.jinja is currently only used by the formula itself as you point out. While I agree the value should be set in the f_defaults, this has never been the case for the formula, if I understand correctly. Perhaps this is better opened as an issue and tracked via that?

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

Successfully merging this pull request may close these issues.

4 participants