summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-10-02 09:28:42 -0400
committerScott Moser <smoser@ubuntu.com>2013-10-02 09:28:42 -0400
commited8cb662f72e4e3e03ee0489593b7d114e5618cf (patch)
tree733c31db512febf2d5f5c6820dd7d7a29b1a9c7b /cloudinit
parentadbc9e73376cc7ef70455197f57aa41104eba7d6 (diff)
parentc8abc4a6dc53624809a1fcd065ac132678f376ef (diff)
downloadvyos-cloud-init-ed8cb662f72e4e3e03ee0489593b7d114e5618cf.tar.gz
vyos-cloud-init-ed8cb662f72e4e3e03ee0489593b7d114e5618cf.zip
examples/cloud-config-user-groups.txt doc fix, fix pep8
fix documentation of mkpasswd usage in doc/examples/cloud-config-user-groups.txt Also, Precise's version of pep8 insists on ordering of imports, but saucy's has not. So we had some incorrect ordering. This fixes './tools/run-pep8' on precise.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_disk_setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index d274f81a..ade9c2ad 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -16,8 +16,8 @@
#
# 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 util
from cloudinit.settings import PER_INSTANCE
+from cloudinit import util
import logging
import shlex