Added environments for 1609 and better managing 1601
diff --git a/edge-1601-dc1-expansion/ec2.ini b/edge-1601-dc1-dc2/ec2.ini
similarity index 100%
rename from edge-1601-dc1-expansion/ec2.ini
rename to edge-1601-dc1-dc2/ec2.ini
diff --git a/edge-1601-dc1-expansion/ec2.py b/edge-1601-dc1-dc2/ec2.py
similarity index 100%
rename from edge-1601-dc1-expansion/ec2.py
rename to edge-1601-dc1-dc2/ec2.py
diff --git a/edge-1601-dc1-dc2/inventory-dc1 b/edge-1601-dc1-dc2/inventory-dc1
new file mode 120000
index 0000000..6224813
--- /dev/null
+++ b/edge-1601-dc1-dc2/inventory-dc1
@@ -0,0 +1 @@
+../edge-1601-dc1/inventory
\ No newline at end of file
diff --git a/edge-1601-dc1-dc2/inventory-dc2 b/edge-1601-dc1-dc2/inventory-dc2
new file mode 120000
index 0000000..d7c20ce
--- /dev/null
+++ b/edge-1601-dc1-dc2/inventory-dc2
@@ -0,0 +1 @@
+../edge-1601-dc2/inventory
\ No newline at end of file
diff --git a/edge-1601-dc1/inventory b/edge-1601-dc1/inventory
index 6e3bf60..d4d469a 100644
--- a/edge-1601-dc1/inventory
+++ b/edge-1601-dc1/inventory
@@ -3,6 +3,11 @@
[tag_Name_dc1_n3]
[tag_Name_dc1_n4]
[tag_Name_dc1_n5]
+[tag_Name_dc1_n6]
+[tag_Name_dc1_n7]
+[tag_Name_dc1_n8]
+[tag_Name_dc1_n9]
+[tag_Name_dc1_n10]
[planet:children]
dc-1
@@ -13,14 +18,19 @@
tag_Name_dc1_n3
tag_Name_dc1_n4
tag_Name_dc1_n5
+tag_Name_dc1_n6
+tag_Name_dc1_n7
+tag_Name_dc1_n8
+tag_Name_dc1_n9
+tag_Name_dc1_n10
[ds:children]
dc-1-ds
[dc-1-ds:children]
-tag_Name_dc1_n1
tag_Name_dc1_n2
tag_Name_dc1_n3
+tag_Name_dc1_n4
[ms:children]
dc-1-ms
@@ -44,31 +54,31 @@
dc-1-rmp
[dc-1-rmp:children]
-tag_Name_dc1_n2
-tag_Name_dc1_n3
+tag_Name_dc1_n5
+tag_Name_dc1_n6
[qpid:children]
dc-1-qpid
[dc-1-qpid:children]
-tag_Name_dc1_n4
-tag_Name_dc1_n5
+tag_Name_dc1_n7
+tag_Name_dc1_n8
[pg:children]
dc-1-pg
[dc-1-pg:children]
-tag_Name_dc1_n4
-tag_Name_dc1_n5
+tag_Name_dc1_n9
+tag_Name_dc1_n10
[pgmaster:children]
dc-1-pgmaster
[dc-1-pgmaster:children]
-tag_Name_dc1_n4
+tag_Name_dc1_n9
[pgstandby:children]
dc-1-pgstandby
[dc-1-pgstandby:children]
-tag_Name_dc1_n5
+tag_Name_dc1_n10
diff --git a/edge-1601-dc2/inventory b/edge-1601-dc2/inventory
index f81017b..ebca9f0 100644
--- a/edge-1601-dc2/inventory
+++ b/edge-1601-dc2/inventory
@@ -3,9 +3,11 @@
[tag_Name_dc2_n3]
[tag_Name_dc2_n4]
[tag_Name_dc2_n5]
-
-[tag_Name_dc2_n3:vars]
-zk_observer=true
+[tag_Name_dc2_n6]
+[tag_Name_dc2_n7]
+[tag_Name_dc2_n8]
+[tag_Name_dc2_n9]
+[tag_Name_dc2_n10]
[planet:children]
dc-1
@@ -16,14 +18,19 @@
tag_Name_dc2_n3
tag_Name_dc2_n4
tag_Name_dc2_n5
+tag_Name_dc2_n6
+tag_Name_dc2_n7
+tag_Name_dc2_n8
+tag_Name_dc2_n9
+tag_Name_dc2_n10
[ds:children]
dc-1-ds
[dc-1-ds:children]
-tag_Name_dc2_n1
tag_Name_dc2_n2
tag_Name_dc2_n3
+tag_Name_dc2_n4
[ms:children]
dc-1-ms
@@ -47,32 +54,31 @@
dc-1-rmp
[dc-1-rmp:children]
-tag_Name_dc2_n2
-tag_Name_dc2_n3
+tag_Name_dc2_n5
+tag_Name_dc2_n6
[qpid:children]
dc-1-qpid
[dc-1-qpid:children]
-tag_Name_dc2_n4
-tag_Name_dc2_n5
+tag_Name_dc2_n7
+tag_Name_dc2_n8
[pg:children]
dc-1-pg
[dc-1-pg:children]
-tag_Name_dc2_n4
-tag_Name_dc2_n5
+tag_Name_dc2_n9
+tag_Name_dc2_n10
[pgmaster:children]
dc-1-pgmaster
[dc-1-pgmaster:children]
-tag_Name_dc2_n4
+tag_Name_dc2_n9
[pgstandby:children]
dc-1-pgstandby
[dc-1-pgstandby:children]
-tag_Name_dc2_n5
-
+tag_Name_dc2_n10
diff --git a/edge-1601-dc1-expansion/ec2.ini b/edge-1609-dc3-dc4/ec2.ini
similarity index 100%
copy from edge-1601-dc1-expansion/ec2.ini
copy to edge-1609-dc3-dc4/ec2.ini
diff --git a/edge-1601-dc1-expansion/ec2.py b/edge-1609-dc3-dc4/ec2.py
similarity index 100%
copy from edge-1601-dc1-expansion/ec2.py
copy to edge-1609-dc3-dc4/ec2.py
diff --git a/edge-1609-dc3-dc4/inventory-dc3 b/edge-1609-dc3-dc4/inventory-dc3
new file mode 100644
index 0000000..ba5c7d1
--- /dev/null
+++ b/edge-1609-dc3-dc4/inventory-dc3
@@ -0,0 +1,87 @@
+[tag_Name_dc3_n1]
+[tag_Name_dc3_n2]
+[tag_Name_dc3_n3]
+[tag_Name_dc3_n4]
+[tag_Name_dc3_n5]
+[tag_Name_dc3_n6]
+[tag_Name_dc3_n7]
+[tag_Name_dc3_n8]
+[tag_Name_dc3_n9]
+[tag_Name_dc3_n10]
+[tag_Name_dc3_n11]
+
+[planet:children]
+dc-1
+
+[dc-1:children]
+tag_Name_dc3_n1
+tag_Name_dc3_n2
+tag_Name_dc3_n3
+tag_Name_dc3_n4
+tag_Name_dc3_n5
+tag_Name_dc3_n6
+tag_Name_dc3_n7
+tag_Name_dc3_n8
+tag_Name_dc3_n9
+tag_Name_dc3_n10
+tag_Name_dc3_n11
+
+[ds:children]
+dc-1-ds
+
+[dc-1-ds:children]
+tag_Name_dc3_n2
+tag_Name_dc3_n3
+tag_Name_dc3_n4
+
+[ms:children]
+dc-1-ms
+
+[dc-1-ms:children]
+tag_Name_dc3_n1
+
+[ui:children]
+dc-1-ui
+
+[dc-1-ui:children]
+tag_Name_dc3_n1
+
+[ldap:children]
+dc-1-ldap
+
+[dc-1-ldap:children]
+tag_Name_dc3_n1
+
+[rmp:children]
+dc-1-rmp
+
+[dc-1-rmp:children]
+tag_Name_dc3_n5
+tag_Name_dc3_n6
+
+[qpid:children]
+dc-1-qpid
+
+[dc-1-qpid:children]
+tag_Name_dc3_n7
+tag_Name_dc3_n8
+
+[pg:children]
+dc-1-pg
+
+[dc-1-pg:children]
+tag_Name_dc3_n9
+tag_Name_dc3_n10
+
+[pgmaster:children]
+dc-1-pgmaster
+
+[dc-1-pgmaster:children]
+tag_Name_dc3_n9
+
+[pgstandby:children]
+dc-1-pgstandby
+
+[dc-1-pgstandby:children]
+tag_Name_dc3_n10
+
diff --git a/edge-1609-dc3-dc4/inventory-dc4 b/edge-1609-dc3-dc4/inventory-dc4
new file mode 100644
index 0000000..f97de72
--- /dev/null
+++ b/edge-1609-dc3-dc4/inventory-dc4
@@ -0,0 +1,87 @@
+[tag_Name_dc4_n1]
+[tag_Name_dc4_n2]
+[tag_Name_dc4_n3]
+[tag_Name_dc4_n4]
+[tag_Name_dc4_n5]
+[tag_Name_dc4_n6]
+[tag_Name_dc4_n7]
+[tag_Name_dc4_n8]
+[tag_Name_dc4_n9]
+[tag_Name_dc4_n10]
+[tag_Name_dc4_n11]
+
+[planet:children]
+dc-2
+
+[dc-2:children]
+tag_Name_dc4_n1
+tag_Name_dc4_n2
+tag_Name_dc4_n3
+tag_Name_dc4_n4
+tag_Name_dc4_n5
+tag_Name_dc4_n6
+tag_Name_dc4_n7
+tag_Name_dc4_n8
+tag_Name_dc4_n9
+tag_Name_dc4_n10
+tag_Name_dc4_n11
+
+[ds:children]
+dc-2-ds
+
+[dc-2-ds:children]
+tag_Name_dc4_n2
+tag_Name_dc4_n3
+tag_Name_dc4_n4
+
+[ms:children]
+dc-2-ms
+
+[dc-2-ms:children]
+tag_Name_dc4_n1
+
+[ui:children]
+dc-2-ui
+
+[dc-2-ui:children]
+tag_Name_dc4_n1
+
+[ldap:children]
+dc-2-ldap
+
+[dc-2-ldap:children]
+tag_Name_dc4_n1
+
+[rmp:children]
+dc-2-rmp
+
+[dc-2-rmp:children]
+tag_Name_dc4_n5
+tag_Name_dc4_n6
+
+[qpid:children]
+dc-2-qpid
+
+[dc-2-qpid:children]
+tag_Name_dc4_n7
+tag_Name_dc4_n8
+
+[pg:children]
+dc-2-pg
+
+[dc-2-pg:children]
+tag_Name_dc4_n9
+tag_Name_dc4_n10
+
+[pgmaster:children]
+dc-2-pgmaster
+
+[dc-2-pgmaster:children]
+tag_Name_dc4_n9
+
+[pgstandby:children]
+dc-2-pgstandby
+
+[dc-2-pgstandby:children]
+tag_Name_dc4_n10
+
