From a05d635641a9e0409942dcb0da0784c6004f471e Mon Sep 17 00:00:00 2001 From: richard Date: Tue, 6 Jun 2017 09:31:12 -0400 Subject: [PATCH] create bootstrap_vms role to run vagrant file on host, creating managed vms (dkhost03 and dkhost04) --- dkhost.xai-corp.net.yml | 4 +- glusterfs.yml | 5 +- home.xai-corp.net.yml | 43 ++++++----- home02.xai-corp.net.yml | 48 +++++++----- managed_setup.yml | 5 ++ roles/bootstrap_vms/defaults/main.yml | 4 + roles/bootstrap_vms/files/Vagrantfile | 76 +++++++++++++++++++ roles/bootstrap_vms/meta/main.yml | 9 +++ roles/bootstrap_vms/tasks/main.yml | 32 ++++++++ roles/cleanup/defaults/main.yml | 6 ++ roles/cleanup/tasks/main.yml | 18 +++++ roles/glusterfs/tasks/main.yml | 12 +++ roles/kubernetes-vagrant/meta/main.yml | 9 +++ roles/kubernetes-vagrant/tasks/main.yml | 21 ----- .../templates/xai-corp.net.external.j2 | 12 +-- .../templates/xai-corp.net.internal.j2 | 4 +- roles/vagrant/defaults/main.yml | 5 ++ roles/vagrant/tasks/main.yml | 33 ++++++++ 18 files changed, 275 insertions(+), 71 deletions(-) create mode 100644 roles/bootstrap_vms/defaults/main.yml create mode 100644 roles/bootstrap_vms/files/Vagrantfile create mode 100644 roles/bootstrap_vms/meta/main.yml create mode 100644 roles/bootstrap_vms/tasks/main.yml create mode 100644 roles/cleanup/defaults/main.yml create mode 100644 roles/cleanup/tasks/main.yml create mode 100644 roles/kubernetes-vagrant/meta/main.yml create mode 100644 roles/vagrant/defaults/main.yml create mode 100644 roles/vagrant/tasks/main.yml diff --git a/dkhost.xai-corp.net.yml b/dkhost.xai-corp.net.yml index 3bf790a..47bc197 100644 --- a/dkhost.xai-corp.net.yml +++ b/dkhost.xai-corp.net.yml @@ -2,7 +2,7 @@ # playbook for home02 -- hosts: dkhost02 +- hosts: dkhost remote_user: ansible gather_facts: yes become: true @@ -62,7 +62,7 @@ # - Datadog.datadog - dockerhost - geerlingguy.nginx -# - certbot + - certbot # - docker_registry # - docker_graylog diff --git a/glusterfs.yml b/glusterfs.yml index b638151..cf9800d 100644 --- a/glusterfs.yml +++ b/glusterfs.yml @@ -10,11 +10,12 @@ vars: cluster: - cubox-i.xai-corp.net -# - home + - home mountpoints: - /data/glusterfs/vmshares/brick1 - /data/glusterfs/gitea/brick1 - /data/glusterfs/jenkins/brick1 + - /data/glusterfs/tmp/brick1 volumes: vmshares: - /data/glusterfs/vmshares/brick1/brick @@ -22,6 +23,8 @@ - /data/glusterfs/gitea/brick1/brick jenkins: - /data/glusterfs/jenkins/brick1/brick +# tmp: +# - /data/glusterfs/tmp/brick1/brick roles: - glusterfs diff --git a/home.xai-corp.net.yml b/home.xai-corp.net.yml index 1ce1895..d7c8c66 100644 --- a/home.xai-corp.net.yml +++ b/home.xai-corp.net.yml @@ -7,28 +7,35 @@ become: true vars: - datadog_api_key: ca0faf176c4aedd4f547ed7cf85615eb - datadog_checks: - system: - init_config: [] - instances: [] - disk: - init_config: - instances: - - use_mount: yes - excluded_filesystems: - - sysfs - - cgroup - - tracefs - - debugfs - - proc - - securityfs - excluded_mountpoint_re: /[media/richard|run/user].* + cleanup: + packages: + - git + cron: + - { name: "zoneedit", file: "zoneedit" } +# datadog_api_key: ca0faf176c4aedd4f547ed7cf85615eb +# datadog_checks: +# system: +# init_config: [] +# instances: [] +# disk: +# init_config: +# instances: +# - use_mount: yes +# excluded_filesystems: +# - sysfs +# - cgroup +# - tracefs +# - debugfs +# - proc +# - securityfs +# excluded_mountpoint_re: /[media/richard|run/user].* roles: # - Datadog.datadog # - dockerhost - - dynamic-ip +# - dynamic-ip + - bootstrap_vms + - cleanup post_tasks: diff --git a/home02.xai-corp.net.yml b/home02.xai-corp.net.yml index 64ee8eb..027480a 100644 --- a/home02.xai-corp.net.yml +++ b/home02.xai-corp.net.yml @@ -2,35 +2,41 @@ # playbook for home02 -- hosts: home2 +- hosts: home02 remote_user: ansible gather_facts: yes become: true vars: - datadog_api_key: ca0faf176c4aedd4f547ed7cf85615eb - datadog_checks: - system: - init_config: [] - instances: [] - disk: - init_config: - instances: - - use_mount: yes - excluded_filesystems: - - sysfs - - cgroup - - tracefs - - debugfs - - proc - - securityfs - excluded_mountpoint_re: /[media/richard|run/user].* + cleanup: + packages: + - git + cron: [] +# datadog_api_key: ca0faf176c4aedd4f547ed7cf85615eb +# datadog_checks: +# system: +# init_config: [] +# instances: [] +# disk: +# init_config: +# instances: +# - use_mount: yes +# excluded_filesystems: +# - sysfs +# - cgroup +# - tracefs +# - debugfs +# - proc +# - securityfs +# excluded_mountpoint_re: /[media/richard|run/user].* roles: - - Datadog.datadog - - ns.xai-corp.net - - td-agent-bit +# - Datadog.datadog +# - ns.xai-corp.net +# - td-agent-bit + - dynamic-ip + - cleanup post_tasks: # - name: check service is up diff --git a/managed_setup.yml b/managed_setup.yml index e8a4b76..f6ce74f 100644 --- a/managed_setup.yml +++ b/managed_setup.yml @@ -43,6 +43,11 @@ - name: Creates .ssh directory file: path=~/.ssh state=directory mode=600 + - name: remove ubuntu user if it exists + command: userdel -rf ubuntu + args: + removes: /home/ubuntu/.bashrc + - debug: var=ansible_os_family roles: diff --git a/roles/bootstrap_vms/defaults/main.yml b/roles/bootstrap_vms/defaults/main.yml new file mode 100644 index 0000000..b5a74ad --- /dev/null +++ b/roles/bootstrap_vms/defaults/main.yml @@ -0,0 +1,4 @@ +--- +#default variables for boostrap_vms + +vagrant_folder: "/opt/home.xai-corp.net/vm_config" diff --git a/roles/bootstrap_vms/files/Vagrantfile b/roles/bootstrap_vms/files/Vagrantfile new file mode 100644 index 0000000..1cd9cb4 --- /dev/null +++ b/roles/bootstrap_vms/files/Vagrantfile @@ -0,0 +1,76 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +BASE_BOX = "ubuntu/xenial64" +BRIDGE_NET = "enp3s0" + +$script = <