From d3aabf04a895a813d0cd732002d7c80e97b3a2b0 Mon Sep 17 00:00:00 2001
From: Maurice Makaay <maurice@makaay.nl>
Date: Fri, 7 Feb 2020 11:49:00 +0100
Subject: [PATCH] Backup work.

---
 environments/demo/lxd.yml               |  5 +++++
 environments/demo/networks.yml          | 11 ++++++++---
 environments/demo/nodes.yml             | 18 ++++++++++++------
 roles/lxd_container/tasks/bootstrap.yml |  4 ++++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/environments/demo/lxd.yml b/environments/demo/lxd.yml
index 244a271..a144e20 100644
--- a/environments/demo/lxd.yml
+++ b/environments/demo/lxd.yml
@@ -31,6 +31,11 @@ lxd:
             - python3
           timezone: Europe/Amsterdam
       devices:
+        if-public:
+          name: if-public
+          nictype: bridged
+          parent: br-public
+          type: nic
         if-demo:
           name: if-demo
           nictype: bridged
diff --git a/environments/demo/networks.yml b/environments/demo/networks.yml
index 09f87a1..a076112 100644
--- a/environments/demo/networks.yml
+++ b/environments/demo/networks.yml
@@ -11,14 +11,19 @@
 # are attached to the same network/interface.)
 
 networks:
-  demo:
+  public:
     network: 192.168.56.0
     gateway: 192.168.56.1
     netmask: 255.255.255.0
     dns:
       - 192.168.56.1
+    interface: if-public
+    segments:
+      - public
+      - hostname
+  demo:
+    network: 10.0.0.0
+    netmask: 255.255.255.0
     interface: if-demo
     segments:
       - mgmt
-      - public
-      - hostname
diff --git a/environments/demo/nodes.yml b/environments/demo/nodes.yml
index 86b885c..fe5c94a 100644
--- a/environments/demo/nodes.yml
+++ b/environments/demo/nodes.yml
@@ -7,17 +7,20 @@ nodes:
     - name: sidn-demo-01
       type: ubuntu-18.04-lxd_host
       network:
-        demo: {address: 192.168.56.150}
+        public: {address: 192.168.56.150}
+        demo: {address: 10.0.0.150}
     - name: sidn-demo-02
       type: ubuntu-18.04-lxd_host
       network:
-        demo: {address: 192.168.56.151}
+        public: {address: 192.168.56.151}
+        demo: {address: 10.0.0.151}
 
   ansible:
     - name: ansible-01
       lxd_host: sidn-demo-01
       network:
-        demo: {address: 192.168.56.160}
+        public: {address: 192.168.56.160}
+        demo: {address: 10.0.0.160}
       ansible_connection: local
 
   galera-shared:
@@ -32,12 +35,15 @@ nodes:
     - name: galera-01
       lxd_host: sidn-demo-01
       network:
-        demo: {address: 192.168.56.161, mac_address: "00:16:e3:00:00:a1"}
+        public: {address: 192.168.56.161, mac_address: "00:16:e3:00:00:a1"}
+        demo: {address: 10.0.0.161, mac_address: "00:16:e3:00:01:a1"}
     - name: galera-02
       lxd_host: sidn-demo-02
       network:
-        demo: {address: 192.168.56.162, mac_address: "00:16:e3:00:00:a2"}
+        public: {address: 192.168.56.162, mac_address: "00:16:e3:00:00:a2"}
+        demo: {address: 10.0.0.162, mac_address: "00:16:e3:00:01:a2"}
     - name: galera-03
       lxd_host: sidn-demo-02
       network:
-        demo: {address: 192.168.56.163, mac_address: "00:16:e3:00:00:a3"}
+        public: {address: 192.168.56.163, mac_address: "00:16:e3:00:00:a3"}
+        demo: {address: 10.0.0.163, mac_address: "00:16:e3:00:01:a3"}
diff --git a/roles/lxd_container/tasks/bootstrap.yml b/roles/lxd_container/tasks/bootstrap.yml
index 31dcb12..63aaa09 100644
--- a/roles/lxd_container/tasks/bootstrap.yml
+++ b/roles/lxd_container/tasks/bootstrap.yml
@@ -19,6 +19,10 @@
       {{ hostvars[inventory_hostname].lxd_host | quote }}:{{ inventory_hostname | quote }}
       {{ item.name | quote }} {{ item.value | quote }}
   with_items:
+    - name: boot.autostart
+      value: 1
+    - name: boot.autostart.delay
+      value: 1
     - name: boot.autostart.priority
       value: "{{ hostvars[inventory_hostname].lxd_boot_priority | default(0) }}"