removed environment. prefix for all manifest templates

templates/base-autofs/manifest.yml

@@ -8,8 +8,8 @@ packer:
       iso_checksum_type: none
       iso_checksum_url: none
       disk_image: True
-      ssh_username: "{{ environment.ssh_username }}"
-      ssh_password: "{{ environment.root_password }}"
+      ssh_username: "{{ ssh_username }}"
+      ssh_password: "{{ root_password }}"
       shutdown_command: "shutdown -P now"
 
   provisioners:

templates/base-ill/manifest.yml

@@ -8,44 +8,44 @@ packer:
       type: qemu
       format: qcow2
       iso_checksum_type: sha256
-      iso_checksum_url: "{{ environment.ubuntu_mirror }}/{{ environment.ubuntu_codename }}-updates/main/installer-amd64/current/images/SHA256SUMS"
-      iso_url: "{{ environment.ubuntu_mirror }}/{{ environment.ubuntu_codename }}-updates/main/installer-amd64/current/images/netboot/mini.iso"
-      ssh_username: "{{ environment.ssh_username }}"
-      ssh_password: "{{ environment.root_password }}"
+      iso_checksum_url: "{{ ubuntu_mirror }}/{{ ubuntu_codename }}-updates/main/installer-amd64/current/images/SHA256SUMS"
+      iso_url: "{{ ubuntu_mirror }}/{{ ubuntu_codename }}-updates/main/installer-amd64/current/images/netboot/mini.iso"
+      ssh_username: "{{ ssh_username }}"
+      ssh_password: "{{ root_password }}"
       ssh_timeout: 60m
       accelerator: kvm
-      headless: "{{ environment.headless }}"
+      headless: "{{ headless }}"
       shutdown_command: "shutdown -P now"
       qemuargs:
         - - "-m"
-          - "{{ environment.memory }}"
+          - "{{ memory }}"
         - - "-smp"
-          - "{{ environment.cpus }}"
+          - "{{ cpus }}"
       boot_wait: 5s
       boot_command:
         - "<tab> "
-        - "preseed/url=http://{% raw %}{{ .HTTPIP }}:{{ .HTTPPort }}{% endraw %}/{{ environment.preseed_file_name }} "
+        - "preseed/url=http://%< .HTTPIP >%:%< .HTTPPort >%/{{ preseed_file_name }} "
         - "auto-install/enable=true "
         - "net.ifnames=0 "
-        - "netcfg/get_hostname={{ environment.vm_name }} "
-        - "netcfg/get_gateway={{ environment.gateway}} "
-        - "netcfg/get_nameservers={{ environment.dns_servers }} "
-        - "netcfg/hostname={{ environment.vm_name }} "
-        - "mirror/http/proxy={{ environment.proxy}} "
-        - "passwd/user-fullname={{ environment.user }} "
-        - "passwd/username={{ environment.user_fullname }} "
-        - "passwd/user-password= {{ environment.user_password }} "
-        - "passwd/user-password-again= {{ environment.user_password }} "
-        - "passwd/root-password={{ environment.root_password }} "
-        - "passwd/root-password-again={{ environment.root_password }} "
-        - "no_proxy={% raw %}{{ .HTTPIP }}{% endraw %},{{ environment.no_proxy }} "
+        - "netcfg/get_hostname={{ vm_name }} "
+        - "netcfg/get_gateway={{ gateway}} "
+        - "netcfg/get_nameservers={{ dns_servers }} "
+        - "netcfg/hostname={{ vm_name }} "
+        - "mirror/http/proxy={{ proxy}} "
+        - "passwd/user-fullname={{ user }} "
+        - "passwd/username={{ user_fullname }} "
+        - "passwd/user-password= {{ user_password }} "
+        - "passwd/user-password-again= {{ user_password }} "
+        - "passwd/root-password={{ root_password }} "
+        - "passwd/root-password-again={{ root_password }} "
+        - "no_proxy=%< .HTTPIP >%,{{ no_proxy }} "
         - "<enter>"
-      disk_size: "{{ environment.disk_size }}"
+      disk_size: "{{ disk_size }}"
       http_directory: "http"
 
   provisioners:
     - type: file
-      source: "system/etc/apt/sources.list_{{ environment.ubuntu_codename }}"
+      source: "system/etc/apt/sources.list_{{ ubuntu_codename }}"
       destination: "/etc/apt/sources.list"
 
     - type: file

templates/base-ntp/manifest.yml

@@ -11,8 +11,8 @@ packer:
       iso_checksum_type: none
       iso_checksum_url: none
       disk_image: True
-      ssh_username: "{{ environment.ssh_username }}"
-      ssh_password: "{{ environment.root_password }}"
+      ssh_username: "{{ ssh_username }}"
+      ssh_password: "{{ root_password }}"
       shutdown_command: "shutdown -P now"
 
   provisioners:
@@ -22,4 +22,3 @@ packer:
     - type: file
       source: system/etc/ntp.conf
       destination: /etc/ntp.conf
-