summaryrefslogtreecommitdiff
path: root/roles/install-config
diff options
context:
space:
mode:
Diffstat (limited to 'roles/install-config')
-rw-r--r--roles/install-config/tasks/main.yml7
-rw-r--r--roles/install-config/templates/config.boot.j26
2 files changed, 10 insertions, 3 deletions
diff --git a/roles/install-config/tasks/main.yml b/roles/install-config/tasks/main.yml
index 0715fa1..e0e2925 100644
--- a/roles/install-config/tasks/main.yml
+++ b/roles/install-config/tasks/main.yml
@@ -10,3 +10,10 @@
src: config.boot.j2
dest: "{{ vyos_install_root }}/opt/vyatta/etc/config/config.boot"
mode: 0755
+
+- name: Copy config to the installed image
+ become: true
+ template:
+ src: config.boot.j2
+ dest: "/tmp/config.boot"
+ mode: 0755
diff --git a/roles/install-config/templates/config.boot.j2 b/roles/install-config/templates/config.boot.j2
index f0f1e3d..ecbb92e 100644
--- a/roles/install-config/templates/config.boot.j2
+++ b/roles/install-config/templates/config.boot.j2
@@ -3,7 +3,7 @@ system {
login {
user vyos {
authentication {
-{% if cloud_init and not ( keep_user is defined and keep_user == "true" ) %}
+{% if cloud_init|bool and not ( keep_user is defined and keep_user == "true" ) %}
encrypted-password "*"
{% else %}
encrypted-password "$6$MjV2YvKQ56q$QbL562qhRoyUu8OaqrXagicvcsNpF1HssCY06ZxxghDJkBCfSfTE/4FlFB41xZcd/HqYyVBuRt8Zyq3ozJ0dc."
@@ -33,7 +33,7 @@ system {
}
}
interfaces {
-{% if cloud_init and not ( empty_config is defined and empty_config == "true" ) %}
+{% if cloud_init|bool and not ( empty_config is defined and empty_config == "true" ) %}
ethernet eth0 {
address dhcp
}
@@ -41,7 +41,7 @@ interfaces {
loopback lo {
}
}
-{% if cloud_init and not ( empty_config is defined and empty_config == "true" ) %}
+{% if cloud_init|bool and not ( empty_config is defined and empty_config == "true" ) %}
service {
ssh {
port 22