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

Adds support for nested upstart scripts in the form of subfolder/serv… #26511

Merged
merged 1 commit into from Aug 20, 2015

Conversation

Projects
None yet
3 participants
@rasathus
Contributor

rasathus commented Aug 20, 2015

Adds support for nested upstart scripts in the form of subfolder/service. Please advise if there are any optimisations, or alterations you would like made prior to acceptance.

Fixes #26478 - nested upstart services are not supported
Adds support for nested upstart scripts in the form of subfolder/serv…
…ice. This is implemented via an os.walk through the /etc/init folder, rather than the previous glob for *.conf method.

    Fixes #26478 - nested upstart services are not supported
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Aug 20, 2015

Contributor

Go Go Jenkins!

Contributor

cachedout commented Aug 20, 2015

Go Go Jenkins!

jfindlay added a commit that referenced this pull request Aug 20, 2015

Merge pull request #26511 from rasathus/support-nested-upstart
Adds support for nested upstart scripts in the form of subfolder/serv…

@jfindlay jfindlay merged commit 51065b8 into saltstack:develop Aug 20, 2015

3 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #7406 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #8854 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #8582 — SUCCESS
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8127 — SUCCESS
Details
@rasathus

This comment has been minimized.

Show comment
Hide comment
@rasathus

rasathus Sep 4, 2015

Contributor

Do you know when this is likely to make it into a release ? I notice, it didn't make it into v2015.5.5 or the v2015.8.0rc4.

Thanks

Contributor

rasathus commented Sep 4, 2015

Do you know when this is likely to make it into a release ? I notice, it didn't make it into v2015.5.5 or the v2015.8.0rc4.

Thanks

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Sep 7, 2015

Contributor

@rasathus, this will come out in Boron, which is the next major release after 2015.8.0 (Beryllium).

Contributor

jfindlay commented Sep 7, 2015

@rasathus, this will come out in Boron, which is the next major release after 2015.8.0 (Beryllium).

@rasathus

This comment has been minimized.

Show comment
Hide comment
@rasathus

rasathus Sep 7, 2015

Contributor

Thanks

On Mon, Sep 7, 2015 at 5:38 PM, Justin Findlay notifications@github.com
wrote:

@rasathus, this will come out in Boron, which is the next major release after 2015.8.0 (Beryllium).

Reply to this email directly or view it on GitHub:
#26511 (comment)

Contributor

rasathus commented Sep 7, 2015

Thanks

On Mon, Sep 7, 2015 at 5:38 PM, Justin Findlay notifications@github.com
wrote:

@rasathus, this will come out in Boron, which is the next major release after 2015.8.0 (Beryllium).

Reply to this email directly or view it on GitHub:
#26511 (comment)

@rasathus

This comment has been minimized.

Show comment
Hide comment
@rasathus

rasathus Jan 13, 2016

Contributor

Hi,
Is there a release date for Boron as yet ? I was rather hoping for this fix to be available via one of the publicly available packages by now. I've been desperately hoping to avoid having to build our own salt packages, and the headaches of distribution of them, but with a rapidly approaching product release date, its looking more and more like I'm going to have to. Thanks

Contributor

rasathus commented Jan 13, 2016

Hi,
Is there a release date for Boron as yet ? I was rather hoping for this fix to be available via one of the publicly available packages by now. I've been desperately hoping to avoid having to build our own salt packages, and the headaches of distribution of them, but with a rapidly approaching product release date, its looking more and more like I'm going to have to. Thanks

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Jan 13, 2016

Contributor

@rasathus, it should be in a couple of months. This change looks small enough that with @cachedout's permission, we could backport it to 2015.8 and it might get in before 2015.8.4 is tagged, which will happen in the next few days.

Contributor

jfindlay commented Jan 13, 2016

@rasathus, it should be in a couple of months. This change looks small enough that with @cachedout's permission, we could backport it to 2015.8 and it might get in before 2015.8.4 is tagged, which will happen in the next few days.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 13, 2016

Contributor

@rasathus The current target date for a Boron release is mid-March.

Contributor

cachedout commented Jan 13, 2016

@rasathus The current target date for a Boron release is mid-March.

@rasathus

This comment has been minimized.

Show comment
Hide comment
@rasathus

rasathus Jan 13, 2016

Contributor

@jfindlay, It would be an incredible help if it could make it into the next tag.

Contributor

rasathus commented Jan 13, 2016

@jfindlay, It would be an incredible help if it could make it into the next tag.

@jfindlay jfindlay referenced this pull request Jan 13, 2016

Merged

Backport #26511 #30339

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Jan 13, 2016

Contributor

@rasathus, see #30339. Also until the change is released, you shouldn't have to package all of salt for a changed execution module. Since execution modules are a plugin layer in salt, it is relatively easy to distribute custom modules to your minions by using the _modules directory under file_roots and then running salt '*' saltutil.sync_all.

If you put your changed version of upstart.py into /srv/salt/_modules or similar it should replace the standard version that comes with the salt release on the minions when you sync it down.

Contributor

jfindlay commented Jan 13, 2016

@rasathus, see #30339. Also until the change is released, you shouldn't have to package all of salt for a changed execution module. Since execution modules are a plugin layer in salt, it is relatively easy to distribute custom modules to your minions by using the _modules directory under file_roots and then running salt '*' saltutil.sync_all.

If you put your changed version of upstart.py into /srv/salt/_modules or similar it should replace the standard version that comes with the salt release on the minions when you sync it down.

@rasathus

This comment has been minimized.

Show comment
Hide comment
@rasathus

rasathus Jan 13, 2016

Contributor

Thank you. I hadn't realised it was possible to override standard modules
with this approach, but I will certainly keep it in mind for the future.
Thanks
On Wed, 13 Jan 2016 at 21:21, Justin Findlay notifications@github.com
wrote:

@rasathus https://github.com/rasathus, see #30339
#30339. Also until the change is
released, you shouldn't have to package all of salt for a changed execution
module. Since execution modules are a plugin layer in salt, it is
relatively easy to distribute custom modules to your minions by using the
_modules
https://docs.saltstack.com/en/latest/ref/modules/index.html#modules-are-easy-to-write
under file_roots and then running salt '*' saltutil.sync_all.


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

Contributor

rasathus commented Jan 13, 2016

Thank you. I hadn't realised it was possible to override standard modules
with this approach, but I will certainly keep it in mind for the future.
Thanks
On Wed, 13 Jan 2016 at 21:21, Justin Findlay notifications@github.com
wrote:

@rasathus https://github.com/rasathus, see #30339
#30339. Also until the change is
released, you shouldn't have to package all of salt for a changed execution
module. Since execution modules are a plugin layer in salt, it is
relatively easy to distribute custom modules to your minions by using the
_modules
https://docs.saltstack.com/en/latest/ref/modules/index.html#modules-are-easy-to-write
under file_roots and then running salt '*' saltutil.sync_all.


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

cachedout added a commit that referenced this pull request Jan 13, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment