Update eole playbook for multi-version support
This commit is contained in:
parent
52107e134e
commit
84fc1b22d0
|
@ -43,17 +43,17 @@
|
||||||
|
|
||||||
- name: Adding EOLE main repository
|
- name: Adding EOLE main repository
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-2.7.2 main cloud
|
repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-{{ EOLE_VERSION }} main cloud
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: Adding EOLE security repository
|
- name: Adding EOLE security repository
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-2.7.2-security main cloud
|
repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-{{ EOLE_VERSION }}-security main cloud
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: Adding EOLE updates repository
|
- name: Adding EOLE updates repository
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-2.7.2-updates main cloud
|
repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-{{ EOLE_VERSION }}-updates main cloud
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: Update cache
|
- name: Update cache
|
||||||
|
@ -65,6 +65,16 @@
|
||||||
http_proxy: "{{ http_proxy }}"
|
http_proxy: "{{ http_proxy }}"
|
||||||
https_proxy: "{{ https_proxy }}"
|
https_proxy: "{{ https_proxy }}"
|
||||||
|
|
||||||
|
- name: Install chromium browser on 2.7.2
|
||||||
|
apt:
|
||||||
|
name: chromium-browser
|
||||||
|
environment:
|
||||||
|
HTTP_PROXY: "{{ http_proxy }}"
|
||||||
|
HTTPS_PROXY: "{{ https_proxy }}"
|
||||||
|
http_proxy: "{{ http_proxy }}"
|
||||||
|
https_proxy: "{{ https_proxy }}"
|
||||||
|
when: EOLE_VERSION == "2.7.2"
|
||||||
|
|
||||||
- name: Install eole-server and eole-exim-pkg
|
- name: Install eole-server and eole-exim-pkg
|
||||||
apt:
|
apt:
|
||||||
name: eole-server,eole-exim-pkg
|
name: eole-server,eole-exim-pkg
|
||||||
|
|
|
@ -64,12 +64,22 @@
|
||||||
{
|
{
|
||||||
"type": "ansible",
|
"type": "ansible",
|
||||||
"playbook_file": "{{user `eole_playbooks`}}/eole.yml",
|
"playbook_file": "{{user `eole_playbooks`}}/eole.yml",
|
||||||
"extra_arguments": [ "-vvvv", "--extra-vars", "VM_NAME={{ user `vm_name` }} HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"]
|
"extra_arguments": [
|
||||||
|
"--extra-vars",
|
||||||
|
"VM_NAME={{ user `vm_name` }} EOLE_VERSION={{ user `eole_version` }}",
|
||||||
|
"--extra-vars",
|
||||||
|
"HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type":"ansible",
|
"type":"ansible",
|
||||||
"playbook_file":"{{ user `eole_playbooks` }}/provision.yml",
|
"playbook_file":"{{ user `eole_playbooks` }}/provision.yml",
|
||||||
"extra_arguments": [ "--extra-vars", "VM_NAME={{ user `vm_name` }} HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"]
|
"extra_arguments": [
|
||||||
|
"--extra-vars",
|
||||||
|
"VM_NAME={{ user `vm_name` }} EOLE_VERSION={{ user `eole_version` }}",
|
||||||
|
"--extra-vars",
|
||||||
|
"HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"post-processors": [
|
"post-processors": [
|
||||||
|
|
Loading…
Reference in New Issue