Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Vendor and update lxc-to-lxd script #11
Conversation
axw
added some commits
Aug 4, 2017
| @@ -18,8 +18,8 @@ except ImportError: | ||
| # is strictly only true for 'lxc.aa_profile'. | ||
| keys_to_check = [ | ||
| 'lxc.pts', | ||
| - # 'lxc.tty', | ||
| - # 'lxc.devttydir', | ||
| + 'lxc.tty', |
babbageclunk
Aug 7, 2017
Member
You're including them in the list to ignore them - is this a whitelist? And so they're ignored because they're allowed in the config but we don't do anything with them, is that right?
| @@ -225,7 +225,7 @@ def convert_container(lxd_socket, container_name, args): | ||
| # Load the container | ||
| try: | ||
| container = lxc.Container(container_name, args.lxcpath) | ||
| - except: | ||
| + except Exception: |
babbageclunk
Aug 7, 2017
Member
Aren't these basically equivalent? I guess this avoids catching SystemExit.
axw
Aug 7, 2017
Member
this was an upstream change in lxc-to-lxd, just shows up here because of the "go generate"
axw
merged commit 66bbdac
into
juju:master
Aug 7, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
axw commentedAug 7, 2017
We vendor the lxc-to-lxd script as at lxc/lxd@dde9507, and update the script locally to ignore the following config:
The first two should be irrelevant for cloud-based
software, and aren't supported by LXD anyway.
The lxc.pivotdir config is ignored by LXC now, and
is not important.
The lxc.hook.clone config is used by the Ubuntu
Cloud image templates for LXC, and is irrelevant
because we don't clone LXD containers in Juju 2.x.