diff --git a/ansible.cfg b/ansible-2.0/ansible.cfg similarity index 100% rename from ansible.cfg rename to ansible-2.0/ansible.cfg diff --git a/cli/.bash_cli b/ansible-2.0/cli/.bash_cli similarity index 100% rename from cli/.bash_cli rename to ansible-2.0/cli/.bash_cli diff --git a/cli/ansible b/ansible-2.0/cli/ansible similarity index 59% rename from cli/ansible rename to ansible-2.0/cli/ansible index 2f84f3f..341de40 100755 --- a/cli/ansible +++ b/ansible-2.0/cli/ansible @@ -1,10 +1,12 @@ #!/usr/bin/env bash echo -e "\033[36mStarting\033[39m: Ansible" +ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.7} + # shellcheck disable=SC2068 docker run --rm -i\ -v ~/.ssh:/home/user/.ssh \ -u 1000 \ -v ${PWD}:/opt/project \ -w /opt/project \ - dkregistry.xai-corp.net:5000/xaicorp/ansible:2.7 -i inventory.conf -u ansible $@ + dkregistry.xai-corp.net:5000/xaicorp/ansible:${ANSIBLE_VERSION} -i inventory.conf -u ansible $@ diff --git a/cli/ansible-dev b/ansible-2.0/cli/ansible-dev similarity index 100% rename from cli/ansible-dev rename to ansible-2.0/cli/ansible-dev diff --git a/cli/ansible-dev.help b/ansible-2.0/cli/ansible-dev.help similarity index 100% rename from cli/ansible-dev.help rename to ansible-2.0/cli/ansible-dev.help diff --git a/cli/ansible-dev.usage b/ansible-2.0/cli/ansible-dev.usage similarity index 100% rename from cli/ansible-dev.usage rename to ansible-2.0/cli/ansible-dev.usage diff --git a/cli/ansible.help b/ansible-2.0/cli/ansible.help similarity index 100% rename from cli/ansible.help rename to ansible-2.0/cli/ansible.help diff --git a/cli/ansible.usage b/ansible-2.0/cli/ansible.usage similarity index 100% rename from cli/ansible.usage rename to ansible-2.0/cli/ansible.usage diff --git a/cubox-i.xai-corp.net.yml b/ansible-2.0/cubox-i.xai-corp.net.yml similarity index 100% rename from cubox-i.xai-corp.net.yml rename to ansible-2.0/cubox-i.xai-corp.net.yml diff --git a/dkhost.xai-corp.net.yml b/ansible-2.0/dkhost.xai-corp.net.yml similarity index 100% rename from dkhost.xai-corp.net.yml rename to ansible-2.0/dkhost.xai-corp.net.yml diff --git a/dkswarm.xai-corp.net.yml b/ansible-2.0/dkswarm.xai-corp.net.yml similarity index 100% rename from dkswarm.xai-corp.net.yml rename to ansible-2.0/dkswarm.xai-corp.net.yml diff --git a/glusterfs.yml b/ansible-2.0/glusterfs.yml similarity index 100% rename from glusterfs.yml rename to ansible-2.0/glusterfs.yml diff --git a/home.xai-corp.net.yml b/ansible-2.0/home.xai-corp.net.yml similarity index 100% rename from home.xai-corp.net.yml rename to ansible-2.0/home.xai-corp.net.yml diff --git a/home02.xai-corp.net.yml b/ansible-2.0/home02.xai-corp.net.yml similarity index 100% rename from home02.xai-corp.net.yml rename to ansible-2.0/home02.xai-corp.net.yml diff --git a/inventory.conf b/ansible-2.0/inventory.conf similarity index 97% rename from inventory.conf rename to ansible-2.0/inventory.conf index 734ff1e..9193c21 100644 --- a/inventory.conf +++ b/ansible-2.0/inventory.conf @@ -27,3 +27,6 @@ cubox-i ansible_ssh_host=192.168.4.12 home ansible_ssh_host=192.168.4.11 cubox-i ansible_ssh_host=192.168.4.12 +[desktop] +richard-desktop + diff --git a/logs.xai-corp.net.yml b/ansible-2.0/logs.xai-corp.net.yml similarity index 100% rename from logs.xai-corp.net.yml rename to ansible-2.0/logs.xai-corp.net.yml diff --git a/managed_clean.yml b/ansible-2.0/managed_clean.yml similarity index 100% rename from managed_clean.yml rename to ansible-2.0/managed_clean.yml diff --git a/managed_setup.yml b/ansible-2.0/managed_setup.yml similarity index 100% rename from managed_setup.yml rename to ansible-2.0/managed_setup.yml diff --git a/managed_updates.yml b/ansible-2.0/managed_updates.yml similarity index 100% rename from managed_updates.yml rename to ansible-2.0/managed_updates.yml diff --git a/ns.xai-corp.net.yml b/ansible-2.0/ns.xai-corp.net.yml similarity index 100% rename from ns.xai-corp.net.yml rename to ansible-2.0/ns.xai-corp.net.yml diff --git a/requirements.yml b/ansible-2.0/requirements.yml similarity index 100% rename from requirements.yml rename to ansible-2.0/requirements.yml diff --git a/roles/_install_updates/tasks/main.yml b/ansible-2.0/roles/_install_updates/tasks/main.yml similarity index 100% rename from roles/_install_updates/tasks/main.yml rename to ansible-2.0/roles/_install_updates/tasks/main.yml diff --git a/roles/_install_updates/tasks/rebootAndWait.yml b/ansible-2.0/roles/_install_updates/tasks/rebootAndWait.yml similarity index 100% rename from roles/_install_updates/tasks/rebootAndWait.yml rename to ansible-2.0/roles/_install_updates/tasks/rebootAndWait.yml diff --git a/roles/_ping/tasks/main.yml b/ansible-2.0/roles/_ping/tasks/main.yml similarity index 100% rename from roles/_ping/tasks/main.yml rename to ansible-2.0/roles/_ping/tasks/main.yml diff --git a/roles/_template/defaults/main.yml b/ansible-2.0/roles/_template/defaults/main.yml similarity index 100% rename from roles/_template/defaults/main.yml rename to ansible-2.0/roles/_template/defaults/main.yml diff --git a/roles/_template/handlers/main.yml b/ansible-2.0/roles/_template/handlers/main.yml similarity index 100% rename from roles/_template/handlers/main.yml rename to ansible-2.0/roles/_template/handlers/main.yml diff --git a/roles/_template/meta/main.yml b/ansible-2.0/roles/_template/meta/main.yml similarity index 100% rename from roles/_template/meta/main.yml rename to ansible-2.0/roles/_template/meta/main.yml diff --git a/roles/_template/tasks/main.yml b/ansible-2.0/roles/_template/tasks/main.yml similarity index 100% rename from roles/_template/tasks/main.yml rename to ansible-2.0/roles/_template/tasks/main.yml diff --git a/roles/_template/vars/_extravars.yml b/ansible-2.0/roles/_template/vars/_extravars.yml similarity index 100% rename from roles/_template/vars/_extravars.yml rename to ansible-2.0/roles/_template/vars/_extravars.yml diff --git a/roles/bootstrap_vms/defaults/main.yml b/ansible-2.0/roles/bootstrap_vms/defaults/main.yml similarity index 100% rename from roles/bootstrap_vms/defaults/main.yml rename to ansible-2.0/roles/bootstrap_vms/defaults/main.yml diff --git a/roles/bootstrap_vms/meta/main.yml b/ansible-2.0/roles/bootstrap_vms/meta/main.yml similarity index 100% rename from roles/bootstrap_vms/meta/main.yml rename to ansible-2.0/roles/bootstrap_vms/meta/main.yml diff --git a/roles/bootstrap_vms/tasks/main.yml b/ansible-2.0/roles/bootstrap_vms/tasks/main.yml similarity index 100% rename from roles/bootstrap_vms/tasks/main.yml rename to ansible-2.0/roles/bootstrap_vms/tasks/main.yml diff --git a/roles/bootstrap_vms/templates/Vagrantfile.j2 b/ansible-2.0/roles/bootstrap_vms/templates/Vagrantfile.j2 similarity index 100% rename from roles/bootstrap_vms/templates/Vagrantfile.j2 rename to ansible-2.0/roles/bootstrap_vms/templates/Vagrantfile.j2 diff --git a/roles/certbot/tasks/install.yml b/ansible-2.0/roles/certbot/tasks/install.yml similarity index 100% rename from roles/certbot/tasks/install.yml rename to ansible-2.0/roles/certbot/tasks/install.yml diff --git a/roles/certbot/tasks/main.yml b/ansible-2.0/roles/certbot/tasks/main.yml similarity index 100% rename from roles/certbot/tasks/main.yml rename to ansible-2.0/roles/certbot/tasks/main.yml diff --git a/roles/certbot/tasks/uninstall.yml b/ansible-2.0/roles/certbot/tasks/uninstall.yml similarity index 100% rename from roles/certbot/tasks/uninstall.yml rename to ansible-2.0/roles/certbot/tasks/uninstall.yml diff --git a/roles/cleanup/defaults/main.yml b/ansible-2.0/roles/cleanup/defaults/main.yml similarity index 100% rename from roles/cleanup/defaults/main.yml rename to ansible-2.0/roles/cleanup/defaults/main.yml diff --git a/roles/cleanup/tasks/main.yml b/ansible-2.0/roles/cleanup/tasks/main.yml similarity index 100% rename from roles/cleanup/tasks/main.yml rename to ansible-2.0/roles/cleanup/tasks/main.yml diff --git a/roles/cubox-i.xai-corp.net/defaults/main.yml b/ansible-2.0/roles/cubox-i.xai-corp.net/defaults/main.yml similarity index 94% rename from roles/cubox-i.xai-corp.net/defaults/main.yml rename to ansible-2.0/roles/cubox-i.xai-corp.net/defaults/main.yml index e35b1ec..ad3c7b8 100644 --- a/roles/cubox-i.xai-corp.net/defaults/main.yml +++ b/ansible-2.0/roles/cubox-i.xai-corp.net/defaults/main.yml @@ -16,17 +16,17 @@ cubox-i: mount: /data/glusterfs/gitea/brick1 fstype: xfs attr: defaults - vmshare: + jenkins: host: /dev/sda8 mount: /data/glusterfs/jenkins/brick1 fstype: xfs attr: defaults - gitea: + tmp: host: /dev/sda9 mount: /data/glusterfs/tmp/brick1 fstype: xfs attr: defaults - gitea: + elasticsearch: host: /dev/sda10 mount: /data/glusterfs/elasticsearch/brick1 fstype: xfs diff --git a/roles/cubox-i.xai-corp.net/tasks/main.yml b/ansible-2.0/roles/cubox-i.xai-corp.net/tasks/main.yml similarity index 100% rename from roles/cubox-i.xai-corp.net/tasks/main.yml rename to ansible-2.0/roles/cubox-i.xai-corp.net/tasks/main.yml diff --git a/roles/ddagent_source/files/supervisor-dd-agent.conf b/ansible-2.0/roles/ddagent_source/files/supervisor-dd-agent.conf similarity index 100% rename from roles/ddagent_source/files/supervisor-dd-agent.conf rename to ansible-2.0/roles/ddagent_source/files/supervisor-dd-agent.conf diff --git a/roles/ddagent_source/handlers/main.yml b/ansible-2.0/roles/ddagent_source/handlers/main.yml similarity index 100% rename from roles/ddagent_source/handlers/main.yml rename to ansible-2.0/roles/ddagent_source/handlers/main.yml diff --git a/roles/ddagent_source/tasks/main.yml b/ansible-2.0/roles/ddagent_source/tasks/main.yml similarity index 100% rename from roles/ddagent_source/tasks/main.yml rename to ansible-2.0/roles/ddagent_source/tasks/main.yml diff --git a/roles/devtools/defaults/main.yml b/ansible-2.0/roles/devtools/defaults/main.yml similarity index 100% rename from roles/devtools/defaults/main.yml rename to ansible-2.0/roles/devtools/defaults/main.yml diff --git a/roles/devtools/handlers/main.yml b/ansible-2.0/roles/devtools/handlers/main.yml similarity index 100% rename from roles/devtools/handlers/main.yml rename to ansible-2.0/roles/devtools/handlers/main.yml diff --git a/roles/devtools/meta/main.yml b/ansible-2.0/roles/devtools/meta/main.yml similarity index 100% rename from roles/devtools/meta/main.yml rename to ansible-2.0/roles/devtools/meta/main.yml diff --git a/roles/devtools/tasks/main.yml b/ansible-2.0/roles/devtools/tasks/main.yml similarity index 100% rename from roles/devtools/tasks/main.yml rename to ansible-2.0/roles/devtools/tasks/main.yml diff --git a/roles/devtools/vars/_extravars.yml b/ansible-2.0/roles/devtools/vars/_extravars.yml similarity index 100% rename from roles/devtools/vars/_extravars.yml rename to ansible-2.0/roles/devtools/vars/_extravars.yml diff --git a/roles/django/tasks/main.yml b/ansible-2.0/roles/django/tasks/main.yml similarity index 100% rename from roles/django/tasks/main.yml rename to ansible-2.0/roles/django/tasks/main.yml diff --git a/roles/docker_graylog/files/docker-compose.yml b/ansible-2.0/roles/docker_graylog/files/docker-compose.yml similarity index 98% rename from roles/docker_graylog/files/docker-compose.yml rename to ansible-2.0/roles/docker_graylog/files/docker-compose.yml index 4b8a4c4..dd92831 100644 --- a/roles/docker_graylog/files/docker-compose.yml +++ b/ansible-2.0/roles/docker_graylog/files/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3.9' services: mongo: restart: always diff --git a/roles/docker_graylog/files/graylog.conf b/ansible-2.0/roles/docker_graylog/files/graylog.conf similarity index 100% rename from roles/docker_graylog/files/graylog.conf rename to ansible-2.0/roles/docker_graylog/files/graylog.conf diff --git a/roles/docker_graylog/files/log4j2.xml b/ansible-2.0/roles/docker_graylog/files/log4j2.xml similarity index 100% rename from roles/docker_graylog/files/log4j2.xml rename to ansible-2.0/roles/docker_graylog/files/log4j2.xml diff --git a/roles/docker_graylog/tasks/main.yml b/ansible-2.0/roles/docker_graylog/tasks/main.yml similarity index 100% rename from roles/docker_graylog/tasks/main.yml rename to ansible-2.0/roles/docker_graylog/tasks/main.yml diff --git a/roles/docker_registry/defaults/creds.yml b/ansible-2.0/roles/docker_registry/defaults/creds.yml similarity index 100% rename from roles/docker_registry/defaults/creds.yml rename to ansible-2.0/roles/docker_registry/defaults/creds.yml diff --git a/roles/docker_registry/files/docker-compose.yml b/ansible-2.0/roles/docker_registry/files/docker-compose.yml similarity index 100% rename from roles/docker_registry/files/docker-compose.yml rename to ansible-2.0/roles/docker_registry/files/docker-compose.yml diff --git a/roles/docker_registry/tasks/main.yml b/ansible-2.0/roles/docker_registry/tasks/main.yml similarity index 100% rename from roles/docker_registry/tasks/main.yml rename to ansible-2.0/roles/docker_registry/tasks/main.yml diff --git a/roles/docker_swarm_management/tasks/main.yml b/ansible-2.0/roles/docker_swarm_management/tasks/main.yml similarity index 100% rename from roles/docker_swarm_management/tasks/main.yml rename to ansible-2.0/roles/docker_swarm_management/tasks/main.yml diff --git a/roles/dockerhost/defaults/main.yml b/ansible-2.0/roles/dockerhost/defaults/main.yml similarity index 100% rename from roles/dockerhost/defaults/main.yml rename to ansible-2.0/roles/dockerhost/defaults/main.yml diff --git a/roles/dockerhost/files/daemon.json b/ansible-2.0/roles/dockerhost/files/daemon.json similarity index 100% rename from roles/dockerhost/files/daemon.json rename to ansible-2.0/roles/dockerhost/files/daemon.json diff --git a/roles/dockerhost/files/docker.service.host.conf b/ansible-2.0/roles/dockerhost/files/docker.service.host.conf similarity index 100% rename from roles/dockerhost/files/docker.service.host.conf rename to ansible-2.0/roles/dockerhost/files/docker.service.host.conf diff --git a/roles/dockerhost/handlers/main.yml b/ansible-2.0/roles/dockerhost/handlers/main.yml similarity index 100% rename from roles/dockerhost/handlers/main.yml rename to ansible-2.0/roles/dockerhost/handlers/main.yml diff --git a/roles/dockerhost/tasks/fstab.yml b/ansible-2.0/roles/dockerhost/tasks/fstab.yml similarity index 100% rename from roles/dockerhost/tasks/fstab.yml rename to ansible-2.0/roles/dockerhost/tasks/fstab.yml diff --git a/roles/dockerhost/tasks/glusterfs-volume-driver.yml b/ansible-2.0/roles/dockerhost/tasks/glusterfs-volume-driver.yml similarity index 100% rename from roles/dockerhost/tasks/glusterfs-volume-driver.yml rename to ansible-2.0/roles/dockerhost/tasks/glusterfs-volume-driver.yml diff --git a/roles/dockerhost/tasks/install-xenial-ce.yml b/ansible-2.0/roles/dockerhost/tasks/install-xenial-ce.yml similarity index 100% rename from roles/dockerhost/tasks/install-xenial-ce.yml rename to ansible-2.0/roles/dockerhost/tasks/install-xenial-ce.yml diff --git a/roles/dockerhost/tasks/install-xenial.yml b/ansible-2.0/roles/dockerhost/tasks/install-xenial.yml similarity index 100% rename from roles/dockerhost/tasks/install-xenial.yml rename to ansible-2.0/roles/dockerhost/tasks/install-xenial.yml diff --git a/roles/dockerhost/tasks/main.yml b/ansible-2.0/roles/dockerhost/tasks/main.yml similarity index 100% rename from roles/dockerhost/tasks/main.yml rename to ansible-2.0/roles/dockerhost/tasks/main.yml diff --git a/roles/dynamic-ip/tasks/main.yml b/ansible-2.0/roles/dynamic-ip/tasks/main.yml similarity index 100% rename from roles/dynamic-ip/tasks/main.yml rename to ansible-2.0/roles/dynamic-ip/tasks/main.yml diff --git a/roles/glusterfs/tasks/main.yml b/ansible-2.0/roles/glusterfs/tasks/main.yml similarity index 100% rename from roles/glusterfs/tasks/main.yml rename to ansible-2.0/roles/glusterfs/tasks/main.yml diff --git a/roles/glusterfs/tasks/manage_volumes.yml b/ansible-2.0/roles/glusterfs/tasks/manage_volumes.yml similarity index 100% rename from roles/glusterfs/tasks/manage_volumes.yml rename to ansible-2.0/roles/glusterfs/tasks/manage_volumes.yml diff --git a/roles/glusterfs/tasks/prometheus_exporter.yml b/ansible-2.0/roles/glusterfs/tasks/prometheus_exporter.yml similarity index 100% rename from roles/glusterfs/tasks/prometheus_exporter.yml rename to ansible-2.0/roles/glusterfs/tasks/prometheus_exporter.yml diff --git a/roles/home.xai-corp.net/defaults/main.yml b/ansible-2.0/roles/home.xai-corp.net/defaults/main.yml similarity index 100% rename from roles/home.xai-corp.net/defaults/main.yml rename to ansible-2.0/roles/home.xai-corp.net/defaults/main.yml diff --git a/roles/home.xai-corp.net/handlers/main.yml b/ansible-2.0/roles/home.xai-corp.net/handlers/main.yml similarity index 100% rename from roles/home.xai-corp.net/handlers/main.yml rename to ansible-2.0/roles/home.xai-corp.net/handlers/main.yml diff --git a/roles/home.xai-corp.net/meta/main.yml b/ansible-2.0/roles/home.xai-corp.net/meta/main.yml similarity index 100% rename from roles/home.xai-corp.net/meta/main.yml rename to ansible-2.0/roles/home.xai-corp.net/meta/main.yml diff --git a/roles/home.xai-corp.net/tasks/cron.yml b/ansible-2.0/roles/home.xai-corp.net/tasks/cron.yml similarity index 100% rename from roles/home.xai-corp.net/tasks/cron.yml rename to ansible-2.0/roles/home.xai-corp.net/tasks/cron.yml diff --git a/roles/home.xai-corp.net/tasks/main.yml b/ansible-2.0/roles/home.xai-corp.net/tasks/main.yml similarity index 100% rename from roles/home.xai-corp.net/tasks/main.yml rename to ansible-2.0/roles/home.xai-corp.net/tasks/main.yml diff --git a/roles/home.xai-corp.net/tasks/vhosts.yml b/ansible-2.0/roles/home.xai-corp.net/tasks/vhosts.yml similarity index 100% rename from roles/home.xai-corp.net/tasks/vhosts.yml rename to ansible-2.0/roles/home.xai-corp.net/tasks/vhosts.yml diff --git a/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 b/ansible-2.0/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 similarity index 100% rename from roles/home.xai-corp.net/templates/home.xai-corp.net.j2 rename to ansible-2.0/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 diff --git a/roles/home.xai-corp.net/templates/httpd.conf b/ansible-2.0/roles/home.xai-corp.net/templates/httpd.conf similarity index 100% rename from roles/home.xai-corp.net/templates/httpd.conf rename to ansible-2.0/roles/home.xai-corp.net/templates/httpd.conf diff --git a/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 b/ansible-2.0/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 similarity index 100% rename from roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 rename to ansible-2.0/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 diff --git a/roles/home.xai-corp.net/vars/_extravars.yml b/ansible-2.0/roles/home.xai-corp.net/vars/_extravars.yml similarity index 100% rename from roles/home.xai-corp.net/vars/_extravars.yml rename to ansible-2.0/roles/home.xai-corp.net/vars/_extravars.yml diff --git a/roles/java/defaults/main.yml b/ansible-2.0/roles/java/defaults/main.yml similarity index 100% rename from roles/java/defaults/main.yml rename to ansible-2.0/roles/java/defaults/main.yml diff --git a/roles/java/handlers/main.yml b/ansible-2.0/roles/java/handlers/main.yml similarity index 100% rename from roles/java/handlers/main.yml rename to ansible-2.0/roles/java/handlers/main.yml diff --git a/roles/java/meta/main.yml b/ansible-2.0/roles/java/meta/main.yml similarity index 100% rename from roles/java/meta/main.yml rename to ansible-2.0/roles/java/meta/main.yml diff --git a/roles/java/tasks/main.yml b/ansible-2.0/roles/java/tasks/main.yml similarity index 100% rename from roles/java/tasks/main.yml rename to ansible-2.0/roles/java/tasks/main.yml diff --git a/roles/java/vars/_extravars.yml b/ansible-2.0/roles/java/vars/_extravars.yml similarity index 100% rename from roles/java/vars/_extravars.yml rename to ansible-2.0/roles/java/vars/_extravars.yml diff --git a/roles/jenkins/defaults/main.yml b/ansible-2.0/roles/jenkins/defaults/main.yml similarity index 100% rename from roles/jenkins/defaults/main.yml rename to ansible-2.0/roles/jenkins/defaults/main.yml diff --git a/roles/jenkins/handlers/main.yml b/ansible-2.0/roles/jenkins/handlers/main.yml similarity index 100% rename from roles/jenkins/handlers/main.yml rename to ansible-2.0/roles/jenkins/handlers/main.yml diff --git a/roles/jenkins/meta/main.yml b/ansible-2.0/roles/jenkins/meta/main.yml similarity index 100% rename from roles/jenkins/meta/main.yml rename to ansible-2.0/roles/jenkins/meta/main.yml diff --git a/roles/jenkins/tasks/main.yml b/ansible-2.0/roles/jenkins/tasks/main.yml similarity index 100% rename from roles/jenkins/tasks/main.yml rename to ansible-2.0/roles/jenkins/tasks/main.yml diff --git a/roles/jenkins/templates/gitconfig.j2 b/ansible-2.0/roles/jenkins/templates/gitconfig.j2 similarity index 100% rename from roles/jenkins/templates/gitconfig.j2 rename to ansible-2.0/roles/jenkins/templates/gitconfig.j2 diff --git a/roles/jenkins/templates/nginx.jenkins.conf.j2 b/ansible-2.0/roles/jenkins/templates/nginx.jenkins.conf.j2 similarity index 100% rename from roles/jenkins/templates/nginx.jenkins.conf.j2 rename to ansible-2.0/roles/jenkins/templates/nginx.jenkins.conf.j2 diff --git a/roles/jenkins/vars/_extravars.yml b/ansible-2.0/roles/jenkins/vars/_extravars.yml similarity index 100% rename from roles/jenkins/vars/_extravars.yml rename to ansible-2.0/roles/jenkins/vars/_extravars.yml diff --git a/roles/kubernetes-vagrant/defaults/main.yml b/ansible-2.0/roles/kubernetes-vagrant/defaults/main.yml similarity index 100% rename from roles/kubernetes-vagrant/defaults/main.yml rename to ansible-2.0/roles/kubernetes-vagrant/defaults/main.yml diff --git a/roles/kubernetes-vagrant/meta/main.yml b/ansible-2.0/roles/kubernetes-vagrant/meta/main.yml similarity index 100% rename from roles/kubernetes-vagrant/meta/main.yml rename to ansible-2.0/roles/kubernetes-vagrant/meta/main.yml diff --git a/roles/kubernetes-vagrant/tasks/main.yml b/ansible-2.0/roles/kubernetes-vagrant/tasks/main.yml similarity index 100% rename from roles/kubernetes-vagrant/tasks/main.yml rename to ansible-2.0/roles/kubernetes-vagrant/tasks/main.yml diff --git a/roles/motd/files/cubox.sh b/ansible-2.0/roles/motd/files/cubox.sh similarity index 100% rename from roles/motd/files/cubox.sh rename to ansible-2.0/roles/motd/files/cubox.sh diff --git a/roles/motd/files/hostname.sh b/ansible-2.0/roles/motd/files/hostname.sh similarity index 100% rename from roles/motd/files/hostname.sh rename to ansible-2.0/roles/motd/files/hostname.sh diff --git a/roles/motd/files/systats.sh b/ansible-2.0/roles/motd/files/systats.sh similarity index 100% rename from roles/motd/files/systats.sh rename to ansible-2.0/roles/motd/files/systats.sh diff --git a/roles/motd/tasks/main.yml b/ansible-2.0/roles/motd/tasks/main.yml similarity index 100% rename from roles/motd/tasks/main.yml rename to ansible-2.0/roles/motd/tasks/main.yml diff --git a/roles/nginx/defaults/main.yml b/ansible-2.0/roles/nginx/defaults/main.yml similarity index 100% rename from roles/nginx/defaults/main.yml rename to ansible-2.0/roles/nginx/defaults/main.yml diff --git a/roles/nginx/handlers/main.yml b/ansible-2.0/roles/nginx/handlers/main.yml similarity index 100% rename from roles/nginx/handlers/main.yml rename to ansible-2.0/roles/nginx/handlers/main.yml diff --git a/roles/nginx/meta/main.yml b/ansible-2.0/roles/nginx/meta/main.yml similarity index 100% rename from roles/nginx/meta/main.yml rename to ansible-2.0/roles/nginx/meta/main.yml diff --git a/roles/nginx/tasks/main.yml b/ansible-2.0/roles/nginx/tasks/main.yml similarity index 100% rename from roles/nginx/tasks/main.yml rename to ansible-2.0/roles/nginx/tasks/main.yml diff --git a/roles/nginx/templates/nginx.conf.j2 b/ansible-2.0/roles/nginx/templates/nginx.conf.j2 similarity index 100% rename from roles/nginx/templates/nginx.conf.j2 rename to ansible-2.0/roles/nginx/templates/nginx.conf.j2 diff --git a/roles/nginx/vars/_extravars.yml b/ansible-2.0/roles/nginx/vars/_extravars.yml similarity index 100% rename from roles/nginx/vars/_extravars.yml rename to ansible-2.0/roles/nginx/vars/_extravars.yml diff --git a/roles/ns.xai-corp.net/defaults/main.yml b/ansible-2.0/roles/ns.xai-corp.net/defaults/main.yml similarity index 100% rename from roles/ns.xai-corp.net/defaults/main.yml rename to ansible-2.0/roles/ns.xai-corp.net/defaults/main.yml diff --git a/roles/ns.xai-corp.net/handlers/main.yml b/ansible-2.0/roles/ns.xai-corp.net/handlers/main.yml similarity index 100% rename from roles/ns.xai-corp.net/handlers/main.yml rename to ansible-2.0/roles/ns.xai-corp.net/handlers/main.yml diff --git a/roles/ns.xai-corp.net/meta/main.yml b/ansible-2.0/roles/ns.xai-corp.net/meta/main.yml similarity index 100% rename from roles/ns.xai-corp.net/meta/main.yml rename to ansible-2.0/roles/ns.xai-corp.net/meta/main.yml diff --git a/roles/ns.xai-corp.net/tasks/main.yml b/ansible-2.0/roles/ns.xai-corp.net/tasks/main.yml similarity index 100% rename from roles/ns.xai-corp.net/tasks/main.yml rename to ansible-2.0/roles/ns.xai-corp.net/tasks/main.yml diff --git a/roles/ns.xai-corp.net/templates/localhost.zone.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/localhost.zone.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/localhost.zone.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/localhost.zone.j2 diff --git a/roles/ns.xai-corp.net/templates/named.conf.default-zones.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.default-zones.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/named.conf.default-zones.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.default-zones.j2 diff --git a/roles/ns.xai-corp.net/templates/named.conf.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/named.conf.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.j2 diff --git a/roles/ns.xai-corp.net/templates/named.conf.local.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.local.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/named.conf.local.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.local.j2 diff --git a/roles/ns.xai-corp.net/templates/named.conf.options.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.options.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/named.conf.options.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/named.conf.options.j2 diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.external.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/xai-corp.net.external.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/xai-corp.net.external.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/xai-corp.net.external.j2 diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 b/ansible-2.0/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 similarity index 100% rename from roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 rename to ansible-2.0/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 diff --git a/roles/ns.xai-corp.net/vars/_extravars.yml b/ansible-2.0/roles/ns.xai-corp.net/vars/_extravars.yml similarity index 100% rename from roles/ns.xai-corp.net/vars/_extravars.yml rename to ansible-2.0/roles/ns.xai-corp.net/vars/_extravars.yml diff --git a/roles/php5-fpm-phalcon/handlers/main.yml b/ansible-2.0/roles/php5-fpm-phalcon/handlers/main.yml similarity index 100% rename from roles/php5-fpm-phalcon/handlers/main.yml rename to ansible-2.0/roles/php5-fpm-phalcon/handlers/main.yml diff --git a/roles/php5-fpm-phalcon/tasks/main.yml b/ansible-2.0/roles/php5-fpm-phalcon/tasks/main.yml similarity index 100% rename from roles/php5-fpm-phalcon/tasks/main.yml rename to ansible-2.0/roles/php5-fpm-phalcon/tasks/main.yml diff --git a/roles/php7-fpm/defaults/main.yml b/ansible-2.0/roles/php7-fpm/defaults/main.yml similarity index 100% rename from roles/php7-fpm/defaults/main.yml rename to ansible-2.0/roles/php7-fpm/defaults/main.yml diff --git a/roles/php7-fpm/tasks/devtools.yml b/ansible-2.0/roles/php7-fpm/tasks/devtools.yml similarity index 100% rename from roles/php7-fpm/tasks/devtools.yml rename to ansible-2.0/roles/php7-fpm/tasks/devtools.yml diff --git a/roles/php7-fpm/tasks/main.yml b/ansible-2.0/roles/php7-fpm/tasks/main.yml similarity index 100% rename from roles/php7-fpm/tasks/main.yml rename to ansible-2.0/roles/php7-fpm/tasks/main.yml diff --git a/roles/rsyslog/defaults/main.yml b/ansible-2.0/roles/rsyslog/defaults/main.yml similarity index 100% rename from roles/rsyslog/defaults/main.yml rename to ansible-2.0/roles/rsyslog/defaults/main.yml diff --git a/roles/rsyslog/handlers/main.yml b/ansible-2.0/roles/rsyslog/handlers/main.yml similarity index 100% rename from roles/rsyslog/handlers/main.yml rename to ansible-2.0/roles/rsyslog/handlers/main.yml diff --git a/roles/rsyslog/tasks/main.yml b/ansible-2.0/roles/rsyslog/tasks/main.yml similarity index 100% rename from roles/rsyslog/tasks/main.yml rename to ansible-2.0/roles/rsyslog/tasks/main.yml diff --git a/roles/rsyslog/templates/48-ship2papertrail.j2 b/ansible-2.0/roles/rsyslog/templates/48-ship2papertrail.j2 similarity index 100% rename from roles/rsyslog/templates/48-ship2papertrail.j2 rename to ansible-2.0/roles/rsyslog/templates/48-ship2papertrail.j2 diff --git a/roles/rsyslog/templates/49-shiptograylog.j2 b/ansible-2.0/roles/rsyslog/templates/49-shiptograylog.j2 similarity index 100% rename from roles/rsyslog/templates/49-shiptograylog.j2 rename to ansible-2.0/roles/rsyslog/templates/49-shiptograylog.j2 diff --git a/roles/rsyslog/templates/50-default.conf b/ansible-2.0/roles/rsyslog/templates/50-default.conf similarity index 100% rename from roles/rsyslog/templates/50-default.conf rename to ansible-2.0/roles/rsyslog/templates/50-default.conf diff --git a/roles/td-agent-bit/files/td.conf b/ansible-2.0/roles/td-agent-bit/files/td.conf similarity index 100% rename from roles/td-agent-bit/files/td.conf rename to ansible-2.0/roles/td-agent-bit/files/td.conf diff --git a/roles/td-agent-bit/handlers/main.yml b/ansible-2.0/roles/td-agent-bit/handlers/main.yml similarity index 100% rename from roles/td-agent-bit/handlers/main.yml rename to ansible-2.0/roles/td-agent-bit/handlers/main.yml diff --git a/roles/td-agent-bit/tasks/config.yml b/ansible-2.0/roles/td-agent-bit/tasks/config.yml similarity index 100% rename from roles/td-agent-bit/tasks/config.yml rename to ansible-2.0/roles/td-agent-bit/tasks/config.yml diff --git a/roles/td-agent-bit/tasks/install.yml b/ansible-2.0/roles/td-agent-bit/tasks/install.yml similarity index 100% rename from roles/td-agent-bit/tasks/install.yml rename to ansible-2.0/roles/td-agent-bit/tasks/install.yml diff --git a/roles/td-agent-bit/tasks/main.yml b/ansible-2.0/roles/td-agent-bit/tasks/main.yml similarity index 100% rename from roles/td-agent-bit/tasks/main.yml rename to ansible-2.0/roles/td-agent-bit/tasks/main.yml diff --git a/roles/td-agent/files/td-leaf.conf b/ansible-2.0/roles/td-agent/files/td-leaf.conf similarity index 100% rename from roles/td-agent/files/td-leaf.conf rename to ansible-2.0/roles/td-agent/files/td-leaf.conf diff --git a/roles/td-agent/files/td.conf b/ansible-2.0/roles/td-agent/files/td.conf similarity index 100% rename from roles/td-agent/files/td.conf rename to ansible-2.0/roles/td-agent/files/td.conf diff --git a/roles/td-agent/handlers/main.yml b/ansible-2.0/roles/td-agent/handlers/main.yml similarity index 100% rename from roles/td-agent/handlers/main.yml rename to ansible-2.0/roles/td-agent/handlers/main.yml diff --git a/roles/td-agent/tasks/config.yml b/ansible-2.0/roles/td-agent/tasks/config.yml similarity index 100% rename from roles/td-agent/tasks/config.yml rename to ansible-2.0/roles/td-agent/tasks/config.yml diff --git a/roles/td-agent/tasks/install.yml b/ansible-2.0/roles/td-agent/tasks/install.yml similarity index 100% rename from roles/td-agent/tasks/install.yml rename to ansible-2.0/roles/td-agent/tasks/install.yml diff --git a/roles/td-agent/tasks/main.yml b/ansible-2.0/roles/td-agent/tasks/main.yml similarity index 100% rename from roles/td-agent/tasks/main.yml rename to ansible-2.0/roles/td-agent/tasks/main.yml diff --git a/roles/user-richard/defaults/main.yml b/ansible-2.0/roles/user-richard/defaults/main.yml similarity index 100% rename from roles/user-richard/defaults/main.yml rename to ansible-2.0/roles/user-richard/defaults/main.yml diff --git a/roles/user-richard/handlers/main.yml b/ansible-2.0/roles/user-richard/handlers/main.yml similarity index 100% rename from roles/user-richard/handlers/main.yml rename to ansible-2.0/roles/user-richard/handlers/main.yml diff --git a/roles/user-richard/meta/main.yml b/ansible-2.0/roles/user-richard/meta/main.yml similarity index 100% rename from roles/user-richard/meta/main.yml rename to ansible-2.0/roles/user-richard/meta/main.yml diff --git a/roles/user-richard/tasks/main.yml b/ansible-2.0/roles/user-richard/tasks/main.yml similarity index 100% rename from roles/user-richard/tasks/main.yml rename to ansible-2.0/roles/user-richard/tasks/main.yml diff --git a/roles/user-richard/templates/procmailrc.j2 b/ansible-2.0/roles/user-richard/templates/procmailrc.j2 similarity index 100% rename from roles/user-richard/templates/procmailrc.j2 rename to ansible-2.0/roles/user-richard/templates/procmailrc.j2 diff --git a/roles/user-richard/vars/_extravars.yml b/ansible-2.0/roles/user-richard/vars/_extravars.yml similarity index 100% rename from roles/user-richard/vars/_extravars.yml rename to ansible-2.0/roles/user-richard/vars/_extravars.yml diff --git a/roles/vagrant/defaults/main.yml b/ansible-2.0/roles/vagrant/defaults/main.yml similarity index 100% rename from roles/vagrant/defaults/main.yml rename to ansible-2.0/roles/vagrant/defaults/main.yml diff --git a/roles/vagrant/tasks/main.yml b/ansible-2.0/roles/vagrant/tasks/main.yml similarity index 100% rename from roles/vagrant/tasks/main.yml rename to ansible-2.0/roles/vagrant/tasks/main.yml diff --git a/roles/vbox-guest/tasks/main.yml b/ansible-2.0/roles/vbox-guest/tasks/main.yml similarity index 100% rename from roles/vbox-guest/tasks/main.yml rename to ansible-2.0/roles/vbox-guest/tasks/main.yml diff --git a/roles/website/defaults/main.yml b/ansible-2.0/roles/website/defaults/main.yml similarity index 100% rename from roles/website/defaults/main.yml rename to ansible-2.0/roles/website/defaults/main.yml diff --git a/roles/website/meta/main.yml b/ansible-2.0/roles/website/meta/main.yml similarity index 100% rename from roles/website/meta/main.yml rename to ansible-2.0/roles/website/meta/main.yml diff --git a/roles/website/tasks/main.yml b/ansible-2.0/roles/website/tasks/main.yml similarity index 100% rename from roles/website/tasks/main.yml rename to ansible-2.0/roles/website/tasks/main.yml diff --git a/roles/website/templates/nginx.conf.j2 b/ansible-2.0/roles/website/templates/nginx.conf.j2 similarity index 100% rename from roles/website/templates/nginx.conf.j2 rename to ansible-2.0/roles/website/templates/nginx.conf.j2 diff --git a/scripts/ansible.sh b/ansible-2.0/scripts/ansible.sh similarity index 100% rename from scripts/ansible.sh rename to ansible-2.0/scripts/ansible.sh diff --git a/scripts/update_ns.sh b/ansible-2.0/scripts/update_ns.sh similarity index 100% rename from scripts/update_ns.sh rename to ansible-2.0/scripts/update_ns.sh diff --git a/test-ping.yml b/ansible-2.0/test-ping.yml similarity index 100% rename from test-ping.yml rename to ansible-2.0/test-ping.yml diff --git a/web01.xai-corp.net.yml b/ansible-2.0/web01.xai-corp.net.yml similarity index 100% rename from web01.xai-corp.net.yml rename to ansible-2.0/web01.xai-corp.net.yml diff --git a/ansible-2.0/xai-corp1.test.yml b/ansible-2.0/xai-corp1.test.yml new file mode 100644 index 0000000..7608024 --- /dev/null +++ b/ansible-2.0/xai-corp1.test.yml @@ -0,0 +1,49 @@ +--- + #playbook to test items on localhost + +- hosts: desktop + gather_facts: yes +# become: true + + vars: + docker: + init_config: + instances: + - url: "unix://var/run/docker.sock" + new_tag_names: true + + dockerhost: + users: + - dd-agent + - richard + - ansible + + users: + - name: "ansible" + state: present + shell: /bin/bash + createhome: yes + generate_ssh_key: yes + password: "$6$7z7PfYwduXom0o73$DEiy3K15URNNjmKkOQIwx8/mFKArUNYkFn8D/4q6t/eP9hf1X9jnG4YuSjI7q1Dnp1HwukZUxZY7cF2JK5DO/." + ssh_keys: + - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAmJSdmj03d4fnZUuRByevPDNiReEk1fRL+7F9WPCo5zn+r5Oj84HXxd4P03DNXeGSBYmUAnsTqYEGdkjkpSrKfMm9bv8amL7hUC+Mzb+wOmXmyX1cw/SearYCBQRCz1s5p7I9+PO7XWaC0VJ99LUm1Bp4JM149U5X0Y3M2j2XV+0= RSA-1024" + uid: "1001" + groups: + - sudo + + + roles: + - novuso.users +# - dockerhost +# - jenkins +# - devtools +# - { +# role: website, +# server_hostname: "htmlgames.xai-corp.net", +# server_root: "/var/www/{{ server_hostname }}", +# repo: "/home/richard/Documents/Aptana\ Studio\ 3/xai-corp\ workspace/htmlgames/" +# } + + tasks: + - name: test connection + ping: diff --git a/xai-corp1.test.yml b/xai-corp1.test.yml deleted file mode 100644 index a8d34f5..0000000 --- a/xai-corp1.test.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- - #playbook to test items on localhost - -- hosts: localhost - gather_facts: yes - become: true - - vars: - docker: - init_config: - instances: - - url: "unix://var/run/docker.sock" - new_tag_names: true - - dockerhost: - users: - - dd-agent - - richard - - ansible - - roles: - - dockerhost -# - jenkins -# - devtools -# - { -# role: website, -# server_hostname: "htmlgames.xai-corp.net", -# server_root: "/var/www/{{ server_hostname }}", -# repo: "/home/richard/Documents/Aptana\ Studio\ 3/xai-corp\ workspace/htmlgames/" -# } -