[lxc-devel] [lxc-ci/master] Fix IPv6 for Oracle and CentOS cloud images

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 303 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20201217/174e33ea/attachment.bin>
-------------- next part --------------
From 13e8de160b5a79968917ee49a7ae6562f8126077 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at 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.hipp at 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.hipp at 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.hipp at 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