2 files changed, 18 insertions, 9 deletions
diff --git a/roles/install-config/tasks/main.yml b/roles/install-config/tasks/main.yml
index 4447f87..0715fa1 100644
--- a/roles/install-config/tasks/main.yml
+++ b/roles/install-config/tasks/main.yml
@@ -4,9 +4,9 @@
     path: "{{ vyos_install_root }}/opt/vyatta/etc/config/.vyatta_config"
     state: touch
 
-- name: Copy the default config for QEMU to the installed image
+- name: Copy config to the installed image
   become: true
-  copy:
-    src: files/config.boot
+  template:
+    src: config.boot.j2
     dest: "{{ vyos_install_root }}/opt/vyatta/etc/config/config.boot"
     mode: 0755
diff --git a/roles/install-config/files/config.boot b/roles/install-config/templates/config.boot.j2
index f1ec4f5..9b3e8ec 100644
--- a/roles/install-config/files/config.boot
+++ b/roles/install-config/templates/config.boot.j2
@@ -1,14 +1,13 @@
-service {
-    ssh {
-        port 22
-    }
-}
 system {
     host-name vyos
     login {
         user vyos {
             authentication {
+{% if cloud_init == "true" %}
+                encrypted-password "*"
+{% else %}
                 encrypted-password "$6$MjV2YvKQ56q$QbL562qhRoyUu8OaqrXagicvcsNpF1HssCY06ZxxghDJkBCfSfTE/4FlFB41xZcd/HqYyVBuRt8Zyq3ozJ0dc."
+{% endif %}
                 plaintext-password ""
             }
             level admin
@@ -34,8 +33,18 @@ system {
     }
 }
 interfaces {
+{% if cloud_init == "true" %}
     ethernet eth0 {
         address dhcp
     }
-    loopback lo
+{% endif %}
+    loopback lo {
+    }
+}
+{% if cloud_init == "true" %}
+service {
+    ssh {
+        port 22
+    }
 }
+{% endif %}