Fix hostname changing (#3)

* Fix hostname changing * Update AVM * Fix Ubuntu Xenial container * Fix AVM env vars * Update ansible-setup.sh script * Remove .kitchen directory * Rollback tasks * Add .gitignore * Add python to xenial * Move hostname task after /etc/hosts modification * Remove old tests * Rename tests * Disable retry files creation
AutomationWithAnsible · Sep 22, 2017 · 6abf835 · 6abf835
1 parent eafe632
commit 6abf835
Show file tree

Hide file tree

Showing 28 changed files with 71 additions and 263 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,42 @@
+################ GIT Ignore ################
+
+## Ansible experimental and testing stuff
+plays-test
+plays-experimental/*
+roles/experimental/*
+local.ini
+packer.ini
+
+## Ansible temp files
+*.retry
+.galaxy_install_info
+
+## Sensetive data
+.vpass
+.vpass*
+vpass
+vpass*
+
+## IDE stuff
+.idea
+
+## python stuff
+*.pyc
+
+## Ruby stuff
+bundler_gems
+.bundle
+
+## Node stuff
+node_modules/
+
+## Kitchen stuff
+tests/*/.kitchen/
+tests_run
+.kitchen
+
+## Vagrant stuff
+.vagrant
+
+## Mac stuff
+.DS_Store
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -4,6 +4,7 @@ driver                    :
     socket                : unix:///var/run/docker.sock
     use_sudo              : false
     privileged            : true
+    require_chef_omnibus  : false
 
 provisioner:
     name                  : ansible_push
@@ -26,22 +27,18 @@ platforms:
 
  - name                   : ubuntu1604
    driver_config          :
-     image                : ubuntu:trusty
+     image                : ubuntu:xenial
      platform             : ubuntu
+     provision_command:
+       - apt-get install -y python-minimal
 
  - name                   : centos7
    driver_config          :
     image                 : centos:7
     platform              : centos
 
 suites                    :
-#   - name                  : simple1
-#     provisioner           :
-#       playbook            : "test/integration/simple1/simple1.yml"
-#       ansible_playbook_bin: "$(avm path v2.0)ansible-playbook"
-
-  - name                  : simple2
+  - name                  : simple-tests
     provisioner           :
-      playbook            : "test/integration/simple2/simple2.yml"
+      playbook            : "test/integration/simple-tests/play.yml"
       ansible_playbook_bin: "$(avm path v2.2)ansible-playbook"
-
diff --git a/.kitchen/ansiblepush/ansiblepush_host_centos7.yml b/.kitchen/ansiblepush/ansiblepush_host_centos7.yml
diff --git a/.kitchen/ansiblepush/ansiblepush_host_ubuntu1404.yml b/.kitchen/ansiblepush/ansiblepush_host_ubuntu1404.yml
diff --git a/.kitchen/ansiblepush/ansiblepush_host_ubuntu1604.yml b/.kitchen/ansiblepush/ansiblepush_host_ubuntu1604.yml
diff --git a/.kitchen/docker_id_rsa b/.kitchen/docker_id_rsa
diff --git a/.kitchen/docker_id_rsa.pub b/.kitchen/docker_id_rsa.pub
diff --git a/.kitchen/logs/ansibleV20-ubuntu1404.log b/.kitchen/logs/ansibleV20-ubuntu1404.log
diff --git a/.kitchen/logs/ansibleV20-ubuntu1604.log b/.kitchen/logs/ansibleV20-ubuntu1604.log
diff --git a/.kitchen/logs/ansibleV22-ubuntu1404.log b/.kitchen/logs/ansibleV22-ubuntu1404.log
diff --git a/.kitchen/logs/ansibleV22-ubuntu1604.log b/.kitchen/logs/ansibleV22-ubuntu1604.log
diff --git a/.kitchen/logs/kitchen.log b/.kitchen/logs/kitchen.log
diff --git a/.kitchen/logs/simple1-ubuntu1404.log b/.kitchen/logs/simple1-ubuntu1404.log