From 5ee103ce7cd85b345eb6027e2810d77223198b65 Mon Sep 17 00:00:00 2001 From: Julien Escario Date: Thu, 9 Sep 2021 09:49:17 +0200 Subject: [PATCH 1/5] Corrected call of puppet agent bash profile --- foreman/altinea_puppet_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foreman/altinea_puppet_install.sh b/foreman/altinea_puppet_install.sh index 95e2f64..b49058e 100644 --- a/foreman/altinea_puppet_install.sh +++ b/foreman/altinea_puppet_install.sh @@ -8,4 +8,4 @@ echo "[agent] pluginsync = true report = true"> /etc/puppetlabs/puppet/puppet.conf /opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true -. /etc/profile.d/puppet-agent.sh +source /etc/profile.d/puppet-agent.sh From 19cdb812661d82534c18652629950cba6a7e9822 Mon Sep 17 00:00:00 2001 From: Julien Escario Date: Thu, 9 Sep 2021 12:40:07 +0200 Subject: [PATCH 2/5] Test commit --- foreman/altinea_puppet_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/foreman/altinea_puppet_install.sh b/foreman/altinea_puppet_install.sh index b49058e..73b12d2 100644 --- a/foreman/altinea_puppet_install.sh +++ b/foreman/altinea_puppet_install.sh @@ -9,3 +9,4 @@ echo "[agent] report = true"> /etc/puppetlabs/puppet/puppet.conf /opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true source /etc/profile.d/puppet-agent.sh +echo test From 6f8382088bb0b0847987ddd90f9b9eb15767be2d Mon Sep 17 00:00:00 2001 From: Julien Escario Date: Thu, 9 Sep 2021 12:41:44 +0200 Subject: [PATCH 3/5] Remove test --- foreman/altinea_puppet_install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/foreman/altinea_puppet_install.sh b/foreman/altinea_puppet_install.sh index 73b12d2..b49058e 100644 --- a/foreman/altinea_puppet_install.sh +++ b/foreman/altinea_puppet_install.sh @@ -9,4 +9,3 @@ echo "[agent] report = true"> /etc/puppetlabs/puppet/puppet.conf /opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true source /etc/profile.d/puppet-agent.sh -echo test From 04dd0fc49205c9e70e6f2aa6d80e880b12661d3d Mon Sep 17 00:00:00 2001 From: Julien Escario Date: Wed, 15 Sep 2021 18:20:18 +0200 Subject: [PATCH 4/5] Change image to plain ol' Ubuntu (not minimal) and increase initial disk size to 5000MB --- cloud-init/create_ubuntu20_template.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cloud-init/create_ubuntu20_template.sh b/cloud-init/create_ubuntu20_template.sh index ff154b1..185445b 100644 --- a/cloud-init/create_ubuntu20_template.sh +++ b/cloud-init/create_ubuntu20_template.sh @@ -25,16 +25,17 @@ fi echo "Storage $_storage is valid and VM does not exists, let's get the latest Ubuntu-minimal image from repo" # Fetching the last Ubuntu Minimal 20.04 cloud-image -curl --progress-bar -o ubuntu-20.04-minimal-cloudimg-amd64.img https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img +curl --progress-bar -o ubuntu-20.04-server-cloudimg-amd64.img http://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-amd64.img # Silently download public SSH key curl -s -o support@altinea.fr.pub https://gitlab.altinea.fr/altinea/install-scripts/raw/branch/master/ssh/support@altinea.fr.pub # Create VM, import cloud-image and configure storage /usr/sbin/qm create 9999 --memory 1024 --net0 virtio,bridge=vmbr0 -/usr/sbin/qm importdisk 9999 ubuntu-20.04-minimal-cloudimg-amd64.img $_storage +/usr/sbin/qm importdisk 9999 ubuntu-20.04-server-cloudimg-amd64.img $_storage /usr/sbin/qm set 9999 --scsihw virtio-scsi-pci --scsi0 $_storage:vm-9999-disk-0,discard=on /usr/sbin/qm set 9999 --ide2 $_storage:cloudinit --boot c --bootdisk scsi0 --serial0 socket --vga serial0 +/usr/sbin/qm resize 9999 scsi0 +2748M # Convert VM to template /usr/sbin/qm template 9999 From 996bcf5aef0215d220076bc2eb6a7da2234a999c Mon Sep 17 00:00:00 2001 From: Julien Escario Date: Thu, 16 Sep 2021 11:35:34 +0200 Subject: [PATCH 5/5] Remove HEAD markers (added by git ?) --- foreman/altinea_puppet_install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/foreman/altinea_puppet_install.sh b/foreman/altinea_puppet_install.sh index 5e28f91..0053d10 100644 --- a/foreman/altinea_puppet_install.sh +++ b/foreman/altinea_puppet_install.sh @@ -20,9 +20,4 @@ echo "[agent] listen = false pluginsync = true report = true"> /etc/puppetlabs/puppet/puppet.conf -<<<<<<< HEAD -/opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true -source /etc/profile.d/puppet-agent.sh -======= /opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true && source /etc/profile.d/puppet-agent.sh ->>>>>>> 9445dfb1bbfede6154b563ce82418b59afa7df80