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

Re-enable and fix acceptance tests. (Don't manage /var/run/redis on Debian systems) #299

Merged
merged 5 commits into from
Mar 11, 2019

Conversation

alexjfisher
Copy link
Member

No description provided.

@alexjfisher alexjfisher force-pushed the acceptance_tests branch 3 times, most recently from bd07354 to 92d774c Compare March 11, 2019 15:19
@alexjfisher alexjfisher changed the title Re-enable acceptance tests Re-enable and fix acceptance tests. (Don't manage /var/run/redis on Debian systems) Mar 11, 2019
- set: ubuntu1604-64m
- set: centos6-64m
- set: centos7-64m
- set: debian8-64m
Copy link
Member

Choose a reason for hiding this comment

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

why is there an m at the end of each line?

Copy link
Member Author

Choose a reason for hiding this comment

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

Role master was needed for one of the beaker helpers. run_task IIRC.

file { '/var/run/redis':
ensure => 'directory',
owner => $::redis::config_owner,
group => $var_run_redis_group,
mode => $var_run_redis_mode,
group => $::redis::config_group,
Copy link
Member

Choose a reason for hiding this comment

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

latest modulesync doesn't allow :: after $, so you might want to directly remove it.

Copy link
Member

Choose a reason for hiding this comment

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

IMHO not. The module is filled with it and this change keeps it consistent.

Copy link
Member Author

Choose a reason for hiding this comment

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

That's only actually for classes. I think there'll be a separate PR where the variables are sorted out.

file { '/var/run/redis':
ensure => 'directory',
owner => $::redis::config_owner,
group => $var_run_redis_group,
mode => $var_run_redis_mode,
group => $::redis::config_group,
Copy link
Member

Choose a reason for hiding this comment

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

IMHO not. The module is filled with it and this change keeps it consistent.

@@ -0,0 +1,13 @@
---
Copy link
Member

Choose a reason for hiding this comment

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

Would it be an idea to add these nodesets as unmanaged? Longer term I'd like to remove them and if this module isn't using them, let's not pollute its history.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure. Can you remind me of the correct syntax for .sync.yml?

Copy link
Member

Choose a reason for hiding this comment

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

@@ -9,6 +9,13 @@
'redis'
end

# We're testing with `manage_repo` true. In redis-sentinel 5, the daemon has its own rundir
pidfile = if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemmajrelease') == '16.04'
Copy link
Member

Choose a reason for hiding this comment

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

Could you implement this in pure puppet below?

Copy link
Member Author

Choose a reason for hiding this comment

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

I suppose I may as well. Ideally, the module itself would set the default correctly, but that's for another day.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done (assuming I've not messed it up).

Copy link
Member Author

Choose a reason for hiding this comment

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

I messed it up...

@alexjfisher
Copy link
Member Author

1e3297e basically reverts #173

rundir directories are 2775

On my system, /var/run/postgres was the only rundir with that permission. I went through the distribution redis packages and ppa packages for Debian 7,8,9 and Ubuntu 14.04, 16.04. They all use 0755 (via their init scripts).

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.

3 participants