added dc-3 tags
diff --git a/installation.yml b/installation.yml
index f1c5b12..8a9737e 100644
--- a/installation.yml
+++ b/installation.yml
@@ -47,6 +47,7 @@
     jdk_version: '1.8'
   tags:
   - ds
+  - ds-3
 
 - include: components/opdk-install-component.yml
   vars:
@@ -55,6 +56,7 @@
     jdk_version: '1.8'
   tags:
   - ds
+  - ds-2
 
 - include: components/opdk-install-component.yml
   vars:
@@ -64,6 +66,7 @@
     opdk_ldap_type: '2'
   tags:
   - ds
+  - ds-1
 
 - include: components/opdk-cassandra-rebuild.yml
   vars:
@@ -71,20 +74,23 @@
     jdk_version: '1.8'
   tags:
   - ms
+  - ms-3
 
-- include: components/opdk-cassandra-rebuild.yml
-  vars:
-    hosts: 'dc-2-ds'
-    jdk_version: '1.8'
-  tags:
-  - ms
+#- include: components/opdk-cassandra-rebuild.yml
+#  vars:
+#    hosts: 'dc-2-ds'
+#    jdk_version: '1.8'
+#  tags:
+#  - ms
+#  - ms-2
 
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-3-rmp'
-    reachability: 'false'
-  tags:
-  - rmp
+#- include: configuration/opdk-set-reachable.yml
+#  vars:
+#    hosts: 'dc-3-rmp'
+#    reachability: 'false'
+#  tags:
+#  - rmp
+#  - rmp-3
 
 - include: components/opdk-install-component.yml
   vars:
@@ -93,13 +99,15 @@
     jdk_version: '1.8'
   tags:
   - rmp
+  - rmp-3
 
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-3-rmp'
-    reachability: 'true'
-  tags:
-  - rmp
+#- include: configuration/opdk-set-reachable.yml
+#  vars:
+#    hosts: 'dc-3-rmp'
+#    reachability: 'true'
+#  tags:
+#  - rmp
+#  - rmp-3
 
 - include: configuration/opdk-set-reachable.yml
   vars:
@@ -107,6 +115,7 @@
     reachability: 'false'
   tags:
   - rmp
+  - rmp-2
 
 - include: components/opdk-install-component.yml
   vars:
@@ -115,6 +124,7 @@
     jdk_version: '1.8'
   tags:
   - rmp
+  - rmp-2
 
 - include: configuration/opdk-set-reachable.yml
   vars:
@@ -122,6 +132,7 @@
     reachability: 'true'
   tags:
   - rmp
+  - rmp-2
 
 - include: configuration/opdk-set-reachable.yml
   vars:
@@ -129,6 +140,7 @@
     reachability: 'false'
   tags:
   - rmp
+  - rmp-1
 
 - include: components/opdk-install-component.yml
   vars:
@@ -137,6 +149,7 @@
     jdk_version: '1.8'
   tags:
   - rmp
+  - rmp-1
 
 - include: configuration/opdk-set-reachable.yml
   vars:
@@ -144,6 +157,7 @@
     reachability: 'true'
   tags:
   - rmp
+  - rmp-1
 
 - include: components/opdk-install-component.yml
   vars:
@@ -152,6 +166,7 @@
     jdk_version: '1.8'
   tags:
   - qpid
+  - qpid-3
   - qpid-installer
 
 - include: components/opdk-setup-qpid-add.yml
@@ -159,6 +174,7 @@
     hosts: 'dc-3-qpid'
   tags:
   - qpid
+  - qpid-3
   - qpid-add
 
 - include: components/opdk-install-component.yml
@@ -168,12 +184,14 @@
     jdk_version: '1.8'
   tags:
   - qpid
+  - qpid-2
 
 - include: components/opdk-setup-qpid-add.yml
   vars:
     hosts: 'dc-2-qpid'
   tags:
   - qpid
+  - qpid-2
   - qpid-add
 
 - include: validations/opdk-setup-validate.yml
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 0000000..7abfa9f
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,82 @@
+---
+- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
+
+- src: https://github.com/carlosfrias/apigee-opdk-time-sync
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-component
+
+- src: https://github.com/carlosfrias/apigee-opdk-set-reachable
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
+
+- src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-org
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-validate
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
+
+- src: https://github.com/carlosfrias/apigee-fetch-files
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-status
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ldap
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-cassandra
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-zookeeper
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ms
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-postgres
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-router
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-qpid
+
+- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ui
+
+- src: https://github.com/carlosfrias/apigee-opdk-enable-swap
+
+- src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild
+
+- src: https://github.com/carlosfrias/apigee-opdk-cassandra-client-update
+
+- src: https://github.com/carlosfrias/apigee-opdk-start-components.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-qpid-add.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-postgresql-add.git
diff --git a/validations/opdk-server-self.yml b/validations/opdk-server-self.yml
index 79b61ba..9df5396 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -4,24 +4,26 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain router server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'router'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-  - debug: var="edge_router_self"
+  - { role: apigee-opdk-server-self, server_type: 'router' }
+  - { role: apigee-opdk-server-self, server_type: 'mp' }
 
-  - name: Obtain message processor server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'mp'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_mp_self"
+#  tasks:
+#  - name: Obtain router server self report
+#    ignore_errors: yes
+#    opdk_server_self:
+#      server_type: 'router'
+#      username: '{{ opdk_user_email }}'
+#      password: '{{ opdk_user_pass }}'
+#  - debug: var="edge_router_self"
+#
+#  - name: Obtain message processor server self report
+#    ignore_errors: yes
+#    opdk_server_self:
+#      server_type: 'mp'
+#      username: '{{ opdk_user_email }}'
+#      password: '{{ opdk_user_pass }}'
+#
+#  - debug: var="edge_mp_self"
 
 
 - hosts: pg
@@ -29,16 +31,16 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain postgres server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'ps'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_ps_self"
+  - { role: apigee-opdk-server-self, server_type: 'ps' }
+#  tasks:
+#  - name: Obtain postgres server self report
+#    ignore_errors: yes
+#    opdk_server_self:
+#      server_type: 'ps'
+#      username: '{{ opdk_user_email }}'
+#      password: '{{ opdk_user_pass }}'
+#
+#  - debug: var="edge_ps_self"
 
 
 - hosts: qpid
@@ -46,16 +48,16 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain qpid server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'qs'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_qs_self"
+  - { role: apigee-opdk-server-self, server_type: 'qs' }
+#  tasks:
+#  - name: Obtain qpid server self report
+#    ignore_errors: yes
+#    opdk_server_self:
+#      server_type: 'qs'
+#      username: '{{ opdk_user_email }}'
+#      password: '{{ opdk_user_pass }}'
+#
+#  - debug: var="edge_qs_self"
 
 
 - hosts: ms
@@ -63,14 +65,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Obtain management server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'ms'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - debug: var="edge_ms_self"
+  - { role: apigee-opdk-server-self, server_type: 'ms' }
+#  tasks:
+#  - name: Obtain management server self report
+#    ignore_errors: yes
+#    opdk_server_self:
+#      server_type: 'ms'
+#      username: '{{ opdk_user_email }}'
+#      password: '{{ opdk_user_pass }}'
+#
+#  - debug: var="edge_ms_self"