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

fix(python): use python3 postgres on cent7/8 #301

Merged
merged 1 commit into from
Dec 4, 2020

Conversation

noelmcloughlin
Copy link
Member

@noelmcloughlin noelmcloughlin commented Nov 30, 2020

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

The python driver is typically called python3-psycopg2 these days (Ubuntu 18, Centos8).
Centos7 is python-pyscopg2 but this repo has no osfingermap.yaml.

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

Copy link
Contributor

@vutny vutny left a comment

Choose a reason for hiding this comment

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

You may actually enhance the osfamilymap.yaml template and add override for CentOS/RedHat 7 there with simple if statement.

@noelmcloughlin
Copy link
Member Author

Will do!

@noelmcloughlin noelmcloughlin changed the title fix(default): pkg_python default to python3 fix(python): use python3 postres on cent7/8 Dec 2, 2020
@noelmcloughlin noelmcloughlin changed the title fix(python): use python3 postres on cent7/8 fix(python): use python3 postgres on cent7/8 Dec 2, 2020
Copy link
Contributor

@vutny vutny left a comment

Choose a reason for hiding this comment

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

I suggest some better handling for all RedHats and new Ubuntus.

postgres/osfamilymap.yaml Outdated Show resolved Hide resolved
@@ -62,6 +62,10 @@ RedHat:
gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'

{%- if 'osfinger' in grains and grains.osfinger in ('CentOS Linux-7', 'CentOS Linux-8') %}
pkg_python: python3-psycopg2
Copy link
Contributor

Choose a reason for hiding this comment

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

And set the default to python3-psycopg2 as it was in you initial implementation, since it would cover modern Ubuntus too.

Suggested change
pkg_python: python3-psycopg2
pkg_python: python-psycopg2

Copy link
Member Author

Choose a reason for hiding this comment

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

It is python3-psycopg2 for Centos 7. Maybe {%- if grains.get('osmajorrelease') >= 7) %} should wrap this?

Copy link
Contributor

@vutny vutny Dec 3, 2020

Choose a reason for hiding this comment

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

Oh, yeah. It would be even better.

@noelmcloughlin
Copy link
Member Author

thanks @vutny let me know if this is okay.

Copy link
Contributor

@vutny vutny left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@noelmcloughlin noelmcloughlin merged commit d6a6444 into saltstack-formulas:master Dec 4, 2020
@saltstack-formulas-travis

🎉 This PR is included in version 0.41.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

3 participants