diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-30 09:30:17 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-09-30 09:30:17 -0400 |
| commit | 497972223afd5193a40e3e9c4e69ce31319a1ebc (patch) | |
| tree | bda83abe5575a0d51b01f3e4c04916c667520346 /cloudinit/config/cc_users_groups.py | |
| parent | a28d7fe46cf8e3277a13c35c5dd0185f65ab1d0c (diff) | |
| parent | 72fc1f762e5c5df563380e9ed90bfaba131e811b (diff) | |
| download | vyos-cloud-init-497972223afd5193a40e3e9c4e69ce31319a1ebc.tar.gz vyos-cloud-init-497972223afd5193a40e3e9c4e69ce31319a1ebc.zip | |
rework the rest of the users of old single 'user' to support lists
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.
"default" user is now marked in the user dict and get_default_user uses
that.
Diffstat (limited to 'cloudinit/config/cc_users_groups.py')
| -rw-r--r-- | cloudinit/config/cc_users_groups.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py index aa6e0579..bf5b4581 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -16,7 +16,10 @@ # 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 +# Ensure this is aliased to a name not 'distros' +# since the module attribute 'distros' +# is a list of distros that are supported, not a sub-module +from cloudinit import distros as ds from cloudinit.settings import PER_INSTANCE @@ -24,7 +27,7 @@ frequency = PER_INSTANCE def handle(name, cfg, cloud, _log, _args): - (users, groups) = distros.normalize_users_groups(cfg, cloud.distro) + (users, groups) = ds.normalize_users_groups(cfg, cloud.distro) for (name, members) in groups.items(): cloud.distro.create_group(name, members) for (user, config) in users.items(): |