Skip to content

S
slapos.package
Commit e540d5ec authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

packer: remove vm-bootstrap images from default ansible build playbook

parent 6a594122
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 125 deletions
packer/build-vm-bootstrap.yml
View file @ e540d5ec
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
- shell: PATH=$PATH:/opt/packer/ packer build -var 'disk_size={{ item.size }}' -var 'name={{ item.name }}' -var 'custom_script={{ item.script }}' ubuntu-14.04-server-amd64.json >> log/ubuntu-14-server-amd64-{{ item.name }}.log - shell: PATH=$PATH:/opt/packer/ packer build -var 'disk_size={{ item.size }}' -var 'name={{ item.name }}' -var 'custom_script={{ item.script }}' ubuntu-14.04-server-amd64.json >> log/ubuntu-14-server-amd64-{{ item.name }}.log
args: args:
creates: output-ubuntu-14-server-amd64-{{ item.size }}G-{{ item.name }} creates: output-ubuntu-14-server-{{ item.size }}G-{{ item.name }}
with_items: with_items:
- { name: "vm-bootstrap", size: "200", script: "scripts/vm-bootstrap.sh"} - { name: "vm-bootstrap", size: "200", script: "scripts/vm-bootstrap.sh"}
- { name: "vm-bootstrap", size: "50", script: "scripts/vm-bootstrap.sh"} - { name: "vm-bootstrap", size: "50", script: "scripts/vm-bootstrap.sh"}
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
- shell: PATH=$PATH:/opt/packer/ packer build -var 'disk_size={{ item.size }}' -var 'name={{ item.name }}' -var 'custom_script={{ item.script }}' ubuntu-16.10-server-amd64.json >> log/ubuntu-16-server-amd64-{{ item.name }}.log - shell: PATH=$PATH:/opt/packer/ packer build -var 'disk_size={{ item.size }}' -var 'name={{ item.name }}' -var 'custom_script={{ item.script }}' ubuntu-16.10-server-amd64.json >> log/ubuntu-16-server-amd64-{{ item.name }}.log
args: args:
creates: output-ubuntu-16-server-amd64-{{ item.size }}G-{{ item.name }} creates: output-ubuntu-16-server-{{ item.size }}G-{{ item.name }}
with_items: with_items:
- { name: "vm-bootstrap", size: "200", script: "scripts/vm-bootstrap.sh"} - { name: "vm-bootstrap", size: "200", script: "scripts/vm-bootstrap.sh"}
- { name: "vm-bootstrap", size: "50", script: "scripts/vm-bootstrap.sh"} - { name: "vm-bootstrap", size: "50", script: "scripts/vm-bootstrap.sh"}
...@@ -82,18 +82,18 @@ ...@@ -82,18 +82,18 @@
- { name: "vm-bootstrap", size: "25"} - { name: "vm-bootstrap", size: "25"}
ignore_errors: True ignore_errors: True
- shell: gzip output-ubuntu-14-server-amd64-{{ item.size }}G-{{ item.name }}/packer-ubuntu-14-server-amd64-{{ item.size }}G-{{ item.name }} - shell: gzip output-ubuntu-14-server-{{ item.size }}G-{{ item.name }}/packer-ubuntu-14-server-{{ item.size }}G-{{ item.name }}
args: args:
creates: output-ubuntu-14-server-amd64-{{ item.size }}G-{{ item.name }}/packer-ubuntu-14-server-amd64-{{ item.size }}G-{{ item.name }}.gz creates: output-ubuntu-14-server-{{ item.size }}G-{{ item.name }}/packer-ubuntu-14-server-{{ item.size }}G-{{ item.name }}.gz
with_items: with_items:
- { name: "vm-bootstrap", size: "200"} - { name: "vm-bootstrap", size: "200"}
- { name: "vm-bootstrap", size: "50"} - { name: "vm-bootstrap", size: "50"}
- { name: "vm-bootstrap", size: "25"} - { name: "vm-bootstrap", size: "25"}
ignore_errors: True ignore_errors: True
- shell: gzip output-ubuntu-16-server-amd64-{{ item.size }}G-{{ item.name }}/packer-ubuntu-16-server-amd64-{{ item.size }}G-{{ item.name }} - shell: gzip output-ubuntu-16-server-{{ item.size }}G-{{ item.name }}/packer-ubuntu-16-server-{{ item.size }}G-{{ item.name }}
args: args:
creates: output-ubuntu-16-server-amd64-{{ item.size }}G-{{ item.name }}/packer-ubuntu-16-server-amd64-{{ item.size }}G-{{ item.name }}.gz creates: output-ubuntu-16-server-{{ item.size }}G-{{ item.name }}/packer-ubuntu-16-server-{{ item.size }}G-{{ item.name }}.gz
with_items: with_items:
- { name: "vm-bootstrap", size: "200"} - { name: "vm-bootstrap", size: "200"}
- { name: "vm-bootstrap", size: "50"} - { name: "vm-bootstrap", size: "50"}
...@@ -140,12 +140,12 @@ ...@@ -140,12 +140,12 @@
- { name: "vm-bootstrap", size: "200", distro: "centos-6"} - { name: "vm-bootstrap", size: "200", distro: "centos-6"}
- { name: "vm-bootstrap", size: "50", distro: "centos-6"} - { name: "vm-bootstrap", size: "50", distro: "centos-6"}
- { name: "vm-bootstrap", size: "25", distro: "centos-6"} - { name: "vm-bootstrap", size: "25", distro: "centos-6"}
- { name: "vm-bootstrap", size: "200", distro: "ubuntu-14-server-amd64"} - { name: "vm-bootstrap", size: "200", distro: "ubuntu-14-server"}
- { name: "vm-bootstrap", size: "50", distro: "ubuntu-14-server-amd64"} - { name: "vm-bootstrap", size: "50", distro: "ubuntu-14-server"}
- { name: "vm-bootstrap", size: "25", distro: "ubuntu-14-server-amd64"} - { name: "vm-bootstrap", size: "25", distro: "ubuntu-14-server"}
- { name: "vm-bootstrap", size: "200", distro: "ubuntu-16-server-amd64"} - { name: "vm-bootstrap", size: "200", distro: "ubuntu-16-server"}
- { name: "vm-bootstrap", size: "50", distro: "ubuntu-16-server-amd64"} - { name: "vm-bootstrap", size: "50", distro: "ubuntu-16-server"}
- { name: "vm-bootstrap", size: "25", distro: "ubuntu-16-server-amd64"} - { name: "vm-bootstrap", size: "25", distro: "ubuntu-16-server"}
#### End of build SHA512SUM.txt #### End of build SHA512SUM.txt
...@@ -173,12 +173,12 @@ ...@@ -173,12 +173,12 @@
- { name: "vm-bootstrap", size: "200", distro: "centos-6"} - { name: "vm-bootstrap", size: "200", distro: "centos-6"}
- { name: "vm-bootstrap", size: "50", distro: "centos-6"} - { name: "vm-bootstrap", size: "50", distro: "centos-6"}
- { name: "vm-bootstrap", size: "25", distro: "centos-6"} - { name: "vm-bootstrap", size: "25", distro: "centos-6"}
- { name: "vm-bootstrap", size: "200", distro: "ubuntu-14-server-amd64"} - { name: "vm-bootstrap", size: "200", distro: "ubuntu-14-server"}
- { name: "vm-bootstrap", size: "50", distro: "ubuntu-14-server-amd64"} - { name: "vm-bootstrap", size: "50", distro: "ubuntu-14-server"}
- { name: "vm-bootstrap", size: "25", distro: "ubuntu-14-server-amd64"} - { name: "vm-bootstrap", size: "25", distro: "ubuntu-14-server"}
- { name: "vm-bootstrap", size: "200", distro: "ubuntu-16-server-amd64"} - { name: "vm-bootstrap", size: "200", distro: "ubuntu-16-server"}
- { name: "vm-bootstrap", size: "50", distro: "ubuntu-16-server-amd64"} - { name: "vm-bootstrap", size: "50", distro: "ubuntu-16-server"}
- { name: "vm-bootstrap", size: "25", distro: "ubuntu-16-server-amd64"} - { name: "vm-bootstrap", size: "25", distro: "ubuntu-16-server"}
when: shacache_config.stat.exists == True and upload_shacache == "yes" when: shacache_config.stat.exists == True and upload_shacache == "yes"
......
packer/build.yml
View file @ e540d5ec
...@@ -9,32 +9,32 @@ ...@@ -9,32 +9,32 @@
- shell: PATH=$PATH:/opt/packer/ packer build debian7.json >> log/debian7.log - shell: PATH=$PATH:/opt/packer/ packer build debian7.json >> log/debian7.log
args: args:
creates: output-debian7 creates: output-debian7-100G-image
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build debian8.json >> log/debian8.log - shell: PATH=$PATH:/opt/packer/ packer build debian8.json >> log/debian8.log
args: args:
creates: output-debian8 creates: output-debian8-100G-image
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build ubuntu-14.04-server-amd64.json >> log/ubuntu-14.04-server-amd64.log - shell: PATH=$PATH:/opt/packer/ packer build ubuntu-14.04-server-amd64.json >> log/ubuntu-14.04-server-amd64.log
args: args:
creates: output-ubuntu-14-04-server creates: output-ubuntu-14-server-100G-image
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build ubuntu-15.04-server-amd64.json >> log/ubuntu-15.04-server-amd64.log - shell: PATH=$PATH:/opt/packer/ packer build ubuntu-15.04-server-amd64.json >> log/ubuntu-15.04-server-amd64.log
args: args:
creates: output-ubuntu-15-04-server creates: output-ubuntu-15-server-100G-image
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build centos-6.7.json >> log/centos-6.7.log - shell: PATH=$PATH:/opt/packer/ packer build centos-6.7.json >> log/centos-6.7.log
args: args:
creates: output-centos67 creates: output-centos6-100G-image
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build centos-7.2.json >> log/centos-7.2.log - shell: PATH=$PATH:/opt/packer/ packer build centos-7.2.json >> log/centos-7.2.log
args: args:
creates: output-centos72 creates: output-centos7.2-100G-image
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build debian7-testing-version.json >> log/debian7-testing-version.log - shell: PATH=$PATH:/opt/packer/ packer build debian7-testing-version.json >> log/debian7-testing-version.log
...@@ -82,67 +82,37 @@ ...@@ -82,67 +82,37 @@
creates: output-debian8-webrunner creates: output-debian8-webrunner
ignore_errors: True ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build debian7-vm-bootstrap.json >> log/debian7-vm-bootstrap.log
args:
creates: output-debian7-vm-bootstrap
ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build debian8-vm-boostrap.json >> log/debian8-vm-boostrap.log
args:
creates: output-debian8-vm-bootstrap
ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build ubuntu-14.04-server-amd64-vm-bootstrap.json >> log/ubuntu-14.04-server-amd64-vm-bootstrap.log
args:
creates: output-ubuntu-14-04-server-vm-bootstrap
ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build ubuntu-15.04-server-amd64-vm-bootstrap.json >> log/ubuntu-15.04-server-amd64-vm-bootstrap.log
args:
creates: output-ubuntu-15-04-server-vm-bootstrap
ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build centos-6.7-vm-boostrap.json >> log/centos-6.7-vm-boostrap.log
args:
creates: output-centos68-vm-bootstrap
ignore_errors: True
- shell: PATH=$PATH:/opt/packer/ packer build centos-7.2-vm-bootstrap.json >> log/centos-7.2-vm-bootstrap.log
args:
creates: output-centos72-vm-bootstrap
ignore_errors: True
#### Genetation of images are over. #### Genetation of images are over.
#### Start compress everything #### Start compress everything
- shell: gzip output-debian8/packer-debian8 - shell: gzip output-debian8-100G-image/packer-debian8-100G-image
args: args:
creates: output-debian8/packer-debian8.gz creates: output-debian8-100G-image/packer-debian8-100G-image.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-debian7/packer-debian7 - shell: gzip output-debian7-100G-image/packer-debian7-100G-image
args: args:
creates: output-debian7/packer-debian7.gz creates: output-debian7-100G-image/packer-debian7-100G-image.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-ubuntu-14-04-server/packer-ubuntu-14-04-server - shell: gzip output-ubuntu-14-server-100G-image/packer-ubuntu-14-server-100G-image
args: args:
creates: output-ubuntu-14-04-server/packer-ubuntu-14-04-server.gz creates: output-ubuntu-14-server-100G-image/packer-ubuntu-14-server-100G-image.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-ubuntu-15-04-server/packer-ubuntu-15-04-server - shell: gzip output-ubuntu-15-server-100G-image/packer-ubuntu-15-server-100G-image
args: args:
creates: output-ubuntu-15-04-server/packer-ubuntu-15-04-server.gz creates: output-ubuntu-15-server-100G-image/packer-ubuntu-15-server-100G-image.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-centos67/packer-centos67 - shell: gzip output-centos6-100G-image/packer-centos6-100G-image
args: args:
creates: output-centos67/packer-centos67.gz creates: output-centos6-100G-image/packer-centos6-100G-image.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-centos72/packer-centos72 - shell: gzip output-centos7.2-100G-image/packer-centos7.2-100G-image
args: args:
creates: output-centos72/packer-centos72.gz creates: output-centos7.2-100G-image/packer-centos7.2-100G-image.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-debian8-testing-version/packer-debian8-testing-version - shell: gzip output-debian8-testing-version/packer-debian8-testing-version
...@@ -190,36 +160,6 @@ ...@@ -190,36 +160,6 @@
creates: output-debian8-webrunner/packer-debian8-webrunner.gz creates: output-debian8-webrunner/packer-debian8-webrunner.gz
ignore_errors: True ignore_errors: True
- shell: gzip output-debian8-vm-bootstrap/packer-debian8-vm-bootstrap
args:
creates: output-debian8-vm-bootstrap/packer-debian8-vm-bootstrap.gz
ignore_errors: True
- shell: gzip output-debian7-vm-bootstrap/packer-debian7-vm-bootstrap
args:
creates: output-debian7-vm-bootstrap/packer-debian7-vm-bootstrap.gz
ignore_errors: True
- shell: gzip output-ubuntu-14-04-server-vm-bootstrap/packer-ubuntu-14-04-server-vm-bootstrap
args:
creates: output-ubuntu-14-04-server-vm-bootstrap/packer-ubuntu-14-04-server-vm-bootstrap.gz
ignore_errors: True
- shell: gzip output-ubuntu-15-04-server-vm-bootstrap/packer-ubuntu-15-04-server-vm-bootstrap
args:
creates: output-ubuntu-15-04-server-vm-bootstrap/packer-ubuntu-15-04-server-vm-bootstrap.gz
ignore_errors: True
- shell: gzip output-centos68-vm-bootstrap/packer-centos68-vm-bootstrap
args:
creates: output-centos68-vm-bootstrap/packer-centos68-vm-bootstrap.gz
ignore_errors: True
- shell: gzip output-centos72-vm-bootstrap/packer-centos72-vm-bootstrap
args:
creates: output-centos72-vm-bootstrap/packer-centos72-vm-bootstrap.gz
ignore_errors: True
#### Gzip is over, start to upload to shacache #### Gzip is over, start to upload to shacache
#### Build SHA512SUM.txt of every file. #### Build SHA512SUM.txt of every file.
...@@ -227,12 +167,12 @@ ...@@ -227,12 +167,12 @@
- shell: sha512sum {{ item }} >> SHA512SUM.txt - shell: sha512sum {{ item }} >> SHA512SUM.txt
with_items: with_items:
- output-debian8/packer-debian8.gz - output-debian8/packer-debian8-100G-image.gz
- output-debian7/packer-debian7.gz - output-debian7/packer-debian7-100G-image.gz
- output-ubuntu-14-04-server/packer-ubuntu-14-04-server.gz - output-ubuntu-14-server-100G-image/packer-ubuntu-14-server-100G-image.gz
- output-ubuntu-15-04-server/packer-ubuntu-15-04-server.gz - output-ubuntu-15-server-100G-image/packer-ubuntu-15-server-100G-image.gz
- output-centos72/packer-centos72.gz - output-centos72/packer-centos7.2-100G-image.gz
- output-centos67/packer-centos67.gz - output-centos67/packer-centos6-100G-image.gz
- output-debian8-testing-version/packer-debian8-testing-version.gz - output-debian8-testing-version/packer-debian8-testing-version.gz
- output-debian7-testing-version/packer-debian7-testing-version.gz - output-debian7-testing-version/packer-debian7-testing-version.gz
- output-ubuntu-15-04-server-testing-version/packer-ubuntu-15-04-server-testing-version.gz - output-ubuntu-15-04-server-testing-version/packer-ubuntu-15-04-server-testing-version.gz
...@@ -242,12 +182,7 @@ ...@@ -242,12 +182,7 @@
- output-debian8-webrunner/packer-debian8-webrunner.gz - output-debian8-webrunner/packer-debian8-webrunner.gz
- output-debian8-erp5-standalone/packer-debian8-erp5-standalone.gz - output-debian8-erp5-standalone/packer-debian8-erp5-standalone.gz
- output-debian8-wendelin/packer-debian8-wendelin.gz - output-debian8-wendelin/packer-debian8-wendelin.gz
- output-debian8-vm-bootstrap/packer-debian8-vm-bootstrap.gz
- output-debian7-vm-bootstrap/packer-debian7-vm-bootstrap.gz
- output-ubuntu-14-04-server-vm-bootstrap/packer-ubuntu-14-04-server-vm-bootstrap.gz
- output-ubuntu-15-04-server-vm-bootstrap/packer-ubuntu-15-04-server-vm-bootstrap.gz
- output-centos68-vm-bootstrap/packer-centos68-vm-bootstrap.gz
- output-centos72-vm-bootstrap/packer-centos72-vm-bootstrap.gz
#### End of build SHA512SUM.txt #### End of build SHA512SUM.txt
packer/centos-6.7.json
View file @ e540d5ec
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"domain": "", "domain": "",
"disk_size": "200", "disk_size": "100",
"name": "image", "name": "image",
"custom_script": "" "custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
......
packer/centos-7.2.json
View file @ e540d5ec
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"domain": "", "domain": "",
"disk_size": "200", "disk_size": "100",
"name": "image", "name": "image",
"custom_script": "" "custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
......
packer/debian7.json
View file @ e540d5ec
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"domain": "", "domain": "",
"disk_size": "200", "disk_size": "100",
"name": "image", "name": "image",
"custom_script": "" "custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
......
packer/debian8.json
View file @ e540d5ec
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"domain": "", "domain": "",
"disk_size": "200", "disk_size": "100",
"name": "image", "name": "image",
"custom_script": "" "custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
......
packer/ubuntu-14.04-server-amd64.json
View file @ e540d5ec
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"domain": "", "domain": "",
"disk_size": "200", "disk_size": "100",
"name": "image", "name": "image",
"custom_script": "" "custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
[ [
{ {
"name": "ubuntu-14-server-amd64-{{ user `disk_size`}}G-{{ user `name`}}", "name": "ubuntu-14-server-{{ user `disk_size`}}G-{{ user `name`}}",
"type": "qemu", "type": "qemu",
"format": "qcow2", "format": "qcow2",
......
packer/ubuntu-15.04-server-amd64.json
View file @ e540d5ec
...@@ -2,13 +2,16 @@ ...@@ -2,13 +2,16 @@
"variables": { "variables": {
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"disk_size": "100" "domain": "",
"disk_size": "100",
"name": "image",
"custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
[ [
{ {
"name": "ubuntu-15-04-server", "name": "ubuntu-15-server-{{ user `disk_size`}}G-{{ user `name`}}",
"type": "qemu", "type": "qemu",
"format": "qcow2", "format": "qcow2",
...@@ -53,7 +56,8 @@ ...@@ -53,7 +56,8 @@
"scripts": [ "scripts": [
"scripts/update-ubuntu.sh", "scripts/update-ubuntu.sh",
"scripts/packages-ubuntu.sh", "scripts/packages-ubuntu.sh",
"scripts/network-ubuntu.sh" "scripts/network-ubuntu.sh",
"{{ user `custom_script` }}"
] ]
} }
] ]
......
packer/ubuntu-16.10-server-amd64.json
View file @ e540d5ec
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
"user": "slapos", "user": "slapos",
"password": "slapos", "password": "slapos",
"domain": "", "domain": "",
"disk_size": "200", "disk_size": "100",
"name": "image", "name": "image",
"custom_script": "" "custom_script": "scripts/empty.sh"
}, },
"builders": "builders":
[ [
{ {
"name": "ubuntu-16-server-amd64-{{ user `disk_size`}}G-{{ user `name`}}", "name": "ubuntu-16-server-{{ user `disk_size`}}G-{{ user `name`}}",
"type": "qemu", "type": "qemu",
"format": "qcow2", "format": "qcow2",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7