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

Update map and mount defined types to address #59 #61

Merged
merged 4 commits into from
Jun 14, 2017

Conversation

dhollinger
Copy link
Member

Moved all mapfile generation to the map defined type provided by
@traylenator and instead have the mount defined type calling and passing
values to the map defined type (if mapfile is not empty).

This allows all current functionality to continue working, as well as,
allowing the map defined type to be used standalone AND maintain the
existing mapfile generation feature set.

Tests and templates have been updated to account for the changes.

closes #59

Moved all mapfile generation to the map defined type provided by
@traylenator and instead have the mount defined type calling and passing
values to the map defined type (if mapfile is not empty).

This allows all current functionality to continue working, as well as,
allowing the map defined type to be used standalone AND maintain the
existing mapfile generation feature set.

Tests and templates have been updated to account for the changes.
@dhollinger
Copy link
Member Author

Once merged, we should be able to merge #58 as well

@@ -24,14 +24,27 @@
# @param order Order in which entries will appear in the autofs map file.

define autofs::map (
String $mapcontent,
Array $mapcontent,
Copy link
Member

Choose a reason for hiding this comment

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

breaking change

Copy link
Member Author

@dhollinger dhollinger Jun 13, 2017

Choose a reason for hiding this comment

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

That has not been in a module release yet and was just merged earlier today before I identified some limitations that needed to be addressed.

Brings up a point - are breaking changes only tied to releases or to any merge?

Copy link
Member

Choose a reason for hiding this comment

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

okay \o/

manifests/map.pp Outdated
mode => $mapmode,
replace => $replace,
require => Package[ 'autofs' ],
notify => Service[ 'autofs' ],
Copy link
Member

Choose a reason for hiding this comment

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

a bit nitpicking: no whitespace around []

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

target => $mapfile,
content => template($maptempl),
order => 1,
autofs::map { $title:
Copy link
Member

Choose a reason for hiding this comment

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

👍

@bastelfreak bastelfreak merged commit a363361 into master Jun 14, 2017
@bastelfreak bastelfreak deleted the map_file_fixes branch June 14, 2017 07:27
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.

autofs::map has issues when order not set
2 participants