The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6052
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 7f95c23815db0c813d2a4e46d56595a11cbf67de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Sun, 28 Jul 2019 00:58:03 -0400
Subject: [PATCH 1/5] bash: Update storage options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
scripts/bash/lxd-client | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/bash/lxd-client b/scripts/bash/lxd-client
index 4ace85cdcf..50c066b4e7 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -109,14 +109,15 @@ _have lxc && {
storage_pool_keys="source size btrfs.mount_options ceph.cluster_name \
ceph.osd.force_reuse ceph.osd.pg_num ceph.osd.pool_name \
- ceph.rbd.clone_copy ceph.user.name lvm.thinpool_name lvm.use_thinpool \
+ ceph.rbd.clone_copy ceph.user.name cephfs.cluster_name cephfs.path \
+ cephfs.vg_name lvm.thinpool_name lvm.use_thinpool \
lvm.vg_name rsync.bwlimit volatile.initial_source \
volatile.pool.pristine volume.block.filesystem \
volume.block.mount_options volume.size volume.zfs.remove_snapshots \
volume.zfs.use_refquota zfs.clone_copy zfs.pool_name"
storage_volume_keys="size block.filesystem block.mount_options \
- zfs.remove_snapshots zfs.use_refquota"
+ security.unmapped zfs.remove_snapshots zfs.use_refquota"
if [ $COMP_CWORD -eq 1 ]; then
COMPREPLY=( $(compgen -W "$lxc_cmds" -- ${COMP_WORDS[COMP_CWORD]}) )
From 255ebdb46e74bffea6990bea60edd66f58ba8131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Sun, 28 Jul 2019 01:00:10 -0400
Subject: [PATCH 2/5] bash: Update network options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
scripts/bash/lxd-client | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/bash/lxd-client b/scripts/bash/lxd-client
index 50c066b4e7..85806ae3c4 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -32,7 +32,7 @@ _have lxc && {
{
COMPREPLY=( $( compgen -W "$( lxc profile list | tail -n +4 | awk
'{print $2}' | egrep -v '^(\||^$)' )" "$cur" ) )
}
-
+
_lxd_networks()
{
COMPREPLY=( $( compgen -W \
@@ -102,10 +102,10 @@ _have lxc && {
networks_keys="bridge.driver bridge.external_interfaces bridge.mode \
bridge.mtu bridge.hwaddr dns.domain dns.mode fan.overlay_subnet fan.type
\
fan.underlay_subnet ipv4.address ipv4.dhcp ipv4.dhcp.expiry
ipv4.dhcp.gateway \
- ipv4.dhcp.ranges ipv4.firewall ipv4.nat ipv4.nat.address ipv4.routes
ipv4.routing \
- ipv6.address ipv6.dhcp ipv6.dhcp.expiry ipv6.dhcp.ranges \
- ipv6.dhcp.stateful ipv6.firewall ipv6.nat ipv6.nat.address ipv6.routes
ipv6.routing \
- raw.dnsmasq"
+ ipv4.dhcp.ranges ipv4.firewall ipv4.nat ipv4.nat.address ipv4.nat.order \
+ ipv4.routes ipv4.routing ipv6.address ipv6.dhcp ipv6.dhcp.expiry
ipv6.dhcp.ranges \
+ ipv6.dhcp.stateful ipv6.firewall ipv6.nat ipv6.nat.address
ipv6.nat.order \
+ ipv6.routes ipv6.routing raw.dnsmasq"
storage_pool_keys="source size btrfs.mount_options ceph.cluster_name \
ceph.osd.force_reuse ceph.osd.pg_num ceph.osd.pool_name \
From 84088d48a9bbe0a1efb3fd10deb20306be7b5dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Sun, 28 Jul 2019 01:04:38 -0400
Subject: [PATCH 3/5] bash: Update device options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
scripts/bash/lxd-client | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/scripts/bash/lxd-client b/scripts/bash/lxd-client
index 85806ae3c4..6b061db3bd 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -97,7 +97,13 @@ _have lxc && {
volatile.last_state.idmap volatile.last_state.power user.meta-data \
user.network-config user.network_mode user.user-data user.vendor-data"
- device_keys="limits.ingress limits.egress ipv4.routes ipv6.routes"
+ device_keys="limits.ingress limits.egress ipv4.routes ipv6.routes parent \
+ name mtu hwaddr vlan maas.subnet.ipv4 maas.subnet.ipv6 nictype \
+ host_name limits.max ipv4.address ipv6.address security.mac_filtering \
+ security.ipv4_filtering security.ipv6_filtering vlan limits.read \
+ limits.write path source optional readonly size recursive pool \
+ propagation shift major minor uid gid mode required vendorid productid \
+ pci id listen connect bind nat proxy_protocol security.uid security.gid"
networks_keys="bridge.driver bridge.external_interfaces bridge.mode \
bridge.mtu bridge.hwaddr dns.domain dns.mode fan.overlay_subnet fan.type
\
From ca59ed0db73a423d9d2cbbf81b580c6b5da40e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Sun, 28 Jul 2019 01:08:16 -0400
Subject: [PATCH 4/5] bash: Update container options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
scripts/bash/lxd-client | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/bash/lxd-client b/scripts/bash/lxd-client
index 6b061db3bd..44f58619ed 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -80,6 +80,7 @@ _have lxc && {
boot.host_shutdown_timeout environment. \
limits.cpu limits.cpu.allowance limits.cpu.priority \
limits.disk.priority limits.memory limits.memory.enforce \
+ limits.kernel \
limits.memory.swap limits.memory.swap.priority limits.network.priority \
limits.processes linux.kernel_modules migration.incremental.memory \
migration.incremental.memory.goal nvidia.runtime \
@@ -92,6 +93,7 @@ _have lxc && {
security.syscalls.blacklist_compat security.syscalls.blacklist_default \
security.syscalls.intercept.mknod security.syscalls.intercept.setxattr \
snapshots.schedule snapshots.schedule.stopped snapshots.pattern \
+ snapshots.expiry \
volatile.apply_quota volatile.apply_template volatile.base_image \
volatile.idmap.base volatile.idmap.current volatile.idmap.next \
volatile.last_state.idmap volatile.last_state.power user.meta-data \
From eeb8554872c418ae70fbbd8d533ad9ca75a95615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Sun, 28 Jul 2019 01:12:58 -0400
Subject: [PATCH 5/5] bash: Update server options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
scripts/bash/lxd-client | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/bash/lxd-client b/scripts/bash/lxd-client
index 44f58619ed..c412418a5d 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -68,12 +68,14 @@ _have lxc && {
core.https_address core.https_allowed_credentials \
core.https_allowed_headers core.https_allowed_methods \
core.https_allowed_origin candid.api.url candid.api.key candid.expiry \
- candid.domains \
+ candid.domains cluster.https_address \
core.proxy_https core.proxy_http core.proxy_ignore_hosts \
core.trust_password core.debug_address cluster.offline_threshold \
images.auto_update_cached images.auto_update_interval \
images.compression_algorithm images.remote_cache_expiry \
- maas.api.url maas.api.key maas.machine cluster.images_minimal_replica"
+ maas.api.url maas.api.key maas.machine cluster.images_minimal_replica \
+ rbac.agent.url rbac.agent.username rbac.agent.public_key \
+ rbac.agent.private_key rbac.api.expiry rbac.api.key rbac.api.url"
container_keys="boot.autostart boot.autostart.delay \
boot.autostart.priority boot.stop.priority \
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
