cleaned up sample templates

diff --git a/baas-1601-dc1.cfg b/baas-1601-dc1.cfg
deleted file mode 100644
index 8c72ef3..0000000
--- a/baas-1601-dc1.cfg
+++ /dev/null

@@ -1,31 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/baas-1601-dc1
-fact_caching_connection = ~/.ansible/tmp/cache/baas-1601-dc1
-log_path = ~/.ansible/tmp/logs/baas-1601-dc1.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r

diff --git a/baas-1701-dc5-dc6.cfg b/baas-1701-dc5-dc6.cfg
deleted file mode 100644
index abbe777..0000000
--- a/baas-1701-dc5-dc6.cfg
+++ /dev/null

@@ -1,31 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/baas-1701-dc5-dc6
-fact_caching_connection = ~/.ansible/tmp/cache/baas-1701-dc5-dc6
-log_path = ~/.ansible/tmp/logs/baas-1701-dc5-dc6.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r

diff --git a/baas-1701-dc5.cfg b/baas-1701-dc5.cfg
deleted file mode 100644
index 7ce81b3..0000000
--- a/baas-1701-dc5.cfg
+++ /dev/null

@@ -1,31 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/baas-1701-dc5
-fact_caching_connection = ~/.ansible/tmp/cache/baas-1701-dc5
-log_path = ~/.ansible/tmp/logs/baas-1701-dc5.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r

diff --git a/baas-1701-dc6.cfg b/baas-1701-dc6.cfg
deleted file mode 100644
index 28ef0b0..0000000
--- a/baas-1701-dc6.cfg
+++ /dev/null

@@ -1,31 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/baas-1701-dc6
-fact_caching_connection = ~/.ansible/tmp/cache/baas-1701-dc6
-log_path = ~/.ansible/tmp/logs/baas-1701-dc6.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r

diff --git a/edge-1601-aio.cfg b/edge-1601-aio.cfg
deleted file mode 100644
index 9ec8465..0000000
--- a/edge-1601-aio.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-aio
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-aio
-log_path = ~/.ansible/tmp/logs/edge-1601-aio.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-cassandra-replication-factor-lab.cfg b/edge-1601-cassandra-replication-factor-lab.cfg
deleted file mode 100644
index fdd87a8..0000000
--- a/edge-1601-cassandra-replication-factor-lab.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-cassandra-replication-factor-lab
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-cassandra-replication-factor-lab
-log_path = ~/.ansible/tmp/logs/edge-1601-cassandra-replication-factor-lab.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc1-dc2.cfg b/edge-1601-dc1-dc2.cfg
deleted file mode 100644
index cbb70ef..0000000
--- a/edge-1601-dc1-dc2.cfg
+++ /dev/null

@@ -1,31 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc1-dc2
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc1-dc2
-log_path = ~/.ansible/tmp/logs/edge-1601-dc1-dc2.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc1.cfg b/edge-1601-dc1.cfg
deleted file mode 100644
index ea9449e..0000000
--- a/edge-1601-dc1.cfg
+++ /dev/null

@@ -1,31 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc1
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc1
-log_path = ~/.ansible/tmp/logs/edge-1601-dc1.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc2.cfg b/edge-1601-dc2.cfg
deleted file mode 100644
index b1106c9..0000000
--- a/edge-1601-dc2.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-inventory = ~/.ansible/inventory/edge-1601-dc2
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc2
-log_path = ~/.ansible/tmp/logs/edge-1601-dc2.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc3-dc4.cfg b/edge-1601-dc3-dc4.cfg
deleted file mode 100644
index d045aca..0000000
--- a/edge-1601-dc3-dc4.cfg
+++ /dev/null

@@ -1,29 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc3-dc4
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc3-dc4
-log_path = ~/.ansible/tmp/logs/edge-1601-dc3-dc4.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-#executable =  /bin/sh
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc3.cfg b/edge-1601-dc3.cfg
deleted file mode 100644
index d8ef48a..0000000
--- a/edge-1601-dc3.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc3
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc3
-log_path = ~/.ansible/tmp/logs/edge-1601-dc3.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc4.cfg b/edge-1601-dc4.cfg
deleted file mode 100644
index 6aec461..0000000
--- a/edge-1601-dc4.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc4
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc4
-log_path = ~/.ansible/tmp/logs/edge-1601-dc4.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc5-dc6.cfg b/edge-1601-dc5-dc6.cfg
deleted file mode 100644
index 9b5aee7..0000000
--- a/edge-1601-dc5-dc6.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc5-dc6
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc5-dc6
-log_path = ~/.ansible/tmp/logs/edge-1601-dc5-dc6.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc5.cfg b/edge-1601-dc5.cfg
deleted file mode 100644
index a4bef87..0000000
--- a/edge-1601-dc5.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc5
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc5
-log_path = ~/.ansible/tmp/logs/edge-1601-dc5.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1601-dc6.cfg b/edge-1601-dc6.cfg
deleted file mode 100644
index 6e84d15..0000000
--- a/edge-1601-dc6.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1601-dc6
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1601-dc6
-log_path = ~/.ansible/tmp/logs/edge-1601-dc6.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1605-dc3.cfg b/edge-1605-dc3.cfg
deleted file mode 100644
index 462c3e0..0000000
--- a/edge-1605-dc3.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1605-dc3
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1605-dc3
-log_path = ~/.ansible/tmp/logs/edge-1605-dc3.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1609-dc2.cfg b/edge-1609-dc2.cfg
deleted file mode 100644
index 414c595..0000000
--- a/edge-1609-dc2.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1609-dc2
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1609-dc2
-log_path = ~/.ansible/tmp/logs/edge-1609-dc2.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1609-dc3-dc4.cfg b/edge-1609-dc3-dc4.cfg
deleted file mode 100644
index 57c1a94..0000000
--- a/edge-1609-dc3-dc4.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1609-dc3-dc4
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1609-dc3-dc4
-log_path = ~/.ansible/tmp/logs/edge-1609-dc3-dc4.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1609-dc3.cfg b/edge-1609-dc3.cfg
deleted file mode 100644
index 01ec048..0000000
--- a/edge-1609-dc3.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1609-dc3
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1609-dc3
-log_path = ~/.ansible/tmp/logs/edge-1609-dc3.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1609-dc4.cfg b/edge-1609-dc4.cfg
deleted file mode 100644
index 70632d0..0000000
--- a/edge-1609-dc4.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1609-dc4
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1609-dc4
-log_path = ~/.ansible/tmp/logs/edge-1609-dc4.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1701-aio.cfg b/edge-1701-aio.cfg
deleted file mode 100644
index 90fef0b..0000000
--- a/edge-1701-aio.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1701-aio
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1701-aio
-log_path = ~/.ansible/tmp/logs/edge-1701-aio.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1701-dc1.cfg b/edge-1701-dc1.cfg
deleted file mode 100644
index 6bd307b..0000000
--- a/edge-1701-dc1.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1701-dc1
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1701-dc1
-log_path = ~/.ansible/tmp/logs/edge-1701-dc1.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1701-dc2.cfg b/edge-1701-dc2.cfg
deleted file mode 100644
index 1e7ae83..0000000
--- a/edge-1701-dc2.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1701-dc2
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1701-dc2
-log_path = ~/.ansible/tmp/logs/edge-1701-dc2.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-1701-dc5.cfg b/edge-1701-dc5.cfg
deleted file mode 100644
index e7bfd1f..0000000
--- a/edge-1701-dc5.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-1701-dc5
-fact_caching_connection = ~/.ansible/tmp/cache/edge-1701-dc5
-log_path = ~/.ansible/tmp/logs/edge-1701-dc5.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-baas-portal-1701-dc7.cfg b/edge-baas-portal-1701-dc7.cfg
deleted file mode 100644
index 3ffc88a..0000000
--- a/edge-baas-portal-1701-dc7.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-baas-portal-1701-dc7
-fact_caching_connection = ~/.ansible/tmp/cache/edge-baas-portal-1701-dc7
-log_path = ~/.ansible/tmp/logs/edge-baas-portal-1701-dc7.log
-
-remote_user = ec2-user
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-ops-lab-1701-expansion.cfg b/edge-ops-lab-1701-expansion.cfg
deleted file mode 100644
index 82bf1ec..0000000
--- a/edge-ops-lab-1701-expansion.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-inventory = ~/.ansible/inventory/edge-ops-lab-1701-expansion
-fact_caching_connection = ~/.ansible/tmp/cache/edge-ops-lab-1701-expansion
-log_path = ~/.ansible/tmp/logs/edge-ops-lab-1701.log-expansion
-
-remote_user = friasc
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/edge-ops-lab-1701.cfg b/edge-ops-lab-1701.cfg
deleted file mode 100644
index fe316a5..0000000
--- a/edge-ops-lab-1701.cfg
+++ /dev/null

@@ -1,32 +0,0 @@
-[defaults]
-hostfile = ~/.ansible/inventory/edge-ops-lab-1701
-fact_caching_connection = ~/.ansible/tmp/cache/edge-ops-lab-1701
-log_path = ~/.ansible/tmp/logs/edge-ops-lab-1701.log
-
-remote_user = friasc
-private_key_file = ~/.ssh/id_rsa
-
-roles_path = ~/.ansible/roles
-local_tmp = ~/.ansible/tmp
-library = ~/.ansible/library/
-
-host_key_checking = false
-forks = 10
-retry_files_enabled = False
-
-
-ansible_shell_type=sh
-gathering = smart
-fact_caching = jsonfile
-module_name = shell
-
-merge_multiple_cli_tags=True
-gather_subset = !ohai,!facter
-display_args_to_stdout = True
-
-timeout = 60
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
-control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
-pipelining = True

diff --git a/sample-edge-one-datacenter.cfg b/sample-edge-one-datacenter.cfg
new file mode 100644
index 0000000..970f9aa
--- /dev/null
+++ b/sample-edge-one-datacenter.cfg

@@ -0,0 +1,27 @@
+[defaults]
+inventory = ~/.ansible/inventory/sample-edge-one-datacenter
+fact_caching_connection = ~/.ansible/cache/sample-edge-one-datacenter
+log_path = ~/.ansible/logs/sample-edge-one-datacenter.log
+private_key_file = ~/.ssh/id_rsa
+roles_path = ~/.ansible/roles
+local_tmp = ~/.ansible/tmp
+library = ~/.ansible/library/
+remote_user = SSH_USER_NAME
+host_key_checking = false
+forks = 10
+retry_files_enabled = False
+ansible_shell_type=sh
+gathering = smart
+fact_caching = jsonfile
+module_name = shell
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+timeout = 60
+
+[ssh_connection]
+# Sample ssh_args settings
+# ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
+ssh_args =  -q
+control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
+pipelining = True

diff --git a/sample-edge-two-datacenters.cfg b/sample-edge-two-datacenters.cfg
new file mode 100644
index 0000000..bf84bff
--- /dev/null
+++ b/sample-edge-two-datacenters.cfg

@@ -0,0 +1,27 @@
+[defaults]
+inventory = ~/.ansible/inventory/sample-edge-two-datacenters
+fact_caching_connection = ~/.ansible/cache/sample-edge-two-datacenters
+log_path = ~/.ansible/logs/sample-edge-two-datacenters.log
+private_key_file = ~/.ssh/id_rsa
+roles_path = ~/.ansible/roles
+local_tmp = ~/.ansible/tmp
+library = ~/.ansible/library/
+remote_user = SSH_USER_NAME
+host_key_checking = false
+forks = 10
+retry_files_enabled = False
+ansible_shell_type=sh
+gathering = smart
+fact_caching = jsonfile
+module_name = shell
+merge_multiple_cli_tags=True
+gather_subset = !ohai,!facter
+display_args_to_stdout = True
+timeout = 60
+
+[ssh_connection]
+# Sample ssh_args settings
+# ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
+ssh_args =  -q
+control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
+pipelining = True