aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-19 16:21:00 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-19 16:21:00 +0100
commitb60b98643a6da52c08ced89779964b722230a7db (patch)
tree0cfb28cfd468a5b681f2b5af2b935c81d2221950
parent985b53a258ee18eaca8d437ae532c232a6d19921 (diff)
parent69da835d04e741f4e85da3c473ba86c8801931fd (diff)
downloadPuppet-b60b98643a6da52c08ced89779964b722230a7db.tar.gz
Puppet-b60b98643a6da52c08ced89779964b722230a7db.tar.zst
Puppet-b60b98643a6da52c08ced89779964b722230a7db.zip
Merge branch 'split_scripts' into dev
Diffstat
-rwxr-xr-xbin/install_script.sh155
-rwxr-xr-xbin/install_script_ovh_cloud_instance.sh182
-rwxr-xr-xbin/install_script_ovh_vps_ssd.sh237
-rw-r--r--modules/base_installation/templates/puppet/host_ldap.info.erb5
-rw-r--r--python/buy_ovh_vps_ssd.py (renamed from python/buy_vps_server.py)0
-rw-r--r--python/get_initial_configuration_ovh_cloud_instance.py (renamed from python/get_initial_configuration_cloud_instance.py)15
-rw-r--r--python/get_initial_configuration_ovh_vps_ssd.py (renamed from python/get_initial_configuration.py)0
-rw-r--r--python/list_servers.py13
-rw-r--r--python/ovh_helper.py17
-rw-r--r--python/reboot_ovh_cloud_instance.py (renamed from python/reboot_cloud_instance.py)15
-rw-r--r--python/reboot_ovh_vps_ssd.py (renamed from python/reboot_vps_server.py)0
-rw-r--r--python/reinstall_ovh_cloud_instance.py (renamed from python/reinstall_cloud_instance.py)15
-rw-r--r--python/reinstall_ovh_vps_ssd.py (renamed from python/reinstall_vps_server.py)0
-rwxr-xr-xscripts/arch_install_script.sh13
-rwxr-xr-xscripts/arch_puppet_configuration_script.sh8
-rwxr-xr-xscripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh11
-rwxr-xr-xscripts/ovh_cloud_instance/arch_host_script.sh50
-rwxr-xr-xscripts/ovh_vps_ssd/arch_chroot_script.sh29
-rwxr-xr-xscripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh13
-rwxr-xr-xscripts/ovh_vps_ssd/arch_host_script.sh53
-rwxr-xr-xscripts/send_and_run.tcl31
21 files changed, 401 insertions, 461 deletions
diff --git a/bin/install_script.sh b/bin/install_script.sh
new file mode 100755
index 0000000..bd7f38b
--- /dev/null
+++ b/bin/install_script.sh
@@ -0,0 +1,155 @@
1#!/bin/bash
2
3usage() {
4cat <<EOF
5$(basename $0) [options]
6 --help,-h This help
7
8 One of the following options is necessary:
9 --instance-id id Id of the cloud instance
10 --vps-id id Id of the vps
11
12 Optional arguments:
13 --password password Password of the host (only useful in case of no reboot and vps)
14 --reinstall-first Start with reinstalling the vps
15 --host-user user Use another user than the default one
16 --no-reboot Don't reboot
17 --no-reboot-start Don't reboot to rescue at the beginning
18 --no-reboot-end Don't reboot to normal at the end
19 --git-branch branch Use another puppet branch (default: master)
20 --environment env Environment to use for the install (default: production)
21EOF
22}
23
24set -e
25
26git_branch=master
27environment=production
28host_user=""
29password=""
30T=""
31
32while [ -n "$1" ]; do
33 case "$1" in
34 --instance-id)
35 host_id="$2"
36 if [ -z "$host_user" ]; then
37 host_user="arch"
38 fi
39 if [ -z "$password" ]; then
40 password="x"
41 fi
42 [ -n "$T" ] && usage && exit 1
43 T="ovh_cloud_instance"
44 shift
45 ;;
46 --vps-id)
47 host_id="$2"
48 if [ -z "$host_user" ]; then
49 host_user="root"
50 fi
51 [ -n "$T" ] && usage && exit 1
52 T="ovh_vps_ssd"
53 shift
54 ;;
55 --password)
56 password="$2"
57 shift
58 ;;
59 --reinstall-first)
60 reinstall_first=1
61 ;;
62 --host-user)
63 host_user="$2"
64 shift
65 ;;
66 --no-reboot)
67 no_reboot=1
68 ;;
69 --no-reboot-start)
70 no_reboot_start=1
71 ;;
72 --no-reboot-end)
73 no_reboot_end=1
74 ;;
75 --git-branch)
76 git_branch="$2"
77 shift
78 ;;
79 --environment)
80 environment="$2"
81 shift
82 ;;
83 --help|-h)
84 usage
85 exit 0
86 ;;
87 esac
88
89 shift
90done
91
92if [ -z "$T" -o -z "$host_id" ]; then
93 usage
94 exit 1
95fi
96
97DIRECTORY=$(cd `dirname $0` && pwd)
98PYTHON_DIRECTORY="$DIRECTORY/../python"
99SCRIPTS="$DIRECTORY/../scripts"
100
101if [ -n "$reinstall_first" ]; then
102 echo "Réinstallation du système"
103 python $PYTHON_DIRECTORY/reinstall_$T.py --use-current "$host_id"
104
105 read -p "Appuyer sur une touche quand le serveur est prêt" ready
106fi
107
108if [ -z "$no_reboot" -a -z "$no_reboot_start" ]; then
109 echo "Patienter le temps du reboot"
110 python $PYTHON_DIRECTORY/reboot_$T.py --rescue "$host_id"
111
112 read -p "Appuyer sur une touche quand l'instance a redémarré" ready
113fi
114
115if [ -z "$password" ]; then
116 stty -echo
117 read -p "Mot de passe reçu par e-mail : " password; echo
118 stty echo
119fi
120
121ARCH_DIR=`mktemp -d`
122ARCH_HOST_SCRIPT="$SCRIPTS/$T/arch_host_script.sh"
123if [ -f "$SCRIPTS/$T/arch_chroot_script.sh" ]; then
124 ARCH_CHROOT_SCRIPT="$SCRIPTS/$T/arch_chroot_script.sh"
125else
126 ARCH_CHROOT_SCRIPT=""
127fi
128ARCH_INSTALL_SCRIPT="$SCRIPTS/arch_install_script.sh"
129ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT="$SCRIPTS/$T/arch_host_puppet_configuration_script.sh"
130ARCH_PUPPET_CONFIGURATION_SCRIPT="$SCRIPTS/arch_puppet_configuration_script.sh"
131ARCH_PUPPET_INITIAL_CONFIGURATION="$ARCH_DIR/puppet_variables.json"
132
133trap "rm -rf $ARCH_DIR" EXIT
134
135#### Base installation stage
136python $PYTHON_DIRECTORY/get_initial_configuration_$T.py $host_id > $ARCH_PUPPET_INITIAL_CONFIGURATION
137host_address=$(python $PYTHON_DIRECTORY/get_initial_configuration_$T.py $host_id | jq -r '.ips.v4.ipAddress')
138
139dest="$host_user@$host_address"
140files="$ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_PUPPET_INITIAL_CONFIGURATION $ARCH_INSTALL_SCRIPT"
141
142$SCRIPTS/send_and_run.tcl "$dest" "$password" "$git_branch" "$environment" $files
143
144### Role specific stage
145read -p "Press key when LDAP is configured" i
146
147files="$ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT $ARCH_PUPPET_CONFIGURATION_SCRIPT"
148
149$SCRIPTS/send_and_run.tcl "$dest" "$password" "$git_branch" "$environment" $files
150
151### Installation finished
152if [ -z "$no_reboot" -a -z "$no_reboot_end" ]; then
153 echo "Rebooting"
154 python $PYTHON_DIRECTORY/reboot_$T.py --local "$host_id"
155fi
diff --git a/bin/install_script_ovh_cloud_instance.sh b/bin/install_script_ovh_cloud_instance.sh
deleted file mode 100755
index 26e410e..0000000
--- a/bin/install_script_ovh_cloud_instance.sh
+++ /dev/null
@@ -1,182 +0,0 @@
1#!/bin/bash
2
3usage() {
4cat <<EOF
5 $0 [options]
6 --help,-h This help
7 --instance-id id Id of the instance
8 --reinstall-first Start with reinstalling the vps
9 --host-user user Use another user (default: arch)
10 --no-reboot Don't reboot
11 --no-reboot-start Don't reboot to rescue at the beginning
12 --no-reboot-end Don't reboot to normal at the end
13 --git-branch Use another puppet branch (default: master)
14 --environment Environment to use for the installl (default: production)
15EOF
16}
17
18set -e
19
20host_user=arch
21git_branch=master
22environment=production
23
24while [ -n "$1" ]; do
25 case "$1" in
26 --instance-id)
27 instance_id="$2"
28 shift
29 ;;
30 --reinstall-first)
31 reinstall_first=1
32 ;;
33 --host-user)
34 host_user="$2"
35 shift
36 ;;
37 --no-reboot)
38 no_reboot=1
39 ;;
40 --no-reboot-start)
41 no_reboot_start=1
42 ;;
43 --no-reboot-end)
44 no_reboot_end=1
45 ;;
46 --git-branch)
47 git_branch="$2"
48 shift
49 ;;
50 --environment)
51 environment="$2"
52 shift
53 ;;
54 --help|-h)
55 usage
56 exit 0
57 ;;
58 esac
59
60 shift
61done
62
63DIRECTORY=$(cd `dirname $0` && pwd)
64PYTHON_DIRECTORY="$DIRECTORY/../python"
65
66if [ -z "$instance_id" ]; then
67 read -p "Id de l'instance : " instance_id
68fi
69
70if [ -n "$reinstall_first" ]; then
71 echo "Réinstallation du système"
72 python $PYTHON_DIRECTORY/reinstall_cloud_instance.py --use-current "$instance_id"
73
74 read -p "Appuyer sur une touche quand le serveur est prêt" ready
75fi
76
77if [ -z "$no_reboot" -a -z "$no_reboot_start" ]; then
78 echo "Patienter le temps du reboot"
79 python $PYTHON_DIRECTORY/reboot_cloud_instance.py --rescue "$instance_id"
80
81 read -p "Appuyer sur une touche quand l'instance a redémarré" ready
82fi
83
84ARCH_DIR=`mktemp -d`
85ARCH_HOST_SCRIPT="$ARCH_DIR/arch_host_script.sh"
86ARCH_INSTALL_SCRIPT="$ARCH_DIR/arch_install_script.sh"
87ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT="$ARCH_DIR/arch_host_puppet_configuration_script.sh"
88ARCH_PUPPET_CONFIGURATION_SCRIPT="$ARCH_DIR/arch_puppet_configuration_script.sh"
89ARCH_PUPPET_INITIAL_CONFIGURATION="$ARCH_DIR/puppet_variables.json"
90
91trap "rm -rf $ARCH_DIR" EXIT
92
93#### Base installation stage
94python $PYTHON_DIRECTORY/get_initial_configuration_cloud_instance.py $instance_id > $ARCH_PUPPET_INITIAL_CONFIGURATION
95host_address=$(python $PYTHON_DIRECTORY/get_initial_configuration_cloud_instance.py $instance_id | jq -r '.ips.v4.ipAddress')
96
97cat > $ARCH_HOST_SCRIPT <<EOF
98#!/bin/bash
99
100sudo haveged &
101sudo pacman -Sy --noconfirm arch-install-scripts
102
103DEVICE=/dev/vdb1
104MOUNTPOINT=/mnt
105
106UUID=\$(lsblk -rno UUID "\$DEVICE")
107PART="/dev/disk/by-uuid/\$UUID"
108
109# mkfs.ext4 -F -U "\$UUID" "\$DEVICE"
110sudo mount "\$DEVICE" /mnt
111
112##### FIXME: mkfs.ext4 would be better ####
113for i in /mnt/*; do
114 if [ "\$i" = "/mnt/boot" ]; then
115 # keep /boot/grub
116 sudo rm -f \$i/*
117 else
118 sudo rm -rf \$i
119 fi
120done
121##### /FIXME ####
122
123sudo pacstrap /mnt base git puppet
124
125echo "\$PART / auto defaults 0 1" | sudo tee /mnt/etc/fstab
126
127sudo cp /tmp/arch_install_script.sh "\$MOUNTPOINT/root/"
128sudo cp /tmp/puppet_variables.json "\$MOUNTPOINT/root/"
129
130sudo arch-chroot "\$MOUNTPOINT" /root/arch_install_script.sh
131EOF
132
133cat > $ARCH_INSTALL_SCRIPT <<EOF
134CODE_PATH="/etc/puppetlabs/code"
135rm -rf \$CODE_PATH
136git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH
137puppet apply --environment $environment --tags base_installation --test \$CODE_PATH/manifests/site.pp
138# The password seed requires puppet to be run twice
139puppet apply --environment $environment --tags base_installation --test \$CODE_PATH/manifests/site.pp
140EOF
141
142chmod a+x $ARCH_HOST_SCRIPT $ARCH_INSTALL_SCRIPT
143
144expect -f - <<EOF
145set timeout -1
146spawn scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $ARCH_PUPPET_INITIAL_CONFIGURATION $ARCH_HOST_SCRIPT $ARCH_INSTALL_SCRIPT $host_user@$host_address:/tmp
147expect eof
148spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $host_user@$host_address /tmp/arch_host_script.sh
149expect eof
150EOF
151
152### Role specific stage
153read -p "Press key when LDAP is configured" i
154
155cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF
156CODE_PATH="/etc/puppetlabs/code"
157puppet apply --environment $environment --tags base_installation --test \$CODE_PATH/manifests/site.pp
158EOF
159
160cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF
161MOUNTPOINT=/mnt
162
163sudo cp /tmp/arch_puppet_configuration_script.sh "\$MOUNTPOINT/root/"
164
165sudo arch-chroot "\$MOUNTPOINT" /root/arch_puppet_configuration_script.sh
166EOF
167
168chmod a+x $ARCH_PUPPET_CONFIGURATION_SCRIPT $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT
169
170expect -f - <<EOF
171set timeout -1
172spawn scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $ARCH_PUPPET_CONFIGURATION_SCRIPT $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT $host_user@$host_address:/tmp
173expect eof
174spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $host_user@$host_address /tmp/arch_host_puppet_configuration_script.sh
175expect eof
176EOF
177
178### Installation finished
179if [ -z "$no_reboot" -a -z "$no_reboot_end" ]; then
180 echo "Rebooting"
181 python $PYTHON_DIRECTORY/reboot_cloud_instance.py --local "$instance_id"
182fi
diff --git a/bin/install_script_ovh_vps_ssd.sh b/bin/install_script_ovh_vps_ssd.sh
deleted file mode 100755
index 6b1aa39..0000000
--- a/bin/install_script_ovh_vps_ssd.sh
+++ /dev/null
@@ -1,237 +0,0 @@
1#!/bin/bash
2
3usage() {
4cat <<EOF
5 $0 [options]
6 --help,-h This help
7 --vps vps_name Name of the vps
8 --password password Password of the vps (only useful in case of no reboot)
9 --reinstall-first Start with reinstalling the vps
10 --host-user user Use another user (default: root)
11 --no-reboot Don't reboot
12 --no-reboot-start Don't reboot to rescue at the beginning
13 --no-reboot-end Don't reboot to normal at the end
14 --git-branch Use another puppet branch (default: master)
15 --environment Environment to use for the installl (default: production)
16EOF
17}
18
19set -e
20
21host_user=root
22git_branch=master
23environment=production
24
25while [ -n "$1" ]; do
26 case "$1" in
27 --vps)
28 vps_name="$2"
29 shift
30 ;;
31 --reinstall-first)
32 reinstall_first=1
33 ;;
34 --password)
35 password="$2"
36 shift
37 ;;
38 --host-user)
39 host_user="$2"
40 shift
41 ;;
42 --no-reboot)
43 no_reboot=1
44 ;;
45 --no-reboot-start)
46 no_reboot_start=1
47 ;;
48 --no-reboot-end)
49 no_reboot_end=1
50 ;;
51 --git-branch)
52 git_branch="$2"
53 shift
54 ;;
55 --environment)
56 environment="$2"
57 shift
58 ;;
59 --help|-h)
60 usage
61 exit 0
62 ;;
63 esac
64
65 shift
66done
67
68DIRECTORY=$(cd `dirname $0` && pwd)
69PYTHON_DIRECTORY="$DIRECTORY/../python"
70
71if [ -z "$vps_name" ]; then
72 read -p "Nom du vps : " vps_name
73fi
74
75if [ -n "$reinstall_first" ]; then
76 echo "Réinstallation du système"
77 python $PYTHON_DIRECTORY/reinstall_vps_server.py --use-current "$vps_name"
78
79 read -p "Appuyer sur une touche quand le serveur est prêt" ready
80fi
81
82if [ -z "$no_reboot" -a -z "$no_reboot_start" ]; then
83 echo "Patienter le temps du reboot"
84 python $PYTHON_DIRECTORY/reboot_vps_server.py --rescue "$vps_name"
85fi
86
87if [ -z "$password" ]; then
88 stty -echo
89 read -p "Mot de passe reçu par e-mail : " password; echo
90 stty echo
91fi
92
93ARCH_DIR=`mktemp -d`
94ARCH_HOST_SCRIPT="$ARCH_DIR/arch_host_script.sh"
95ARCH_CHROOT_SCRIPT="$ARCH_DIR/arch_chroot_script.sh"
96ARCH_INSTALL_SCRIPT="$ARCH_DIR/arch_install_script.sh"
97ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT="$ARCH_DIR/arch_host_puppet_configuration_script.sh"
98ARCH_PUPPET_CONFIGURATION_SCRIPT="$ARCH_DIR/arch_puppet_configuration_script.sh"
99ARCH_PUPPET_INITIAL_CONFIGURATION="$ARCH_DIR/puppet_variables.json"
100
101trap "rm -rf $ARCH_DIR" EXIT
102
103#### Base installation stage
104python $PYTHON_DIRECTORY/get_initial_configuration.py $vps_name > $ARCH_PUPPET_INITIAL_CONFIGURATION
105
106cat > $ARCH_HOST_SCRIPT <<EOF
107#!/bin/bash
108
109apt-get update
110apt-get install -y haveged
111haveged &
112
113cd /tmp
114
115LATEST=\$(curl https://mirrors.kernel.org/archlinux/iso/latest/sha1sums.txt | grep "bootstrap" | head -n1)
116SHA1=\$(echo "\$LATEST" | cut -d' ' -f1)
117NAME=\$(echo "\$LATEST" | cut -d' ' -f3)
118
119curl -O "https://mirrors.kernel.org/archlinux/iso/latest/\$NAME"
120
121tar -xzf "\$NAME"
122
123echo 'Server = http://archlinux.mirrors.ovh.net/archlinux/\$repo/os/\$arch' > /tmp/root.x86_64/etc/pacman.d/mirrorlist
124
125DEVICE_STR=\$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/")
126DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1)
127MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2)
128
129umount "\$DEVICE"
130UUID=\$(lsblk -rno UUID "\$DEVICE")
131
132echo "\$UUID" > /tmp/root.x86_64/device_uuid
133
134cp /tmp/arch_chroot_script.sh /tmp/root.x86_64/
135
136/tmp/root.x86_64/bin/arch-chroot /tmp/root.x86_64/ /arch_chroot_script.sh
137
138mount "\$DEVICE"
139
140cp /tmp/arch_install_script.sh "\$MOUNTPOINT/root/"
141cp /tmp/puppet_variables.json "\$MOUNTPOINT/root/"
142
143/tmp/root.x86_64/bin/arch-chroot "\$MOUNTPOINT" /root/arch_install_script.sh
144EOF
145
146
147cat > $ARCH_CHROOT_SCRIPT <<EOF
148#!/bin/bash
149
150pacman-key --init
151pacman-key --populate archlinux
152
153UUID=\$(cat /device_uuid)
154PART="/dev/disk/by-uuid/\$UUID"
155DEVICE=\$(realpath "\$PART")
156
157# mkfs.ext4 -F -U "\$UUID" "\$DEVICE"
158mount "\$DEVICE" /mnt
159
160##### FIXME: mkfs.ext4 would be better ####
161for i in /mnt/*; do
162 if [ "\$i" = "/mnt/boot" ]; then
163 # keep /boot/grub
164 rm -f \$i/*
165 else
166 rm -rf \$i
167 fi
168done
169##### /FIXME ####
170
171pacstrap /mnt base git puppet
172
173echo "\$PART / auto defaults 0 1" > /mnt/etc/fstab
174
175umount /mnt
176EOF
177
178cat > $ARCH_INSTALL_SCRIPT <<EOF
179CODE_PATH="/etc/puppetlabs/code"
180rm -rf \$CODE_PATH
181git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH
182puppet apply --environment $environment --tags base_installation --test \$CODE_PATH/manifests/site.pp
183# The password seed requires puppet to be run twice
184puppet apply --environment $environment --tags base_installation --test \$CODE_PATH/manifests/site.pp
185EOF
186
187chmod a+x $ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_INSTALL_SCRIPT
188
189expect -f - <<EOF
190set timeout -1
191spawn scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $ARCH_PUPPET_INITIAL_CONFIGURATION $ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_INSTALL_SCRIPT $host_user@$vps_name:/tmp
192expect "assword:"
193send "$password\n"
194expect eof
195spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $host_user@$vps_name /tmp/arch_host_script.sh
196expect "assword:"
197send "$password\r"
198expect eof
199EOF
200
201### Role specific stage
202read -p "Press key when LDAP is configured" i
203
204cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF
205CODE_PATH="/etc/puppetlabs/code"
206puppet apply --environment $environment --tags base_installation --test \$CODE_PATH/manifests/site.pp
207EOF
208
209cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF
210DEVICE_STR=\$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/")
211DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1)
212MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2)
213
214cp /tmp/arch_puppet_configuration_script.sh "\$MOUNTPOINT/root/"
215
216/tmp/root.x86_64/bin/arch-chroot "\$MOUNTPOINT" /root/arch_puppet_configuration_script.sh
217EOF
218
219chmod a+x $ARCH_PUPPET_CONFIGURATION_SCRIPT $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT
220
221expect -f - <<EOF
222set timeout -1
223spawn scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $ARCH_PUPPET_CONFIGURATION_SCRIPT $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT $host_user@$vps_name:/tmp
224expect "assword:"
225send "$password\n"
226expect eof
227spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no $host_user@$vps_name /tmp/arch_host_puppet_configuration_script.sh
228expect "assword:"
229send "$password\r"
230expect eof
231EOF
232
233### Installation finished
234if [ -z "$no_reboot" -a -z "$no_reboot_end" ]; then
235 echo "Rebooting"
236 python $PYTHON_DIRECTORY/reboot_vps_server.py --local "$vps_name"
237fi
diff --git a/modules/base_installation/templates/puppet/host_ldap.info.erb b/modules/base_installation/templates/puppet/host_ldap.info.erb
index a71c6f3..9c79d3c 100644
--- a/modules/base_installation/templates/puppet/host_ldap.info.erb
+++ b/modules/base_installation/templates/puppet/host_ldap.info.erb
@@ -1,4 +1,4 @@
1#### Please add this node to LDAP: 1#### Please add this node to LDAP:
2ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF' 2ldapadd -D "cn=root,<%= @ldap_base %>" -W << 'EOF'
3dn: <%= @ldap_dn %> 3dn: <%= @ldap_dn %>
4cn: <%= @ldap_cn %> 4cn: <%= @ldap_cn %>
@@ -14,12 +14,13 @@ objectclass: ipHost
14environment: <%= @environment %> 14environment: <%= @environment %>
15userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> 15userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %>
16EOF 16EOF
17#### Or modify an existing entry: 17#### Or modify an existing entry:
18ldapmodify -D "cn=root,<%= @ldap_base %>" -W << 'EOF' 18ldapmodify -D "cn=root,<%= @ldap_base %>" -W << 'EOF'
19dn: <%= @ldap_dn %> 19dn: <%= @ldap_dn %>
20changetype: modify 20changetype: modify
21replace: userPassword 21replace: userPassword
22userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %> 22userpassword: {SSHA}<%= Base64.encode64(Digest::SHA1.digest(@ldap_password+@ssha_ldap_seed)+@ssha_ldap_seed).chomp! %>
23-
23replace: environment 24replace: environment
24environment: <%= @environment %> 25environment: <%= @environment %>
25<%- unless @ips.empty? -%> 26<%- unless @ips.empty? -%>
diff --git a/python/buy_vps_server.py b/python/buy_ovh_vps_ssd.py
index 44ae786..44ae786 100644
--- a/python/buy_vps_server.py
+++ b/python/buy_ovh_vps_ssd.py
diff --git a/python/get_initial_configuration_cloud_instance.py b/python/get_initial_configuration_ovh_cloud_instance.py
index 4157716..844373c 100644
--- a/python/get_initial_configuration_cloud_instance.py
+++ b/python/get_initial_configuration_ovh_cloud_instance.py
@@ -6,6 +6,7 @@ except ImportError:
6 # In case it's installed globally 6 # In case it's installed globally
7 import ovh 7 import ovh
8import sys 8import sys
9from ovh_helper import find_cloud_instance
9 10
10infos = {} 11infos = {}
11 12
@@ -13,19 +14,7 @@ infos = {}
13# See ovh/README.rst 14# See ovh/README.rst
14client = ovh.Client() 15client = ovh.Client()
15 16
16projects_list = client.get('/cloud/project/') 17_, instance = find_cloud_instance(client, sys.argv[-1])
17if len(projects_list) > 1:
18 print("More than one project is not supported, taking the first one")
19project = projects_list[0]
20instances_list = client.get('/cloud/project/{}/instance'.format(project))
21instances = dict(map(lambda x: (x["id"], x), instances_list))
22if sys.argv[-1] in instances:
23 instance = instances[sys.argv[-1]]
24else:
25 print("Instance not in list:")
26 for instance in instances_list:
27 print("{}: {}".format(instance["name"], instance["id"]))
28 sys.exit(1)
29 18
30infos["ips"] = {} 19infos["ips"] = {}
31for ip_infos in instance["ipAddresses"]: 20for ip_infos in instance["ipAddresses"]:
diff --git a/python/get_initial_configuration.py b/python/get_initial_configuration_ovh_vps_ssd.py
index 0c6f698..0c6f698 100644
--- a/python/get_initial_configuration.py
+++ b/python/get_initial_configuration_ovh_vps_ssd.py
diff --git a/python/list_servers.py b/python/list_servers.py
index 9b8bc64..e7bd2af 100644
--- a/python/list_servers.py
+++ b/python/list_servers.py
@@ -6,7 +6,18 @@ except ImportError:
6 6
7client = ovh.Client() 7client = ovh.Client()
8 8
9print("OVH cloud instances:")
10projects_list = client.get('/cloud/project/')
11for project_id in projects_list:
12 project = client.get('/cloud/project/{}'.format(project_id))
13 print("\t{}:".format(project["description"]))
14 instances_list = client.get('/cloud/project/{}/instance'.format(project_id))
15 for instance in instances_list:
16 print("\t\t{}: {}".format(instance["name"], instance["id"]))
17
9vps_list = client.get('/vps/') 18vps_list = client.get('/vps/')
10 19
20print("OVH VPS SSD servers:")
11for vps in vps_list: 21for vps in vps_list:
12 print(vps) 22 print("\t{}".format(vps))
23
diff --git a/python/ovh_helper.py b/python/ovh_helper.py
index a49a245..19834ae 100644
--- a/python/ovh_helper.py
+++ b/python/ovh_helper.py
@@ -1,4 +1,5 @@
1import time 1import time
2import sys
2 3
3def show_progress(client, vps, task_type): 4def show_progress(client, vps, task_type):
4 running_task_id = client.get("/vps/{}/tasks?type={}".format(vps, task_type))[0] 5 running_task_id = client.get("/vps/{}/tasks?type={}".format(vps, task_type))[0]
@@ -17,3 +18,19 @@ def show_progress(client, vps, task_type):
17 time.sleep(3) 18 time.sleep(3)
18 19
19 print("\rFinished") 20 print("\rFinished")
21
22def find_cloud_instance(client, instance_id):
23 projects_list = client.get('/cloud/project/')
24 instances_list = []
25 for project in projects_list:
26 instances_list += list(map(lambda x: [project, x],
27 client.get('/cloud/project/{}/instance'.format(project))))
28 instances = dict(map(lambda x: (x[1]["id"], x), instances_list))
29 if instance_id in instances:
30 project_instance = instances[instance_id]
31 else:
32 print("Instance not in list:")
33 for instance in instances_list:
34 print("{}: {}".format(instance[1]["name"], instance[1]["id"]))
35 sys.exit(1)
36 return project_instance
diff --git a/python/reboot_cloud_instance.py b/python/reboot_ovh_cloud_instance.py
index b90f488..de20c07 100644
--- a/python/reboot_cloud_instance.py
+++ b/python/reboot_ovh_cloud_instance.py
@@ -6,24 +6,13 @@ except ImportError:
6 # In case it's installed globally 6 # In case it's installed globally
7 import ovh 7 import ovh
8import sys 8import sys
9from ovh_helper import find_cloud_instance
9 10
10# Credentials are stored in ~/.ovh.conf 11# Credentials are stored in ~/.ovh.conf
11# See ovh/README.rst 12# See ovh/README.rst
12client = ovh.Client() 13client = ovh.Client()
13 14
14projects_list = client.get('/cloud/project/') 15project, instance = find_cloud_instance(client, sys.argv[-1])
15if len(projects_list) > 1:
16 print("More than one project is not supported, taking the first one")
17project = projects_list[0]
18instances_list = client.get('/cloud/project/{}/instance'.format(project))
19instances = dict(map(lambda x: (x["id"], x), instances_list))
20if sys.argv[-1] in instances:
21 instance = instances[sys.argv[-1]]
22else:
23 print("Instance not in list:")
24 for instance in instances_list:
25 print("{}: {}".format(instance["name"], instance["id"]))
26 sys.exit(1)
27 16
28if "--rescue" in sys.argv: 17if "--rescue" in sys.argv:
29 netboot_mode="rescue" 18 netboot_mode="rescue"
diff --git a/python/reboot_vps_server.py b/python/reboot_ovh_vps_ssd.py
index 71c5227..71c5227 100644
--- a/python/reboot_vps_server.py
+++ b/python/reboot_ovh_vps_ssd.py
diff --git a/python/reinstall_cloud_instance.py b/python/reinstall_ovh_cloud_instance.py
index c488fda..c0d2617 100644
--- a/python/reinstall_cloud_instance.py
+++ b/python/reinstall_ovh_cloud_instance.py
@@ -6,24 +6,13 @@ except ImportError:
6 # In case it's installed globally 6 # In case it's installed globally
7 import ovh 7 import ovh
8import sys 8import sys
9from ovh_helper import find_cloud_instance
9 10
10# Credentials are stored in ~/.ovh.conf 11# Credentials are stored in ~/.ovh.conf
11# See ovh/README.rst 12# See ovh/README.rst
12client = ovh.Client() 13client = ovh.Client()
13 14
14projects_list = client.get('/cloud/project/') 15project, instance = find_cloud_instance(client, sys.argv[-1])
15if len(projects_list) > 1:
16 print("More than one project is not supported, taking the first one")
17project = projects_list[0]
18instances_list = client.get('/cloud/project/{}/instance'.format(project))
19instances = dict(map(lambda x: (x["id"], x), instances_list))
20if sys.argv[-1] in instances:
21 instance = instances[sys.argv[-1]]
22else:
23 print("Instance not in list:")
24 for instance in instances_list:
25 print("{}: {}".format(instance["name"], instance["id"]))
26 sys.exit(1)
27 16
28current_image = instance["imageId"] 17current_image = instance["imageId"]
29available_images = client.get('/cloud/project/{}/image'.format(project), 18available_images = client.get('/cloud/project/{}/image'.format(project),
diff --git a/python/reinstall_vps_server.py b/python/reinstall_ovh_vps_ssd.py
index 9f535cc..9f535cc 100644
--- a/python/reinstall_vps_server.py
+++ b/python/reinstall_ovh_vps_ssd.py
diff --git a/scripts/arch_install_script.sh b/scripts/arch_install_script.sh
new file mode 100755
index 0000000..21e202f
--- /dev/null
+++ b/scripts/arch_install_script.sh
@@ -0,0 +1,13 @@
1#!/bin/bash
2
3git_branch="$1"
4environment="$2"
5CODE_PATH="/etc/puppetlabs/code"
6
7rm -rf $CODE_PATH
8
9git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH
10puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
11# The password seed requires puppet to be run twice
12puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
13
diff --git a/scripts/arch_puppet_configuration_script.sh b/scripts/arch_puppet_configuration_script.sh
new file mode 100755
index 0000000..caf8987
--- /dev/null
+++ b/scripts/arch_puppet_configuration_script.sh
@@ -0,0 +1,8 @@
1#!/bin/bash
2
3git_branch="$1"
4environment="$2"
5CODE_PATH="/etc/puppetlabs/code"
6
7puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
8
diff --git a/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh b/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh
new file mode 100755
index 0000000..b58e255
--- /dev/null
+++ b/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh
@@ -0,0 +1,11 @@
1#!/bin/bash
2
3git_branch="$1"
4environment="$2"
5
6MOUNTPOINT=/mnt
7
8sudo cp /tmp/arch_puppet_configuration_script.sh "$MOUNTPOINT/root/"
9
10sudo arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment"
11
diff --git a/scripts/ovh_cloud_instance/arch_host_script.sh b/scripts/ovh_cloud_instance/arch_host_script.sh
new file mode 100755
index 0000000..3408563
--- /dev/null
+++ b/scripts/ovh_cloud_instance/arch_host_script.sh
@@ -0,0 +1,50 @@
1#!/bin/bash
2
3set -e
4
5git_branch="$1"
6environment="$2"
7
8# Randomizer
9sudo haveged &
10# /Randomizer
11
12# Prepare an arch chroot
13sudo pacman -Sy --noconfirm arch-install-scripts
14# /Prepare an arch chroot
15
16# Prepare device information
17DEVICE=/dev/vdb1
18MOUNTPOINT=/mnt
19
20UUID=$(lsblk -rno UUID "$DEVICE")
21PART="/dev/disk/by-uuid/$UUID"
22# /Prepare device information
23
24# Install very basic system (base git puppet)
25# mkfs.ext4 -F -U "$UUID" "$DEVICE"
26sudo mount "$DEVICE" /mnt
27
28##### FIXME: mkfs.ext4 would be better ####
29for i in /mnt/*; do
30 if [ "$i" = "/mnt/boot" ]; then
31 # keep /boot/grub
32 sudo rm -f $i/* || true
33 else
34 sudo rm -rf $i
35 fi
36done
37##### /FIXME ####
38
39sudo pacstrap /mnt base git puppet
40
41echo "$PART / auto defaults 0 1" | sudo tee /mnt/etc/fstab
42# /Install very basic system
43
44# Install rest of system (via puppet)
45sudo cp /tmp/arch_install_script.sh "$MOUNTPOINT/root/"
46sudo cp /tmp/puppet_variables.json "$MOUNTPOINT/root/"
47
48sudo arch-chroot "$MOUNTPOINT" /root/arch_install_script.sh "$git_branch" "$environment"
49# /Install rest of system
50
diff --git a/scripts/ovh_vps_ssd/arch_chroot_script.sh b/scripts/ovh_vps_ssd/arch_chroot_script.sh
new file mode 100755
index 0000000..9dc5c46
--- /dev/null
+++ b/scripts/ovh_vps_ssd/arch_chroot_script.sh
@@ -0,0 +1,29 @@
1#!/bin/bash
2
3pacman-key --init
4pacman-key --populate archlinux
5
6UUID=$(cat /device_uuid)
7PART="/dev/disk/by-uuid/$UUID"
8DEVICE=$(realpath "$PART")
9
10# mkfs.ext4 -F -U "$UUID" "$DEVICE"
11mount "$DEVICE" /mnt
12
13##### FIXME: mkfs.ext4 would be better ####
14for i in /mnt/*; do
15 if [ "$i" = "/mnt/boot" ]; then
16 # keep /boot/grub
17 rm -f $i/*
18 else
19 rm -rf $i
20 fi
21done
22##### /FIXME ####
23
24pacstrap /mnt base git puppet
25
26echo "$PART / auto defaults 0 1" > /mnt/etc/fstab
27
28umount /mnt
29
diff --git a/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh b/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh
new file mode 100755
index 0000000..dab8fac
--- /dev/null
+++ b/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh
@@ -0,0 +1,13 @@
1#!/bin/bash
2
3git_branch="$1"
4environment="$2"
5
6DEVICE_STR=$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/")
7DEVICE=$(echo "$DEVICE_STR" | cut -d' ' -f1)
8MOUNTPOINT=$(echo "$DEVICE_STR" | cut -d' ' -f2)
9
10cp /tmp/arch_puppet_configuration_script.sh "$MOUNTPOINT/root/"
11
12/tmp/root.x86_64/bin/arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment"
13
diff --git a/scripts/ovh_vps_ssd/arch_host_script.sh b/scripts/ovh_vps_ssd/arch_host_script.sh
new file mode 100755
index 0000000..8eecae4
--- /dev/null
+++ b/scripts/ovh_vps_ssd/arch_host_script.sh
@@ -0,0 +1,53 @@
1#!/bin/bash
2
3set -e
4
5git_branch="$1"
6environment="$2"
7
8# Randomizer
9apt-get update
10apt-get install -y haveged
11haveged &
12# /Randomizer
13
14# Prepare an arch chroot
15cd /tmp
16
17LATEST=$(curl -L https://mirrors.kernel.org/archlinux/iso/latest/sha1sums.txt | grep "bootstrap" | head -n1)
18SHA1=$(echo "$LATEST" | cut -d' ' -f1)
19NAME=$(echo "$LATEST" | cut -d' ' -f3)
20
21curl -L -O "https://mirrors.kernel.org/archlinux/iso/latest/$NAME"
22
23tar -xzf "$NAME"
24
25echo 'Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch' > /tmp/root.x86_64/etc/pacman.d/mirrorlist
26# /Prepare an arch chroot
27
28# Prepare device information (not available in chroot)
29DEVICE_STR=$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/")
30DEVICE=$(echo "$DEVICE_STR" | cut -d' ' -f1)
31MOUNTPOINT=$(echo "$DEVICE_STR" | cut -d' ' -f2)
32
33umount "$DEVICE"
34UUID=$(lsblk -rno UUID "$DEVICE")
35
36echo "$UUID" > /tmp/root.x86_64/device_uuid
37# /Prepare device information
38
39# Install very basic system via chroot (base git puppet)
40cp /tmp/arch_chroot_script.sh /tmp/root.x86_64/
41
42/tmp/root.x86_64/bin/arch-chroot /tmp/root.x86_64/ /arch_chroot_script.sh
43# /Install very basic system via chroot
44
45# Mount and install rest of system (via puppet)
46mount "$DEVICE"
47
48cp /tmp/arch_install_script.sh "$MOUNTPOINT/root/"
49cp /tmp/puppet_variables.json "$MOUNTPOINT/root/"
50
51/tmp/root.x86_64/bin/arch-chroot "$MOUNTPOINT" /root/arch_install_script.sh "$git_branch" "$environment"
52# /Mount and install rest of system
53
diff --git a/scripts/send_and_run.tcl b/scripts/send_and_run.tcl
new file mode 100755
index 0000000..42fae62
--- /dev/null
+++ b/scripts/send_and_run.tcl
@@ -0,0 +1,31 @@
1#!/usr/bin/expect -f
2set dest [lindex $argv 0]
3set password [lindex $argv 1]
4set git_branch [lindex $argv 2]
5set environment [lindex $argv 3]
6set script [lindex $argv 4]
7set files [lrange $argv 4 end]
8
9if {$password == "x"} {
10 set ask_password 0
11} else {
12 set ask_password 1
13}
14
15set scriptname [file tail $script]
16
17set sshopts [split "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o CheckHostIP=no"]
18
19set timeout -1
20spawn scp {*}$sshopts {*}$files $dest:/tmp
21if {$ask_password} {
22 expect "assword:"
23 send "$password\n"
24}
25expect eof
26spawn ssh {*}$sshopts $dest /tmp/$scriptname $git_branch $environment
27if {$ask_password} {
28 expect "assword:"
29 send "$password\n"
30}
31expect eof
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 05:47:12 +0000