diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-28 13:53:56 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-28 13:53:56 -0700 |
| commit | cf3dd1ba86d4ddde149f451e026c697c07b4d732 (patch) | |
| tree | 29092b201054ca6af61c0c2f4ba61a8f28f051b0 /cloudinit/config/cc_byobu.py | |
| parent | dfa62e70bd9942fd3c82d77217d48615a78bbcfc (diff) | |
| download | vyos-cloud-init-cf3dd1ba86d4ddde149f451e026c697c07b4d732.tar.gz vyos-cloud-init-cf3dd1ba86d4ddde149f451e026c697c07b4d732.zip | |
Rework the rest of the locations that used
the previous 'user' and make those locations
go through the new distros functions to select
the default user or the user list (depending on usage).
Adjust the tests to check the new 'default' field
that signifies the default user + test the new method
to extract just the default user from a normalized
user dictionary.
Diffstat (limited to 'cloudinit/config/cc_byobu.py')
| -rw-r--r-- | cloudinit/config/cc_byobu.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/config/cc_byobu.py b/cloudinit/config/cc_byobu.py index 4e2e06bb..e1ec5af5 100644 --- a/cloudinit/config/cc_byobu.py +++ b/cloudinit/config/cc_byobu.py @@ -18,12 +18,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from cloudinit import distros as ds from cloudinit import util distros = ['ubuntu', 'debian'] -def handle(name, cfg, _cloud, log, args): +def handle(name, cfg, cloud, log, args): if len(args) != 0: value = args[0] else: @@ -56,7 +57,8 @@ def handle(name, cfg, _cloud, log, args): shcmd = "" if mod_user: - user = util.get_cfg_option_str(cfg, "user", "ubuntu") + (users, _groups) = ds.normalize_users_groups(cfg, cloud.distro) + (user, _user_config) = ds.extract_default(users, 'ubuntu') shcmd += " sudo -Hu \"%s\" byobu-launcher-%s" % (user, bl_inst) shcmd += " || X=$(($X+1)); " if mod_sys: |