Reordered the tags defined within each role for the macro-role client-install. Splitted kickstart configuration from ansible-pull one. Reordered directories.

This commit is contained in:
Emiliano Vavassori 2015-07-22 01:01:41 +02:00
parent 022b3325ec
commit 9cfb29bec4
13 changed files with 35 additions and 30 deletions

View File

@ -12,7 +12,7 @@ repositories.
### Quick start ### ### Quick start ###
You may proceed in using the files in this repo proceeding as follows: You may use this repo proceeding as follows:
$ vim hosts $ vim hosts
$ vim domain.yml $ vim domain.yml
@ -43,7 +43,6 @@ a *bridged* one.
### To Do List ### ### To Do List ###
* Splitting and finalize pxe roles (pxe + kickstart)
* Implement backup * Implement backup
* Detail physical installation procedure for the server machine within the * Detail physical installation procedure for the server machine within the
Wiki. Wiki.

View File

@ -0,0 +1,16 @@
---
- name: Creazione directory per ansible-pull
file: path=/var/lib/nethserver/ibay/ks/ansible-pull state=directory
sudo: yes
- name: Template
template: src={{ item }} dest=/var/lib/nethserver/ibay/ks/ansible-pull/{{ item }}
with_items:
- run.sh
- getvaultpass.py
- crontab
sudo: yes
- name: Logrotate
copy: src=logrotate dest=/var/lib/nethserver/ibay/ks/ansible-pull/logrotate
sudo: yes

View File

@ -0,0 +1,4 @@
---
- include: ansible-pull.yml
tags: ansible-pull

View File

@ -1,7 +1,8 @@
--- ---
dependencies: dependencies:
- { role: pxe, tags: [ 'client-install', 'pxe' ] } - { role: pxe, tags: [ 'client-install' ] }
- { role: kickstart, tags: [ 'client-install', 'kickstart', 'ks' ] } - { role: kickstart, tags: [ 'client-install' ] }
- { role: ubuntu-mirror, tags: [ 'client-install', 'ubuntu-mirror' ] } - { role: ansible-pull, tags: [ 'client-install' ] }
- { role: doraemon, tags: [ 'client-install', 'doraemon' ] } - { role: ubuntu-mirror, tags: [ 'client-install' ] }
- { role: git-daemon, tags: [ 'client-install', 'git-daemon' ] } - { role: doraemon, tags: [ 'client-install' ] }
- { role: git-daemon, tags: [ 'client-install' ] }

View File

@ -1,5 +1,3 @@
--- ---
- include: doraemon.yml - include: doraemon.yml
tags: tags: doraemon
- "client-install"
- doraemon

View File

@ -1,5 +1,3 @@
--- ---
- include: git-daemon.yml - include: git-daemon.yml
tags: tags: git-daemon
- client-install
- git-daemon

View File

@ -49,15 +49,5 @@
- ubuntu-trusty.cfg - ubuntu-trusty.cfg
- name: Copia configurazioni kickstart - name: Copia configurazioni kickstart
template: src=post-ks/{{ item }} dest=/var/lib/nethserver/ibay/ks/{{ item }} template: src=post-ks.sh dest=/var/lib/nethserver/ibay/ks/{{ item }}
sudo: yes sudo: yes
with_items:
- post-ks.sh
- getvaultpass.py
- ansible-pull.sh
- ansible-pull-crontab
- name: Copio logrotate per configurazione pull
copy: src=ansible-pull-logrotate dest=/var/lib/nethserver/ibay/ks/ansible-pull-logrotate
sudo: yes

View File

@ -16,20 +16,20 @@ install -d -o root -g root /var/lib/{{ ansible_local.domain.domainfull }}/config
install -d -o root -g root /var/lib/{{ ansible_local.domain.domainfull }}/bin install -d -o root -g root /var/lib/{{ ansible_local.domain.domainfull }}/bin
# Installo lo script per la decrittazione della password del vault # Installo lo script per la decrittazione della password del vault
wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/getvaultpass.py -O /tmp/getvaultpass.py wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/getvaultpass.py -O /tmp/getvaultpass.py
install -m744 -o root -g root /tmp/getvaultpass.py /var/lib/{{ ansible_local.domain.domainfull}}/bin/getvaultpass.py install -m744 -o root -g root /tmp/getvaultpass.py /var/lib/{{ ansible_local.domain.domainfull}}/bin/getvaultpass.py
rm -f /tmp/getvaultpass.py rm -f /tmp/getvaultpass.py
# Installo lo script per l'avvio di ansible-pull da root # Installo lo script per l'avvio di ansible-pull da root
wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull.sh -O /tmp/ansible-pull.sh wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/run.sh -O /tmp/ansible-pull.sh
install -m744 -o root -g root /tmp/ansible-pull.sh /var/lib/{{ ansible_local.domain.domainfull }}/bin/ansible-pull.sh install -m744 -o root -g root /tmp/ansible-pull.sh /var/lib/{{ ansible_local.domain.domainfull }}/bin/ansible-pull.sh
rm -f /tmp/ansible-pull.sh rm -f /tmp/ansible-pull.sh
# Installo il cronjob # Installo il cronjob
wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull-crontab -O /tmp/ansible-pull-crontab wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/crontab -O /tmp/ansible-pull-crontab
install -m644 -o root -g root /tmp/ansible-pull-crontab /etc/cron.d/ansible-pull install -m644 -o root -g root /tmp/ansible-pull-crontab /etc/cron.d/ansible-pull
rm -f /tmp/ansible-pull-crontab rm -f /tmp/ansible-pull-crontab
# Installo il logrotate # Installo il logrotate
wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull-logrotate -O /tmp/ansible-pull-logrotate wget -q http://{{ ansible_local.domain.serverfqdn }}/ks/ansible-pull/logrotate -O /tmp/ansible-pull-logrotate
install -m644 -o root -g root /tmp/ansible-pull-logrotate /etc/logrotate.d/ansible install -m644 -o root -g root /tmp/ansible-pull-logrotate /etc/logrotate.d/ansible
rm -f /tmp/ansible-pull-logrotate rm -f /tmp/ansible-pull-logrotate

View File

@ -1,4 +1,3 @@
--- ---
- include: pxe.yml - include: pxe.yml
tags: tags: pxe
- "client-install"