diff options
author | Kim Hagen <kim@sentrium.io> | 2020-05-04 19:08:45 -0500 |
---|---|---|
committer | Kim Hagen <kim@sentrium.io> | 2020-05-04 19:08:45 -0500 |
commit | 7e581d3656af42d8181d5d22459de20ef78a6ae4 (patch) | |
tree | 4b4d2d4dfcf06430eac4e3f34c4ebc551638f117 /roles/install-config | |
parent | ab0d98b7baa485959506bb75c28305d86a8f3b33 (diff) | |
download | vyos-vm-images-simple_ova.tar.gz vyos-vm-images-simple_ova.zip |
use docker for ovftool, no vmware compression and update config filesimple_ova
Diffstat (limited to 'roles/install-config')
-rw-r--r-- | roles/install-config/tasks/main.yml | 7 | ||||
-rw-r--r-- | roles/install-config/templates/config.boot.j2 | 6 |
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 |