Updated folder semantics to better reflect work performed
diff --git a/installations/dc1/components/opdk-install-component.yml b/installations/dc1/components/opdk-install-component.yml
deleted file mode 100644
index b2b370f..0000000
--- a/installations/dc1/components/opdk-install-component.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-default-settings
- - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
- tags:
- - apigee-component
diff --git a/installations/dc1/components/opdk-pre-requisites.yml b/installations/dc1/components/opdk-pre-requisites.yml
deleted file mode 100644
index 9071b44..0000000
--- a/installations/dc1/components/opdk-pre-requisites.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-apigee-user
- tags:
- - apigee-user
- - apigee-pre-req
-
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-os-limits
-# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
- tags:
- - apigee-pre-req
- - apigee-tuning
-
-- hosts: '{{ hosts }}'
- strategy: free
- roles:
- - apigee-opdk-setup-openjdk
- tags:
- - apigee-pre-req
- - openjdk
-
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-bootstrap
- tags:
- - apigee-pre-req
- - apigee-bootstrap
-
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-silent-installation-config
- - apigee-opdk-setup-component-installer
-# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
- tags:
- - apigee-pre-req
- - apigee-installer
diff --git a/installations/dc1/components/opdk-setup-postgres-master.yml b/installations/dc1/components/opdk-setup-postgres-master.yml
deleted file mode 100644
index 1fa4f95..0000000
--- a/installations/dc1/components/opdk-setup-postgres-master.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-postgres-master
- tags:
- - pgmaster
diff --git a/installations/dc1/components/opdk-setup-postgres-standby.yml b/installations/dc1/components/opdk-setup-postgres-standby.yml
deleted file mode 100644
index a8dbba2..0000000
--- a/installations/dc1/components/opdk-setup-postgres-standby.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-postgres-standby
- tags:
- - pgstandby
diff --git a/installations/dc1/configuration/opdk-set-reachable.yml b/installations/dc1/configuration/opdk-set-reachable.yml
deleted file mode 100644
index 0a5eb9d..0000000
--- a/installations/dc1/configuration/opdk-set-reachable.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
- - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
- tags:
- - reachability
\ No newline at end of file
diff --git a/installations/dc1/configuration/opdk-setup-os.yml b/installations/dc1/configuration/opdk-setup-os.yml
deleted file mode 100644
index b0461fe..0000000
--- a/installations/dc1/configuration/opdk-setup-os.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- hosts: '{{ hosts }}'
- become: yes
- gather_facts: no
- strategy: free
- pre_tasks:
- - name: Load credentials from file
- include_vars: '~/.apigee/credentials.yml'
- roles:
- - apigee-opdk-setup-os-minimum
- - apigee-opdk-setup-selinux-disable
- - apigee-opdk-shutdown-iptables
- - apigee-opdk-time-sync
- - apigee-opdk-setup-os-common
-
diff --git a/installations/dc1/installation-rollback.yml b/installations/dc1/installation-rollback.yml
deleted file mode 100644
index 971818d..0000000
--- a/installations/dc1/installation-rollback.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- hosts: '{{ hosts }}'
- vars:
- remove_apigee: false
- roles:
- - apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml b/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml
deleted file mode 100644
index 0e5d7bc..0000000
--- a/installations/dc1/validations/opdk-internal-port-connectivity-validator.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-
-- hosts: rmp
- roles:
- - apigee-internal-port-connectivity-validator-mp
-
-- hosts: ldap
- roles:
- - apigee-internal-port-connectivity-validator-ldap
-
-- hosts: ds
- roles:
- - apigee-internal-port-connectivity-validator-cassandra
-
-- hosts: ds
- roles:
- - apigee-internal-port-connectivity-validator-zookeeper
-
-- hosts: ms
- roles:
- - apigee-internal-port-connectivity-validator-ms
-
-- hosts: pg
- roles:
- - apigee-internal-port-connectivity-validator-postgres
-
-- hosts: rmp
- roles:
- - apigee-internal-port-connectivity-validator-router
-
-- hosts: qpid
- roles:
- - apigee-internal-port-connectivity-validator-qpid
-
-- hosts: ui
- roles:
- - apigee-internal-port-connectivity-validator-ui
-
diff --git a/installations/dc2/README.md b/installations/dc2/README.md
deleted file mode 100644
index 24eb4e6..0000000
--- a/installations/dc2/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Apigee OPDK Installation to add Second Data Center to an Existing Data Center
-=============================================================================
-
-# Ansible Roles
-
-The following ansible roles will be installed with the requirements.yml file:
-
-* [opdk-setup-apigee-user](https://github.com/carlosfrias/apigee-opdk-setup-apigee-user)
-* [opdk-setup-os-common](https://github.com/carlosfrias/apigee-opdk-setup-os-common)
-* [opdk-setup-os-ds](https://github.com/carlosfrias/apigee-opdk-setup-os-ds)
-* [opdk-setup-os-minimum](https://github.com/carlosfrias/apigee-opdk-setup-os-minimum)
-* [opdk-setup-default-settings](https://github.com/carlosfrias/apigee-opdk-setup-default-settings)
-* [opdk-time-sync](https://github.com/carlosfrias/apigee-opdk-time-sync)
-* [opdk-setup-openjdk](https://github.com/carlosfrias/apigee-opdk-setup-openjdk)
-* [opdk-setup-bootstrap](https://github.com/carlosfrias/apigee-opdk-setup-bootstrap)
-* [opdk-setup-silent-installation-config](https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config)
-* [opdk-setup-component](https://github.com/carlosfrias/apigee-opdk-setup-component)
-* [opdk-setup-component-installer](https://github.com/carlosfrias/apigee-opdk-setup-component-installer)
-* [opdk-setup-selinux-disable](https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable)
-* [opdk-shutdown-iptables](https://github.com/carlosfrias/apigee-opdk-shutdown-iptables)
-* [opdk-setup-org-config](https://github.com/carlosfrias/apigee-opdk-setup-org-config)
-* [opdk-setup-org](https://github.com/carlosfrias/apigee-opdk-setup-org)
-* [opdk-setup-validate](https://github.com/carlosfrias/apigee-opdk-setup-validate)
-* [opdk-setup-validate-cleanup](https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup)
-* [opdk-setup-apigee-log-files](https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files)
-* [fetch-files](https://github.com/carlosfrias/apigee-fetch-files)
-
diff --git a/installations/dc2/clean.yml b/installations/dc2/clean.yml
deleted file mode 100644
index 489da83..0000000
--- a/installations/dc2/clean.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: localhost
- connection: local
- tasks:
- - name: Clean files
- async: 0
- poll: 0
- ignore_errors: yes
- file:
- path: '{{ item }}'
- state: absent
- with_items:
- - '~/.ansible/tmp/cache'
- - '~/.ansible/tmp/ansible.log'
- - '~/.apigee/ssh_keys'
- - '~/.apigee/logs'
- - '~/.apigee/configs'
- - '~/.apigee/logs_configs'
-
-
diff --git a/installations/dc2/components/opdk-cassandra-client-update.yml b/installations/dc2/components/opdk-cassandra-client-update.yml
deleted file mode 100644
index 461ecd9..0000000
--- a/installations/dc2/components/opdk-cassandra-client-update.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
- roles:
- - apigee-opdk-start-components
- - apigee-opdk-cassandra-client-update
- tags:
- - c-update
\ No newline at end of file
diff --git a/installations/dc2/components/opdk-cassandra-rebuild.yml b/installations/dc2/components/opdk-cassandra-rebuild.yml
deleted file mode 100644
index ac712e1..0000000
--- a/installations/dc2/components/opdk-cassandra-rebuild.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
- vars:
- opdk_region: dc-1
- roles:
- - apigee-opdk-cassandra-rebuild
- tags:
- - c-rebuild
diff --git a/installations/dc2/components/opdk-install-component.yml b/installations/dc2/components/opdk-install-component.yml
deleted file mode 100644
index b2b370f..0000000
--- a/installations/dc2/components/opdk-install-component.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-default-settings
- - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
- tags:
- - apigee-component
diff --git a/installations/dc2/components/opdk-pre-requisites.yml b/installations/dc2/components/opdk-pre-requisites.yml
deleted file mode 100644
index 9071b44..0000000
--- a/installations/dc2/components/opdk-pre-requisites.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-apigee-user
- tags:
- - apigee-user
- - apigee-pre-req
-
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-os-limits
-# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
- tags:
- - apigee-pre-req
- - apigee-tuning
-
-- hosts: '{{ hosts }}'
- strategy: free
- roles:
- - apigee-opdk-setup-openjdk
- tags:
- - apigee-pre-req
- - openjdk
-
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-bootstrap
- tags:
- - apigee-pre-req
- - apigee-bootstrap
-
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-silent-installation-config
- - apigee-opdk-setup-component-installer
-# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
- tags:
- - apigee-pre-req
- - apigee-installer
diff --git a/installations/dc2/components/opdk-setup-postgres-common.yml b/installations/dc2/components/opdk-setup-postgres-common.yml
deleted file mode 100644
index 7015614..0000000
--- a/installations/dc2/components/opdk-setup-postgres-common.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-enable-swap
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-apigee-user
- - apigee-opdk-setup-os-postgres
- - apigee-opdk-setup-postgres-config
-
-- include: opdk-install-component.yml
- vars:
- hosts: '{{ hosts }}'
- component_profile: 'ps'
-
-- include: 'opdk-setup-postgres-{{ pg_component }}.yml'
- when: pg_component is defined
-
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-default-settings
- tasks:
- - name: Obtain server self report
- opdk_server_self:
- server_type: 'ps'
- username: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
- ignore_errors: yes
diff --git a/installations/dc2/components/opdk-setup-postgres-master.yml b/installations/dc2/components/opdk-setup-postgres-master.yml
deleted file mode 100644
index 1fa4f95..0000000
--- a/installations/dc2/components/opdk-setup-postgres-master.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-postgres-master
- tags:
- - pgmaster
diff --git a/installations/dc2/components/opdk-setup-postgres-standby.yml b/installations/dc2/components/opdk-setup-postgres-standby.yml
deleted file mode 100644
index a8dbba2..0000000
--- a/installations/dc2/components/opdk-setup-postgres-standby.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-postgres-standby
- tags:
- - pgstandby
diff --git a/installations/dc2/configuration/load-opdk-credentials.yml b/installations/dc2/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/dc2/configuration/load-opdk-credentials.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
- become: yes
- gather_facts: no
- strategy: free
- tasks:
- - name: Load credentials from file
- include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/installations/dc2/configuration/opdk-set-reachable.yml b/installations/dc2/configuration/opdk-set-reachable.yml
deleted file mode 100644
index 0a5eb9d..0000000
--- a/installations/dc2/configuration/opdk-set-reachable.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
- - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
- tags:
- - reachability
\ No newline at end of file
diff --git a/installations/dc2/configuration/opdk-setup-org-config.yml b/installations/dc2/configuration/opdk-setup-org-config.yml
deleted file mode 100644
index 6b2e672..0000000
--- a/installations/dc2/configuration/opdk-setup-org-config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
- strategy: free
- vars_files:
- - ~/.apigee/credentials.yml
- roles:
- - apigee-opdk-setup-org-config
-
diff --git a/installations/dc2/configuration/opdk-setup-org.yml b/installations/dc2/configuration/opdk-setup-org.yml
deleted file mode 100644
index 002ae70..0000000
--- a/installations/dc2/configuration/opdk-setup-org.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
- vars_files:
- - ~/.apigee/credentials.yml
- strategy: free
- roles:
- - apigee-opdk-setup-org
diff --git a/installations/dc2/configuration/opdk-setup-os.yml b/installations/dc2/configuration/opdk-setup-os.yml
deleted file mode 100644
index b0461fe..0000000
--- a/installations/dc2/configuration/opdk-setup-os.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- hosts: '{{ hosts }}'
- become: yes
- gather_facts: no
- strategy: free
- pre_tasks:
- - name: Load credentials from file
- include_vars: '~/.apigee/credentials.yml'
- roles:
- - apigee-opdk-setup-os-minimum
- - apigee-opdk-setup-selinux-disable
- - apigee-opdk-shutdown-iptables
- - apigee-opdk-time-sync
- - apigee-opdk-setup-os-common
-
diff --git a/installations/dc2/configuration/update-user.yml b/installations/dc2/configuration/update-user.yml
deleted file mode 100644
index 0fb0e4e..0000000
--- a/installations/dc2/configuration/update-user.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- hosts: '{{ hosts }}'
- become: yes
- vars:
- pubkey: '~/.ssh/id_rsa.pub'
-
- vars_files:
- - ~/.apigee/credentials.yml
-
- tasks:
- - name: Build EC2 facts cache
- ec2_facts:
-
- - name: Build setup facts cache
- setup:
-
- - name: Copy local public keys to server for user {{ user }}
- authorized_key:
- user: '{{ user }}'
- state: present
- key: "{{ lookup('file', '{{ pubkey }}') }}"
-
- - name: Permit root login over SSH
- lineinfile:
- state: present
- dest: /etc/ssh/sshd_config
- regexp: '(^#)(PermitRootLogin yes)'
- line: '\2'
- backrefs: yes
- notify:
- - Restart SSH service
- when: user == 'root'
-
- handlers:
- - name: Restart SSH service
- service:
- name: sshd
- state: restarted
diff --git a/installations/dc2/configuration/update_cache.yml b/installations/dc2/configuration/update_cache.yml
deleted file mode 100644
index 2a3b521..0000000
--- a/installations/dc2/configuration/update_cache.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: planet
- vars_files:
- - ~/.apigee/credentials.yml
- pre_tasks:
- - setup:
-
- - ec2_facts:
- when: "{{ ansible_bios_version | lower | search('amazon') }}"
-
- roles:
- - apigee-opdk-setup-default-settings
-
diff --git a/installations/dc2/installation-rollback.yml b/installations/dc2/installation-rollback.yml
deleted file mode 100644
index 971818d..0000000
--- a/installations/dc2/installation-rollback.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- hosts: '{{ hosts }}'
- vars:
- remove_apigee: false
- roles:
- - apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/dc2/requirements.yml b/installations/dc2/requirements.yml
deleted file mode 100644
index 181d698..0000000
--- a/installations/dc2/requirements.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-- 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
diff --git a/installations/dc2/validations/opdk-internal-port-connectivity-validator.yml b/installations/dc2/validations/opdk-internal-port-connectivity-validator.yml
deleted file mode 100644
index 0e5d7bc..0000000
--- a/installations/dc2/validations/opdk-internal-port-connectivity-validator.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-
-- hosts: rmp
- roles:
- - apigee-internal-port-connectivity-validator-mp
-
-- hosts: ldap
- roles:
- - apigee-internal-port-connectivity-validator-ldap
-
-- hosts: ds
- roles:
- - apigee-internal-port-connectivity-validator-cassandra
-
-- hosts: ds
- roles:
- - apigee-internal-port-connectivity-validator-zookeeper
-
-- hosts: ms
- roles:
- - apigee-internal-port-connectivity-validator-ms
-
-- hosts: pg
- roles:
- - apigee-internal-port-connectivity-validator-postgres
-
-- hosts: rmp
- roles:
- - apigee-internal-port-connectivity-validator-router
-
-- hosts: qpid
- roles:
- - apigee-internal-port-connectivity-validator-qpid
-
-- hosts: ui
- roles:
- - apigee-internal-port-connectivity-validator-ui
-
diff --git a/installations/dc2/validations/opdk-server-self.yml b/installations/dc2/validations/opdk-server-self.yml
deleted file mode 100644
index c95adcf..0000000
--- a/installations/dc2/validations/opdk-server-self.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- hosts: rmp
- serial: 1
- 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"
-
- - 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
- serial: 1
- 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"
-
-
-- hosts: qpid
- serial: 1
- 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"
-
-
-- hosts: ms
- serial: 1
- 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"
-
diff --git a/installations/dc2/validations/opdk-setup-log-files.yml b/installations/dc2/validations/opdk-setup-log-files.yml
deleted file mode 100644
index 7fd87c6..0000000
--- a/installations/dc2/validations/opdk-setup-log-files.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- hosts: planet
- become: true
- strategy: free
- roles:
- - apigee-opdk-setup-default-settings
- - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
- tags:
- - logs
- - os-logs
-
-- hosts: planet
- become: true
- strategy: free
- roles:
- - apigee-opdk-setup-default-settings
- - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
- tags:
- - logs
- - apigee-logs
-
-- hosts: planet
- become: true
- strategy: free
- roles:
- - apigee-opdk-setup-default-settings
- - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
- tags:
- - logs
- - config-logs
diff --git a/installations/dc2/validations/opdk-setup-status.yml b/installations/dc2/validations/opdk-setup-status.yml
deleted file mode 100644
index a5dff3e..0000000
--- a/installations/dc2/validations/opdk-setup-status.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
- roles:
- - apigee-opdk-setup-status
- tags:
- - status
diff --git a/installations/dc2/validations/opdk-setup-validate.yml b/installations/dc2/validations/opdk-setup-validate.yml
deleted file mode 100644
index 861f295..0000000
--- a/installations/dc2/validations/opdk-setup-validate.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-validate
- tags:
- - validate
-
-- hosts: '{{ hosts }}'
- serial: 1
- roles:
- - apigee-opdk-setup-default-settings
- - apigee-opdk-setup-validate-cleanup
- tags:
- - validate-cleanup
diff --git a/installations/dc1/README.md b/installations/edge-region-update/README.md
similarity index 100%
rename from installations/dc1/README.md
rename to installations/edge-region-update/README.md
diff --git a/installations/updates/clean.yml b/installations/edge-region-update/clean.yml
similarity index 100%
rename from installations/updates/clean.yml
rename to installations/edge-region-update/clean.yml
diff --git a/installations/updates/components/opdk-update-component.yml b/installations/edge-region-update/components/opdk-update-component.yml
similarity index 100%
rename from installations/updates/components/opdk-update-component.yml
rename to installations/edge-region-update/components/opdk-update-component.yml
diff --git a/installations/dc1/configuration/load-opdk-credentials.yml b/installations/edge-region-update/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/dc1/configuration/load-opdk-credentials.yml
rename to installations/edge-region-update/configuration/load-opdk-credentials.yml
diff --git a/installations/updates/configuration/update_cache.yml b/installations/edge-region-update/configuration/update_cache.yml
similarity index 100%
rename from installations/updates/configuration/update_cache.yml
rename to installations/edge-region-update/configuration/update_cache.yml
diff --git a/installations/dc1/requirements.yml b/installations/edge-region-update/requirements.yml
similarity index 100%
rename from installations/dc1/requirements.yml
rename to installations/edge-region-update/requirements.yml
diff --git a/installations/updates/resources/postgresql.properties.j2 b/installations/edge-region-update/resources/postgresql.properties.j2
similarity index 100%
rename from installations/updates/resources/postgresql.properties.j2
rename to installations/edge-region-update/resources/postgresql.properties.j2
diff --git a/installations/updates/update.yml b/installations/edge-region-update/update.yml
similarity index 100%
rename from installations/updates/update.yml
rename to installations/edge-region-update/update.yml
diff --git a/installations/dc2-expansion/README.md b/installations/expansion-to-second-region/README.md
similarity index 100%
copy from installations/dc2-expansion/README.md
copy to installations/expansion-to-second-region/README.md
diff --git a/installations/dc1/clean.yml b/installations/expansion-to-second-region/clean.yml
similarity index 100%
rename from installations/dc1/clean.yml
rename to installations/expansion-to-second-region/clean.yml
diff --git a/installations/dc2-expansion/components/opdk-cassandra-client-update.yml b/installations/expansion-to-second-region/components/opdk-cassandra-client-update.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-cassandra-client-update.yml
copy to installations/expansion-to-second-region/components/opdk-cassandra-client-update.yml
diff --git a/installations/dc2-expansion/components/opdk-cassandra-rebuild.yml b/installations/expansion-to-second-region/components/opdk-cassandra-rebuild.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-cassandra-rebuild.yml
copy to installations/expansion-to-second-region/components/opdk-cassandra-rebuild.yml
diff --git a/installations/dc2-expansion/components/opdk-install-component.yml b/installations/expansion-to-second-region/components/opdk-install-component.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-install-component.yml
copy to installations/expansion-to-second-region/components/opdk-install-component.yml
diff --git a/installations/dc2-expansion/components/opdk-pre-requisites.yml b/installations/expansion-to-second-region/components/opdk-pre-requisites.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-pre-requisites.yml
copy to installations/expansion-to-second-region/components/opdk-pre-requisites.yml
diff --git a/installations/dc1/components/opdk-setup-postgres-common.yml b/installations/expansion-to-second-region/components/opdk-setup-postgres-common.yml
similarity index 100%
rename from installations/dc1/components/opdk-setup-postgres-common.yml
rename to installations/expansion-to-second-region/components/opdk-setup-postgres-common.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-master.yml b/installations/expansion-to-second-region/components/opdk-setup-postgres-master.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-setup-postgres-master.yml
copy to installations/expansion-to-second-region/components/opdk-setup-postgres-master.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-standby.yml b/installations/expansion-to-second-region/components/opdk-setup-postgres-standby.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-setup-postgres-standby.yml
copy to installations/expansion-to-second-region/components/opdk-setup-postgres-standby.yml
diff --git a/installations/dc2-expansion/configuration/load-opdk-credentials.yml b/installations/expansion-to-second-region/configuration/load-opdk-credentials.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/load-opdk-credentials.yml
copy to installations/expansion-to-second-region/configuration/load-opdk-credentials.yml
diff --git a/installations/dc2-expansion/configuration/opdk-set-reachable.yml b/installations/expansion-to-second-region/configuration/opdk-set-reachable.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/opdk-set-reachable.yml
copy to installations/expansion-to-second-region/configuration/opdk-set-reachable.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-org-config.yml b/installations/expansion-to-second-region/configuration/opdk-setup-org-config.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/opdk-setup-org-config.yml
copy to installations/expansion-to-second-region/configuration/opdk-setup-org-config.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-org.yml b/installations/expansion-to-second-region/configuration/opdk-setup-org.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/opdk-setup-org.yml
copy to installations/expansion-to-second-region/configuration/opdk-setup-org.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-os.yml b/installations/expansion-to-second-region/configuration/opdk-setup-os.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/opdk-setup-os.yml
copy to installations/expansion-to-second-region/configuration/opdk-setup-os.yml
diff --git a/installations/dc2-expansion/configuration/update-user.yml b/installations/expansion-to-second-region/configuration/update-user.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/update-user.yml
copy to installations/expansion-to-second-region/configuration/update-user.yml
diff --git a/installations/dc2-expansion/configuration/update_cache.yml b/installations/expansion-to-second-region/configuration/update_cache.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/update_cache.yml
copy to installations/expansion-to-second-region/configuration/update_cache.yml
diff --git a/installations/dc2-expansion/installation-rollback.yml b/installations/expansion-to-second-region/installation-rollback.yml
similarity index 100%
copy from installations/dc2-expansion/installation-rollback.yml
copy to installations/expansion-to-second-region/installation-rollback.yml
diff --git a/installations/dc2/installation.yml b/installations/expansion-to-second-region/installation.yml
similarity index 100%
rename from installations/dc2/installation.yml
rename to installations/expansion-to-second-region/installation.yml
diff --git a/installations/dc2-expansion/requirements.yml b/installations/expansion-to-second-region/requirements.yml
similarity index 100%
copy from installations/dc2-expansion/requirements.yml
copy to installations/expansion-to-second-region/requirements.yml
diff --git a/installations/dc2-expansion/validations/opdk-internal-port-connectivity-validator.yml b/installations/expansion-to-second-region/validations/opdk-internal-port-connectivity-validator.yml
similarity index 100%
copy from installations/dc2-expansion/validations/opdk-internal-port-connectivity-validator.yml
copy to installations/expansion-to-second-region/validations/opdk-internal-port-connectivity-validator.yml
diff --git a/installations/dc2-expansion/validations/opdk-server-self.yml b/installations/expansion-to-second-region/validations/opdk-server-self.yml
similarity index 100%
copy from installations/dc2-expansion/validations/opdk-server-self.yml
copy to installations/expansion-to-second-region/validations/opdk-server-self.yml
diff --git a/installations/dc1/validations/opdk-setup-log-files.yml b/installations/expansion-to-second-region/validations/opdk-setup-log-files.yml
similarity index 100%
rename from installations/dc1/validations/opdk-setup-log-files.yml
rename to installations/expansion-to-second-region/validations/opdk-setup-log-files.yml
diff --git a/installations/dc2-expansion/validations/opdk-setup-status.yml b/installations/expansion-to-second-region/validations/opdk-setup-status.yml
similarity index 100%
copy from installations/dc2-expansion/validations/opdk-setup-status.yml
copy to installations/expansion-to-second-region/validations/opdk-setup-status.yml
diff --git a/installations/dc2-expansion/validations/opdk-setup-validate.yml b/installations/expansion-to-second-region/validations/opdk-setup-validate.yml
similarity index 100%
copy from installations/dc2-expansion/validations/opdk-setup-validate.yml
copy to installations/expansion-to-second-region/validations/opdk-setup-validate.yml
diff --git a/installations/dc1/README.md b/installations/single-region-installation/README.md
similarity index 100%
copy from installations/dc1/README.md
copy to installations/single-region-installation/README.md
diff --git a/installations/dc1/clean.yml b/installations/single-region-installation/clean.yml
similarity index 100%
copy from installations/dc1/clean.yml
copy to installations/single-region-installation/clean.yml
diff --git a/installations/dc2-expansion/components/opdk-install-component.yml b/installations/single-region-installation/components/opdk-install-component.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-install-component.yml
copy to installations/single-region-installation/components/opdk-install-component.yml
diff --git a/installations/dc2-expansion/components/opdk-pre-requisites.yml b/installations/single-region-installation/components/opdk-pre-requisites.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-pre-requisites.yml
copy to installations/single-region-installation/components/opdk-pre-requisites.yml
diff --git a/installations/dc1/components/opdk-setup-postgres-common.yml b/installations/single-region-installation/components/opdk-setup-postgres-common.yml
similarity index 100%
copy from installations/dc1/components/opdk-setup-postgres-common.yml
copy to installations/single-region-installation/components/opdk-setup-postgres-common.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-master.yml b/installations/single-region-installation/components/opdk-setup-postgres-master.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-setup-postgres-master.yml
copy to installations/single-region-installation/components/opdk-setup-postgres-master.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-standby.yml b/installations/single-region-installation/components/opdk-setup-postgres-standby.yml
similarity index 100%
copy from installations/dc2-expansion/components/opdk-setup-postgres-standby.yml
copy to installations/single-region-installation/components/opdk-setup-postgres-standby.yml
diff --git a/installations/dc2-expansion/configuration/load-opdk-credentials.yml b/installations/single-region-installation/configuration/load-opdk-credentials.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/load-opdk-credentials.yml
copy to installations/single-region-installation/configuration/load-opdk-credentials.yml
diff --git a/installations/dc2-expansion/configuration/opdk-set-reachable.yml b/installations/single-region-installation/configuration/opdk-set-reachable.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/opdk-set-reachable.yml
copy to installations/single-region-installation/configuration/opdk-set-reachable.yml
diff --git a/installations/dc1/configuration/opdk-setup-org-config.yml b/installations/single-region-installation/configuration/opdk-setup-org-config.yml
similarity index 100%
rename from installations/dc1/configuration/opdk-setup-org-config.yml
rename to installations/single-region-installation/configuration/opdk-setup-org-config.yml
diff --git a/installations/dc1/configuration/opdk-setup-org.yml b/installations/single-region-installation/configuration/opdk-setup-org.yml
similarity index 100%
rename from installations/dc1/configuration/opdk-setup-org.yml
rename to installations/single-region-installation/configuration/opdk-setup-org.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-os.yml b/installations/single-region-installation/configuration/opdk-setup-os.yml
similarity index 100%
copy from installations/dc2-expansion/configuration/opdk-setup-os.yml
copy to installations/single-region-installation/configuration/opdk-setup-os.yml
diff --git a/installations/dc1/configuration/update-user.yml b/installations/single-region-installation/configuration/update-user.yml
similarity index 100%
rename from installations/dc1/configuration/update-user.yml
rename to installations/single-region-installation/configuration/update-user.yml
diff --git a/installations/dc1/configuration/update_cache.yml b/installations/single-region-installation/configuration/update_cache.yml
similarity index 100%
rename from installations/dc1/configuration/update_cache.yml
rename to installations/single-region-installation/configuration/update_cache.yml
diff --git a/installations/dc2-expansion/installation-rollback.yml b/installations/single-region-installation/installation-rollback.yml
similarity index 100%
copy from installations/dc2-expansion/installation-rollback.yml
copy to installations/single-region-installation/installation-rollback.yml
diff --git a/installations/dc1/installation.yml b/installations/single-region-installation/installation.yml
similarity index 100%
rename from installations/dc1/installation.yml
rename to installations/single-region-installation/installation.yml
diff --git a/installations/dc1/requirements.yml b/installations/single-region-installation/requirements.yml
similarity index 100%
copy from installations/dc1/requirements.yml
copy to installations/single-region-installation/requirements.yml
diff --git a/installations/dc2-expansion/validations/opdk-internal-port-connectivity-validator.yml b/installations/single-region-installation/validations/opdk-internal-port-connectivity-validator.yml
similarity index 100%
copy from installations/dc2-expansion/validations/opdk-internal-port-connectivity-validator.yml
copy to installations/single-region-installation/validations/opdk-internal-port-connectivity-validator.yml
diff --git a/installations/dc1/validations/opdk-server-self.yml b/installations/single-region-installation/validations/opdk-server-self.yml
similarity index 100%
rename from installations/dc1/validations/opdk-server-self.yml
rename to installations/single-region-installation/validations/opdk-server-self.yml
diff --git a/installations/dc1/validations/opdk-setup-log-files.yml b/installations/single-region-installation/validations/opdk-setup-log-files.yml
similarity index 100%
copy from installations/dc1/validations/opdk-setup-log-files.yml
copy to installations/single-region-installation/validations/opdk-setup-log-files.yml
diff --git a/installations/dc1/validations/opdk-setup-status.yml b/installations/single-region-installation/validations/opdk-setup-status.yml
similarity index 100%
rename from installations/dc1/validations/opdk-setup-status.yml
rename to installations/single-region-installation/validations/opdk-setup-status.yml
diff --git a/installations/dc1/validations/opdk-setup-validate.yml b/installations/single-region-installation/validations/opdk-setup-validate.yml
similarity index 100%
rename from installations/dc1/validations/opdk-setup-validate.yml
rename to installations/single-region-installation/validations/opdk-setup-validate.yml
diff --git a/installations/dc2-expansion/README.md b/installations/two-region-installation/README.md
similarity index 100%
rename from installations/dc2-expansion/README.md
rename to installations/two-region-installation/README.md
diff --git a/installations/dc2-expansion/clean.yml b/installations/two-region-installation/clean.yml
similarity index 100%
rename from installations/dc2-expansion/clean.yml
rename to installations/two-region-installation/clean.yml
diff --git a/installations/dc2-expansion/components/opdk-cassandra-client-update.yml b/installations/two-region-installation/components/opdk-cassandra-client-update.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-cassandra-client-update.yml
rename to installations/two-region-installation/components/opdk-cassandra-client-update.yml
diff --git a/installations/dc2-expansion/components/opdk-cassandra-rebuild.yml b/installations/two-region-installation/components/opdk-cassandra-rebuild.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-cassandra-rebuild.yml
rename to installations/two-region-installation/components/opdk-cassandra-rebuild.yml
diff --git a/installations/dc2-expansion/components/opdk-install-component.yml b/installations/two-region-installation/components/opdk-install-component.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-install-component.yml
rename to installations/two-region-installation/components/opdk-install-component.yml
diff --git a/installations/dc2-expansion/components/opdk-pre-requisites.yml b/installations/two-region-installation/components/opdk-pre-requisites.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-pre-requisites.yml
rename to installations/two-region-installation/components/opdk-pre-requisites.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-common.yml b/installations/two-region-installation/components/opdk-setup-postgres-common.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-setup-postgres-common.yml
rename to installations/two-region-installation/components/opdk-setup-postgres-common.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-master.yml b/installations/two-region-installation/components/opdk-setup-postgres-master.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-setup-postgres-master.yml
rename to installations/two-region-installation/components/opdk-setup-postgres-master.yml
diff --git a/installations/dc2-expansion/components/opdk-setup-postgres-standby.yml b/installations/two-region-installation/components/opdk-setup-postgres-standby.yml
similarity index 100%
rename from installations/dc2-expansion/components/opdk-setup-postgres-standby.yml
rename to installations/two-region-installation/components/opdk-setup-postgres-standby.yml
diff --git a/installations/dc2-expansion/configuration/load-opdk-credentials.yml b/installations/two-region-installation/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/load-opdk-credentials.yml
rename to installations/two-region-installation/configuration/load-opdk-credentials.yml
diff --git a/installations/dc2-expansion/configuration/opdk-set-reachable.yml b/installations/two-region-installation/configuration/opdk-set-reachable.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/opdk-set-reachable.yml
rename to installations/two-region-installation/configuration/opdk-set-reachable.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-org-config.yml b/installations/two-region-installation/configuration/opdk-setup-org-config.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/opdk-setup-org-config.yml
rename to installations/two-region-installation/configuration/opdk-setup-org-config.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-org.yml b/installations/two-region-installation/configuration/opdk-setup-org.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/opdk-setup-org.yml
rename to installations/two-region-installation/configuration/opdk-setup-org.yml
diff --git a/installations/dc2-expansion/configuration/opdk-setup-os.yml b/installations/two-region-installation/configuration/opdk-setup-os.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/opdk-setup-os.yml
rename to installations/two-region-installation/configuration/opdk-setup-os.yml
diff --git a/installations/dc2-expansion/configuration/update-user.yml b/installations/two-region-installation/configuration/update-user.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/update-user.yml
rename to installations/two-region-installation/configuration/update-user.yml
diff --git a/installations/dc2-expansion/configuration/update_cache.yml b/installations/two-region-installation/configuration/update_cache.yml
similarity index 100%
rename from installations/dc2-expansion/configuration/update_cache.yml
rename to installations/two-region-installation/configuration/update_cache.yml
diff --git a/installations/dc2-expansion/installation-rollback.yml b/installations/two-region-installation/installation-rollback.yml
similarity index 100%
rename from installations/dc2-expansion/installation-rollback.yml
rename to installations/two-region-installation/installation-rollback.yml
diff --git a/installations/dc2-expansion/installation.yml b/installations/two-region-installation/installation.yml
similarity index 100%
rename from installations/dc2-expansion/installation.yml
rename to installations/two-region-installation/installation.yml
diff --git a/installations/dc2-expansion/requirements.yml b/installations/two-region-installation/requirements.yml
similarity index 100%
rename from installations/dc2-expansion/requirements.yml
rename to installations/two-region-installation/requirements.yml
diff --git a/installations/dc2-expansion/validations/opdk-internal-port-connectivity-validator.yml b/installations/two-region-installation/validations/opdk-internal-port-connectivity-validator.yml
similarity index 100%
rename from installations/dc2-expansion/validations/opdk-internal-port-connectivity-validator.yml
rename to installations/two-region-installation/validations/opdk-internal-port-connectivity-validator.yml
diff --git a/installations/dc2-expansion/validations/opdk-server-self.yml b/installations/two-region-installation/validations/opdk-server-self.yml
similarity index 100%
rename from installations/dc2-expansion/validations/opdk-server-self.yml
rename to installations/two-region-installation/validations/opdk-server-self.yml
diff --git a/installations/dc2-expansion/validations/opdk-setup-log-files.yml b/installations/two-region-installation/validations/opdk-setup-log-files.yml
similarity index 100%
rename from installations/dc2-expansion/validations/opdk-setup-log-files.yml
rename to installations/two-region-installation/validations/opdk-setup-log-files.yml
diff --git a/installations/dc2-expansion/validations/opdk-setup-status.yml b/installations/two-region-installation/validations/opdk-setup-status.yml
similarity index 100%
rename from installations/dc2-expansion/validations/opdk-setup-status.yml
rename to installations/two-region-installation/validations/opdk-setup-status.yml
diff --git a/installations/dc2-expansion/validations/opdk-setup-validate.yml b/installations/two-region-installation/validations/opdk-setup-validate.yml
similarity index 100%
rename from installations/dc2-expansion/validations/opdk-setup-validate.yml
rename to installations/two-region-installation/validations/opdk-setup-validate.yml
diff --git a/installations/updates/README.md b/installations/updates/README.md
deleted file mode 100644
index 3a23557..0000000
--- a/installations/updates/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Apigee OPDK Installation of a Single Data Center
-================================================
-
-# Ansible Roles
-
-The following ansible roles will be installed with the requirements.yml file:
-
-* [opdk-setup-apigee-user](https://github.com/carlosfrias/apigee-opdk-setup-apigee-user)
-* [opdk-setup-os-common](https://github.com/carlosfrias/apigee-opdk-setup-os-common)
-* [opdk-setup-os-ds](https://github.com/carlosfrias/apigee-opdk-setup-os-ds)
-* [opdk-setup-os-minimum](https://github.com/carlosfrias/apigee-opdk-setup-os-minimum)
-* [opdk-setup-default-settings](https://github.com/carlosfrias/apigee-opdk-setup-default-settings)
-* [opdk-time-sync](https://github.com/carlosfrias/apigee-opdk-time-sync)
-* [opdk-setup-openjdk](https://github.com/carlosfrias/apigee-opdk-setup-openjdk)
-* [opdk-setup-bootstrap](https://github.com/carlosfrias/apigee-opdk-setup-bootstrap)
-* [opdk-setup-silent-installation-config](https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config)
-* [opdk-setup-component](https://github.com/carlosfrias/apigee-opdk-setup-component)
-* [opdk-setup-component-installer](https://github.com/carlosfrias/apigee-opdk-setup-component-installer)
-* [opdk-setup-selinux-disable](https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable)
-* [opdk-shutdown-iptables](https://github.com/carlosfrias/apigee-opdk-shutdown-iptables)
-* [opdk-setup-org-config](https://github.com/carlosfrias/apigee-opdk-setup-org-config)
-* [opdk-setup-org](https://github.com/carlosfrias/apigee-opdk-setup-org)
-* [opdk-setup-validate](https://github.com/carlosfrias/apigee-opdk-setup-validate)
-* [opdk-setup-validate-cleanup](https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup)
-* [opdk-setup-apigee-log-files](https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files)
-* [fetch-files](https://github.com/carlosfrias/apigee-fetch-files)
-
diff --git a/installations/updates/configuration/load-opdk-credentials.yml b/installations/updates/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/updates/configuration/load-opdk-credentials.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
- become: yes
- gather_facts: no
- strategy: free
- tasks:
- - name: Load credentials from file
- include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/installations/updates/requirements.yml b/installations/updates/requirements.yml
deleted file mode 100644
index 371139b..0000000
--- a/installations/updates/requirements.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- 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
