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

add a way to set which release of saltstack to use #314

Merged
merged 2 commits into from
May 31, 2017
Merged

add a way to set which release of saltstack to use #314

merged 2 commits into from
May 31, 2017

Conversation

kakwa
Copy link
Contributor

@kakwa kakwa commented May 30, 2017

SaltStack provides "versioned" repositories, this commit add a way
to set which release of salt to use.

It adds a pillar "salt:release" which can be set to a specific release
(ex: 2016.11). This release is then used to configure properly the
repositories URLs for Debian/Ubuntu/RedHat.

The default behavior is to point to 'latest', retaining the previous
behavior if the "salt:release" pillar is not set.

Related to #293

SaltStack provides "versioned" repositories, this commit add a way
to set which release of salt to use.
It adds a pillar "salt:release" which can be set to a specific release
(ex: 2016.11). This release is then used to configure properly the
repositories URLs for Debian/Ubuntu/RedHat.
The default behavior is to point to 'latest', retaining the previous
behavior if the "salt:release" pillar is not set.
@kakwa
Copy link
Contributor Author

kakwa commented May 30, 2017

Please note that this PR is not fully tested.

@aboe76
Copy link
Member

aboe76 commented May 30, 2017

@kakwa I will test this tomorrow, I have a few machines to test the different configurations

@aboe76
Copy link
Member

aboe76 commented May 31, 2017

I got the following error on Debian based systems:

[CRITICAL] Rendering SLS 'base:salt.minion' failed: Jinja syntax error: expected token ',', got 'string'
/var/cache/salt/minion/files/base/salt/map.jinja(66):

because of the missing trailing comma's in the redhat portion

It should be:

'RedHat': {
     'pkgrepo': 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/' + salt_release,
      'key_url': 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/' + salt_release + '/SALTSTACK-GPG-KEY.pub',

salt/map.jinja Outdated
@@ -61,6 +62,8 @@ that differ from whats in defaults.yaml
},
},
'RedHat': {
'pkgrepo': 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/' + salt_release
Copy link
Member

Choose a reason for hiding this comment

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

missing trailing comma

salt/map.jinja Outdated
@@ -61,6 +62,8 @@ that differ from whats in defaults.yaml
},
},
'RedHat': {
'pkgrepo': 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/' + salt_release
'key_url': 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/' + salt_release + '/SALTSTACK-GPG-KEY.pub'
Copy link
Member

Choose a reason for hiding this comment

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

missing trailing comma

Copy link
Contributor Author

Choose a reason for hiding this comment

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

youps, sorry for that

add missing comas
@aboe76 aboe76 merged commit be266a1 into saltstack-formulas:master May 31, 2017
@aboe76
Copy link
Member

aboe76 commented May 31, 2017

Thanks @kakwa

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.

2 participants