cloud-init

Merge ~d-info-e/cloud-init:salt-python3 into cloud-init:master

  1. Git
  2. lp:~d-info-e/cloud-init
  3. salt-python3
  4. Merge into master
Proposed by do3meli
Status: Merged
Approved by: Chad Smith
Approved revision: 2696d9dcb3cc9b80efedc653ef1777e765a3cfb6
Merge reported by: Chad Smith
Merged at revision: a533ce570e88315e5d720109db670ed92c7b1bcf
Proposed branch: ~d-info-e/cloud-init:salt-python3
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
cloudinit/config/cc_salt_minion.py (+1/-1)
Reviewer Review Type Date Requested Status
Chad Smith Approve
Review via email: mp+375196@code.launchpad.net

Commit message

switch default FreeBSD salt minion pkg from py27 to py36

To post a comment you must log in.
Revision history for this message
Chad Smith (chad.smith) wrote :

All good and validated package availability @ https://www.freshports.org/

review: Approve
Revision history for this message
Chad Smith (chad.smith) wrote :

This merge has landed in commit a533ce57 to cloud-init branch master.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=a533ce57

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py
2index cd9cb0b..1c991d8 100644
3--- a/cloudinit/config/cc_salt_minion.py
4+++ b/cloudinit/config/cc_salt_minion.py
5@@ -59,7 +59,7 @@ class SaltConstants(object):
6
7 # constants tailored for FreeBSD
8 if util.is_FreeBSD():
9- self.pkg_name = 'py27-salt'
10+ self.pkg_name = 'py36-salt'
11 self.srv_name = 'salt_minion'
12 self.conf_dir = '/usr/local/etc/salt'
13 # constants for any other OS

Subscribers

People subscribed via source and target branches