From 76f02d966dd8da500cde6483a54e421c990ad308 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sun, 6 Sep 2015 14:51:36 +0200 Subject: [PATCH] Updated vagrant provisioning for box 1.1.0. Little corrections to tasks for network configuration on setup playbook. --- roles/nethcfg/defaults/main.yml | 3 ++ roles/nethcfg/tasks/main.yml | 1 - roles/nethcfg/tasks/reconfig_nic.yml | 4 +- .../tasks/developuser.yml} | 29 ++++---------- vagrant/roles/developuser/tasks/main.yml | 3 ++ vagrant/roles/rename-nic/defaults/main.yml | 3 ++ vagrant/roles/rename-nic/meta/main.yml | 4 ++ vagrant/roles/rename-nic/tasks/main.yml | 3 ++ vagrant/roles/rename-nic/tasks/rename-nic.yml | 40 +++++++++++++++++++ vagrant/roles/selinux/tasks/main.yml | 7 ++++ vagrant/roles/vagrant/handlers/main.yml | 4 -- vagrant/vagrant.yml | 4 +- 12 files changed, 74 insertions(+), 31 deletions(-) create mode 100644 roles/nethcfg/defaults/main.yml rename vagrant/roles/{vagrant/tasks/main.yml => developuser/tasks/developuser.yml} (60%) create mode 100644 vagrant/roles/developuser/tasks/main.yml create mode 100644 vagrant/roles/rename-nic/defaults/main.yml create mode 100644 vagrant/roles/rename-nic/meta/main.yml create mode 100644 vagrant/roles/rename-nic/tasks/main.yml create mode 100644 vagrant/roles/rename-nic/tasks/rename-nic.yml create mode 100644 vagrant/roles/selinux/tasks/main.yml delete mode 100644 vagrant/roles/vagrant/handlers/main.yml diff --git a/roles/nethcfg/defaults/main.yml b/roles/nethcfg/defaults/main.yml new file mode 100644 index 0000000..0e8c0a1 --- /dev/null +++ b/roles/nethcfg/defaults/main.yml @@ -0,0 +1,3 @@ +--- +extnic: wan0 +intnic: lan0 diff --git a/roles/nethcfg/tasks/main.yml b/roles/nethcfg/tasks/main.yml index 1e0711f..29eed4b 100644 --- a/roles/nethcfg/tasks/main.yml +++ b/roles/nethcfg/tasks/main.yml @@ -7,7 +7,6 @@ - nethpkg - include: reconfig_nic.yml - when: ansible_product_name == "VirtualBox" tags: - nethnic diff --git a/roles/nethcfg/tasks/reconfig_nic.yml b/roles/nethcfg/tasks/reconfig_nic.yml index 089350f..68be253 100644 --- a/roles/nethcfg/tasks/reconfig_nic.yml +++ b/roles/nethcfg/tasks/reconfig_nic.yml @@ -1,9 +1,9 @@ - name: Configurazione scheda di rete esterna - shell: /sbin/e-smith/db networks setprop eth0 role red bootproto dhcp + shell: /sbin/e-smith/db networks setprop {{ extnic }} role red bootproto dhcp sudo: yes - name: Configurazione scheda di rete interna - shell: /sbin/e-smith/db networks setprop eth1 role green ipaddr {{ ansible_local.domain.serverip }} netmask {{ ansible_local.domain.servernetmask }} + shell: /sbin/e-smith/db networks setprop {{ intnic }} role green ipaddr {{ ansible_local.domain.serverip }} netmask {{ ansible_local.domain.servernetmask }} sudo: yes - name: Attivo configurazioni di rete diff --git a/vagrant/roles/vagrant/tasks/main.yml b/vagrant/roles/developuser/tasks/developuser.yml similarity index 60% rename from vagrant/roles/vagrant/tasks/main.yml rename to vagrant/roles/developuser/tasks/developuser.yml index 4546588..9974d07 100644 --- a/vagrant/roles/vagrant/tasks/main.yml +++ b/vagrant/roles/developuser/tasks/developuser.yml @@ -1,18 +1,13 @@ --- -# Provisioning per vagrant. -- name: Verifico versione server - NethServer - shell: /sbin/e-smith/db configuration getprop sysconfig ProductName - register: chk_nethserver - ignore_errors: yes +- name: Preparazione pacchetti per compilazione RPM + yum: pkg="{{ item }}" state=present + with_items: + - '@Development tools' + - rpmdevtools + - yum-utils + - rpmlint sudo: yes -- name: Configuro la scheda secondaria - shell: /sbin/e-smith/db networks setprop eth1 bootproto none device eth1 ipaddr 192.168.1.1 netmask 255.255.255.0 onboot yes role green - when: "'NethServer' in chk_nethserver.stdout" - sudo: yes - notify: - - interface update - - name: Aggiungo utente per compilazione pacchetti RPM user: name: makepkg @@ -21,16 +16,6 @@ state: present sudo: yes -- name: Preparazione pacchetti per compilazione RPM - yum: pkg="{{ item }}" state=present - with_items: - - '@Development tools' - - libselinux-python - - rpmdevtools - - yum-utils - - rpmlint - sudo: yes - - name: Copia della chiave pubblica authorized_key: user: makepkg diff --git a/vagrant/roles/developuser/tasks/main.yml b/vagrant/roles/developuser/tasks/main.yml new file mode 100644 index 0000000..6e96ba0 --- /dev/null +++ b/vagrant/roles/developuser/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- include: developuser.yml + tags: developuser diff --git a/vagrant/roles/rename-nic/defaults/main.yml b/vagrant/roles/rename-nic/defaults/main.yml new file mode 100644 index 0000000..0e8c0a1 --- /dev/null +++ b/vagrant/roles/rename-nic/defaults/main.yml @@ -0,0 +1,3 @@ +--- +extnic: wan0 +intnic: lan0 diff --git a/vagrant/roles/rename-nic/meta/main.yml b/vagrant/roles/rename-nic/meta/main.yml new file mode 100644 index 0000000..8bb7770 --- /dev/null +++ b/vagrant/roles/rename-nic/meta/main.yml @@ -0,0 +1,4 @@ +--- +dependencies: + - role: selinux + tags: selinux diff --git a/vagrant/roles/rename-nic/tasks/main.yml b/vagrant/roles/rename-nic/tasks/main.yml new file mode 100644 index 0000000..c66bb08 --- /dev/null +++ b/vagrant/roles/rename-nic/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- include: rename-nic.yml + tags: rename-nic diff --git a/vagrant/roles/rename-nic/tasks/rename-nic.yml b/vagrant/roles/rename-nic/tasks/rename-nic.yml new file mode 100644 index 0000000..3512178 --- /dev/null +++ b/vagrant/roles/rename-nic/tasks/rename-nic.yml @@ -0,0 +1,40 @@ +--- +# Cambio nome interfacce +- name: Rinomino interfaccia esterna + replace: + dest: /etc/udev/rules.d/70-persistent-net.rules + regexp: 'eth0' + replace: '{{ extnic }}' + sudo: yes + +- name: Creo interfaccia esterna in NethServer + shell: /sbin/e-smith/db networks set {{ extnic }} ethernet bootproto dhcp device {{ extnic }} hwaddr {{ ansible_eth0.macaddress }} onboot yes role red + sudo: yes + +- name: Pulizia vecchia interfaccia esterna + shell: /sbin/e-smith/db networks delete eth0 + sudo: yes + +- name: Rinomino interfaccia interna + replace: + dest: /etc/udev/rules.d/70-persistent-net.rules + regexp: 'eth1' + replace: '{{ intnic }}' + sudo: yes + +- name: Creo interfaccia interna in NethServer + shell: /sbin/e-smith/db networks set {{ intnic }} ethernet bootproto none device {{ intnic }} hwaddr {{ ansible_eth1.macaddress }} ipaddr 192.168.1.1 netmask 255.255.255.0 onboot yes role green + sudo: yes + +- name: Pulizia vecchia interfaccia interna + shell: /sbin/e-smith/db networks delete eth1 + sudo: yes + +# Forzo il processo a tornare zero, altrimenti non va. +- name: Ricreo le interfacce + shell: udevadm control --reload-rules && udevadm trigger --attr-match=subsystem=net + sudo: yes + +- name: Segnalo il cambiamento a livello di interfacce + shell: /sbin/e-smith/signal-event interface-update + sudo: yes diff --git a/vagrant/roles/selinux/tasks/main.yml b/vagrant/roles/selinux/tasks/main.yml new file mode 100644 index 0000000..e03940d --- /dev/null +++ b/vagrant/roles/selinux/tasks/main.yml @@ -0,0 +1,7 @@ +--- +# Installing selinux bindings as first step +- name: Installo bindings selinux per Python + yum: + name: libselinux-python + state: present + sudo: yes diff --git a/vagrant/roles/vagrant/handlers/main.yml b/vagrant/roles/vagrant/handlers/main.yml deleted file mode 100644 index a572891..0000000 --- a/vagrant/roles/vagrant/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: interface update - shell: /sbin/e-smith/signal-event interface-update - sudo: yes diff --git a/vagrant/vagrant.yml b/vagrant/vagrant.yml index ce3cc43..fac843f 100644 --- a/vagrant/vagrant.yml +++ b/vagrant/vagrant.yml @@ -2,5 +2,5 @@ # Vagrant provisioning playbook - hosts: vagrant roles: - - vagrant - sudo: yes + - rename-nic + - developuser