The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/224
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 13e8de160b5a79968917ee49a7ae6562f8126077 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Thu, 17 Dec 2020 13:04:47 +0100
Subject: [PATCH 1/2] images/centos: Fix IPv6 for cloud images
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/centos.yaml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/images/centos.yaml b/images/centos.yaml
index db08e09..d871f35 100644
--- a/images/centos.yaml
+++ b/images/centos.yaml
@@ -422,8 +422,21 @@ files:
- name: network-config
generator: cloud-init
+ content: |-
+ {% if config_get("user.network-config", "") == "" %}version: 1
+ config:
+ - type: physical
+ name: {% if instance.type == "virtual-machine" %}enp5s0{% else
%}eth0{% endif %}
+ subnets:
+ - type: {% if config_get("user.network_mode", "") == "link-local"
%}manual{% else %}dhcp{% endif %}
+ control: auto
+ - type: dhcp6
+ control: auto{% else %}{{ config_get("user.network-config", "")
}}{% endif %}
variants:
- cloud
+ releases:
+ - 8
+ - 8-Stream
- name: user-data
generator: cloud-init
From cc9bde04c1c00163326abee9e79e7fba4b323165 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Thu, 17 Dec 2020 13:11:43 +0100
Subject: [PATCH 2/2] images/oracle: Fix IPv6 for cloud images
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/oracle.yaml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/images/oracle.yaml b/images/oracle.yaml
index 705f496..c2fbb5e 100644
--- a/images/oracle.yaml
+++ b/images/oracle.yaml
@@ -182,8 +182,20 @@ files:
- name: network-config
generator: cloud-init
+ content: |-
+ {% if config_get("user.network-config", "") == "" %}version: 1
+ config:
+ - type: physical
+ name: {% if instance.type == "virtual-machine" %}enp5s0{% else
%}eth0{% endif %}
+ subnets:
+ - type: {% if config_get("user.network_mode", "") == "link-local"
%}manual{% else %}dhcp{% endif %}
+ control: auto
+ - type: dhcp6
+ control: auto{% else %}{{ config_get("user.network-config", "")
}}{% endif %}
variants:
- cloud
+ releases:
+ - 8
- name: user-data
generator: cloud-init
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
