From 047e8a7a3500cae0fb755d24687b6ed52b278d8a Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Tue, 20 Mar 2018 07:20:48 -0400 Subject: [PATCH] Fixed hosts file. Added secondary dns. Gave docker group permissions to compose. Added variables to hosts file. --- .requirements.txt.swp | Bin 12288 -> 0 bytes hosts | 24 ++++++++-------- playbooks/kvm.yml | 26 +++++++++++++----- roles/common/tasks/main.yml | 11 ++++++++ .../configure-interfaces/templates/eth.cfg.j2 | 2 +- 5 files changed, 43 insertions(+), 20 deletions(-) delete mode 100644 .requirements.txt.swp diff --git a/.requirements.txt.swp b/.requirements.txt.swp deleted file mode 100644 index 9a63776c87e67309ce691dd9fc558ef65a26fe5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&u}Z^09LMp0-AhGZpz7Rfk{0X|oE>!2!7VXYT4;JPxt6#nzJjZ7;=}j~K7rsJ zBy+lkeh=`f=CtxlHf7V)EvL z(^40vnyyT)H%U54w$(b_Xg7V?txKKjt*w-;ZRf)XAb`N(0z12$EQT_R!oVN8y1W>l zpFJFYo+JVYAbIfi!00IagfB*srAb diff --git a/hosts b/hosts index fc130ef..f4c3163 100644 --- a/hosts +++ b/hosts @@ -1,15 +1,15 @@ [standard] -#wiki.wimer.local -#swarm-manager-01.wimer.local -#swarm-manager-02.wimer.local -#swarm-manager-03.wimer.local -#registry.wimer.local -#wrestlingdev-test.wimer.local -#elk.wimer.local -#guacamole.wimer.local -#fileserver.wimer.local -#test2 ansible_host=10.0.0.152 -ns ansible_host=10.0.0.204 +wiki ansible_host=10.0.0.222 hypervisor=rack1 memory=2048 cpus=2 +swarm-manager-01 ansible_host=10.0.0.206 hypervisor=rack1 memory=2048 cpus=2 +swarm-manager-02 ansible_host=10.0.0.225 hypervisor=rack2 memory=2048 cpus=2 +swarm-manager-03 ansible_host=10.0.0.220 hypervisor=rack2 memory=2048 cpus=2 +registry ansible_host=10.0.0.221 hypervisor=rack1 memory=2048 cpus=2 +wrestlingdev-test ansible_host=10.0.0.240 hypervisor=rack1 memory=2048 cpus=2 +elk ansible_host=10.0.0.224 hypervisor=rack2 memory=4096 cpus=2 +guacamole ansible_host=10.0.0.202 hypervisor=rack2 memory=2048 cpus=2 +fileserver ansible_host=10.0.0.201 hypervisor=rack2 memory=4096 cpus=2 +ns ansible_host=10.0.0.204 hypervisor=rack1 memory=1024 cpus=2 +vpn ansible_host=10.0.0.203 hypervisor=rack1 memory=1024 cpus=2 [developer-machines] -codydev ansible_host=10.0.0.207 +codydev ansible_host=10.0.0.207 hypervisor=rack2 memory=2048 cpus=2 diff --git a/playbooks/kvm.yml b/playbooks/kvm.yml index 8edfd32..2aa96cd 100644 --- a/playbooks/kvm.yml +++ b/playbooks/kvm.yml @@ -12,18 +12,30 @@ api_user: "{{ proxmox_user }}" api_password: "{{ proxmox_password }}" api_host: "{{ proxmox_host }}" - clone : "{{ ubuntu_template_vm_name }}" - name : '{{ inventory_hostname }}' - node : 'rack2' - storage : 'SSD1' - format : 'qcow2' - timeout : 3000 + clone: "{{ ubuntu_template_vm_name }}" + name: '{{ inventory_hostname }}' + node: '{{ hypervisor }}' + storage: 'SSD1' + format: 'qcow2' + timeout: 3000 register: cloned - name: Wait 10 seconds for proxmox to register the new node wait_for: timeout=10 delegate_to: localhost + - name: Set resources + delegate_to: localhost + proxmox_kvm: + api_user: "{{ proxmox_user }}" + api_password: "{{ proxmox_password }}" + api_host: "{{ proxmox_host }}" + name: '{{ inventory_hostname }}' + node: '{{ hypervisor }}' + cores: '{{ cpus }}' + memory: '{{ memory }}' + when: cloned.changed + - name: Start VM delegate_to: localhost proxmox_kvm: @@ -31,7 +43,7 @@ api_password: "{{ proxmox_password }}" api_host: "{{ proxmox_host }}" name: '{{ inventory_hostname }}' - node: rack2 + node: '{{ hypervisor }}' state: started when: cloned.changed diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 3e277d0..63fc2e8 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -68,6 +68,7 @@ url: "https://github.com/docker/compose/releases/download/{{docker_compose_version_to_install}}/docker-compose-{{ ansible_system }}-{{ ansible_userspace_architecture }}" dest: /usr/local/bin/docker-compose mode: 755 + group: docker - name: Set timezone to NewYork timezone: @@ -171,3 +172,13 @@ regexp="^vm.vfs_cache_pressure" state=present line="vm.vfs_cache_pressure = 50" + +- name: Set hostname + hostname: + name: '{{ inventory_hostname }}' + +- name: Fix hosts file + lineinfile: dest=/etc/hosts + regexp="ubuntu" + state=present + line="{{ inventory_hostname }}" diff --git a/roles/configure-interfaces/templates/eth.cfg.j2 b/roles/configure-interfaces/templates/eth.cfg.j2 index d94f27a..7fb4edc 100644 --- a/roles/configure-interfaces/templates/eth.cfg.j2 +++ b/roles/configure-interfaces/templates/eth.cfg.j2 @@ -4,4 +4,4 @@ iface {{ interface_name }} inet static address {{ ansible_host }} netmask 255.255.255.0 gateway 10.0.0.1 -dns-nameservers 10.0.0.204 +dns-nameservers 10.0.0.204 8.8.8.8