Merge "Fix a typo in all seed files"

2017-07-06 06:49:48 +00:00 · 2017-07-06 06:49:48 +00:00 · 7a1c0e49bc
commit 7a1c0e49bc
parent 5884762cbd 8c98c87885
21 changed files with 21 additions and 21 deletions
--- a/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-cinder.seed.j2
+++ b/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-cinder.seed.j2
@ -270,4 +270,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-infra.seed.j2
+++ b/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-infra.seed.j2
@ -264,4 +264,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-logging.seed.j2
+++ b/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-logging.seed.j2
@ -264,4 +264,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-network.seed.j2
+++ b/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-network.seed.j2
@ -264,4 +264,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-nova_compute.seed.j2
+++ b/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-nova_compute.seed.j2
@ -272,4 +272,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-swift.seed.j2
+++ b/multi-node-aio-xenial-ansible/roles/tftpboot_configure/templates/ubuntu-server-16.04-unattended-swift.seed.j2
@ -288,4 +288,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/deploy-vms.sh
+++ b/multi-node-aio/deploy-vms.sh
@ -102,4 +102,4 @@ _complete_hosts () {
 complete -F _complete_hosts host
 complete -F _complete_hosts ssh
 ' | ssh -o StrictHostKeyChecking=no 10.0.0.${node#*":"} "cat >> /root/.bashrc"
-done
+done
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-cinder.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-cinder.seed
@ -293,4 +293,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-deploy.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-deploy.seed
@ -293,4 +293,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-infra.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-infra.seed
@ -287,4 +287,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-logging.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-logging.seed
@ -288,4 +288,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-network.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-network.seed
@ -287,4 +287,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-nova_compute.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-nova_compute.seed
@ -295,4 +295,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-swift.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-14.04-unattended-cobbler-swift.seed
@ -312,4 +312,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-cinder.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-cinder.seed
@ -290,4 +290,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-deploy.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-deploy.seed
@ -290,4 +290,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-infra.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-infra.seed
@ -284,4 +284,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-logging.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-logging.seed
@ -285,4 +285,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-network.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-network.seed
@ -284,4 +284,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-nova_compute.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-nova_compute.seed
@ -292,4 +292,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
--- a/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-swift.seed
+++ b/multi-node-aio/templates/pre-seeds/ubuntu-server-16.04-unattended-cobbler-swift.seed
@ -309,4 +309,4 @@ d-i preseed/late_command string \
 #############

 # Reboot after the install is finished.
-finish-install finish-install/reboot_in_progress note
+d-i finish-install/reboot_in_progress note