From 791374c41226bac35dee128b51bb3cb8ec404302 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 22 Jun 2015 21:48:41 +0200 Subject: [PATCH] Aggiunta di task per la condivisione delle informazioni di dominio. Allineato un solo file. Allineati task. Sistemato vagrant, aggiunto la risorsa mac2hostname. --- Vagrantfile | 5 +++-- domain.yml | 11 ++++++----- roles/init/tasks/domainspec.yml | 5 +++++ roles/init/tasks/main.yml | 2 ++ roles/nethcfg/tasks/main.yml | 4 ++-- roles/setup/tasks/ansible.yml | 14 ++++++++++++++ roles/setup/tasks/main.yml | 1 + vagrant/roles/vagrant/tasks/main.yml | 1 + 8 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 roles/init/tasks/domainspec.yml diff --git a/Vagrantfile b/Vagrantfile index 32f4bd7..5542eeb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -27,6 +27,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # accessing "localhost:8080" will access port 80 on the guest machine. # config.vm.network "forwarded_port", guest: 80, host: 8080 config.vm.network "forwarded_port", guest: 980, host: 9800 + config.vm.network "forwarded_port", guest: 3000, host: 3000 # Create a private network, which allows host-only access to the machine # using a specific IP. @@ -55,9 +56,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # config.vm.provider "virtualbox" do |vb| # # Don't boot with headless mode # vb.gui = true - # + # # # Use VBoxManage to customize the VM. For example to change memory: - # vb.customize ["modifyvm", :id, "--memory", "1024"] + # #vb.customize ["modifyvm", :id, "--memory", "1024"] # end # # View the documentation for the provider you're using for more diff --git a/domain.yml b/domain.yml index e253a4f..32313b7 100644 --- a/domain.yml +++ b/domain.yml @@ -1,13 +1,14 @@ --- -# Configurazione dominio LAB1 -servershort: pdc -serverfqdn: pdc.mastri.local -domainlong: mastri.local -domainshort: MASTRI +# Configurazione dominio +ntpserver: pdc.mastri.local +server: pdc serverip: 192.168.1.1 servernetmask: 255.255.255.0 servernet: 192.168.1.0 servergw: 192.168.1.1 +serverfqdn: pdc.mastri.local +domainshort: MASTRI +domainfull: mastri.local dhcprange_start: 192.168.1.10 dhcprange_end: 192.168.1.50 extdnsserver1: 208.67.222.222 diff --git a/roles/init/tasks/domainspec.yml b/roles/init/tasks/domainspec.yml new file mode 100644 index 0000000..b6ee123 --- /dev/null +++ b/roles/init/tasks/domainspec.yml @@ -0,0 +1,5 @@ +--- +# Copia le configurazioni per il dominio in locale sul server. +- name: Copia le configurazioni di dominio. + copy: src=../../../domain.yml dest=/etc/domain.yml + sudo: yes diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml index 32bdeae..9bd7d8a 100644 --- a/roles/init/tasks/main.yml +++ b/roles/init/tasks/main.yml @@ -4,3 +4,5 @@ when: ansible_os_family == "RedHat" - include: mgmtuser.yml + +- include: domainspec.yml diff --git a/roles/nethcfg/tasks/main.yml b/roles/nethcfg/tasks/main.yml index f4c7ef5..deb167b 100644 --- a/roles/nethcfg/tasks/main.yml +++ b/roles/nethcfg/tasks/main.yml @@ -25,11 +25,11 @@ sudo: yes - name: Configurazione nome server - shell: /sbin/e-smith/db configuration set SystemName {{ servershort }} + shell: /sbin/e-smith/db configuration set SystemName {{ domainsrvshort }} sudo: yes - name: Configurazione nome dominio - shell: /sbin/e-smith/db configuration set DomainName {{ domainlong }} + shell: /sbin/e-smith/db configuration set DomainName {{ domainfull }} sudo: yes - name: Attivazione cambiamenti hostname diff --git a/roles/setup/tasks/ansible.yml b/roles/setup/tasks/ansible.yml index 71d4311..84e94eb 100644 --- a/roles/setup/tasks/ansible.yml +++ b/roles/setup/tasks/ansible.yml @@ -4,6 +4,14 @@ yum: name=git state=present tags: git +- name: Verifica installazione ansible + yum: name=ansible state=present + tags: ansible + +- name: Installazione python-argparse + yum: name=python-argparse state=present + tags: ansible + - name: Download della gestione client con ansible git: repo: "https://github.com/bglug-it/ps-clientmgmt.git" @@ -11,3 +19,9 @@ tags: - git - ansible + +- name: Attivo sotto modulo ansdyninv + shell: cd /home/amgmt/clientmgmt/ansdyninv; git submodule init && git submodule update + tags: + - git + - ansible diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml index d714e73..9d9f46f 100644 --- a/roles/setup/tasks/main.yml +++ b/roles/setup/tasks/main.yml @@ -9,6 +9,7 @@ - include: ansible.yml when: ansible_distribution == "CentOS" + sudo: yes tags: - git - ansible diff --git a/vagrant/roles/vagrant/tasks/main.yml b/vagrant/roles/vagrant/tasks/main.yml index 93d416d..4546588 100644 --- a/vagrant/roles/vagrant/tasks/main.yml +++ b/vagrant/roles/vagrant/tasks/main.yml @@ -25,6 +25,7 @@ yum: pkg="{{ item }}" state=present with_items: - '@Development tools' + - libselinux-python - rpmdevtools - yum-utils - rpmlint