diff --git a/apigee_mirror/README.md b/apigee_mirror/README.md
deleted file mode 100644
index ed803af..0000000
--- a/apigee_mirror/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Apigee Mirror Playbook Sample
-=============================
-
-This playbook demonstrate how to work with an Apigee OPDK mirror. This playbook creates an installation with the 
-components needed to carry out the following activities: 
- 
- * Create an Apigee Mirror
- * Retrieve an Apigee Mirror
- * Upload an Apigee Mirror
- * Install an Apigee Mirror
- 
-# Creating and Retrieving an Apigee Mirror
-Assuming you need to create an Apigee mirror, then you can use the following playbook with default settings to create a 
-minimum environment that will create and download an Apigee mirror: 
-
-    ansible-playbook create_download_apigee_mirror.yml -vv -b
-    
-## Create an Apigee Mirror
-Assuming you have a working instance of Apigee OPDK and you need to create an Apigee mirror with the playbook default 
-settings, then you can use the following:
-
-    ansible-playbook create_download_apigee_mirror.yml -vv -b --tags=create
-    
-## Retrieve an Apigee Mirror
-Assuming you have created an Apigee OPDK mirror with the default settings and you need to download an Apigee mirror, 
-then you can use the following playbook: 
- 
-    ansible-playbook create_download_apigee_mirror.yml -vv -b --tags=download
-
-# Uploading and Installing an Apigee Mirror
-Assuming you need to upload and install an Apigee mirror with the playbook default settings, then you can use the 
-following:
-   
-    ansible-playbook upload_install_apigee_mirror.yml -vv -b
-    
-## Upload an Apigee Mirror
-Assuming you have an Apigee OPDK mirror in the location set by the playbook default settings and you need to upload the
-mirror to a server, then you can use the following:
-
-    ansible-playbook upload_install_apigee_mirror.yml -vv -b --tags=upload
-
-## Install an Apigee Mirror
-Assuming you have an Apigee OPDK mirror already uploaded to the location set by the playbook default settings and you 
-need to install that Apigee mirror, then you can use the following:
-
-    ansible-playbook upload_install_apigee_mirror.yml -vv -b --tags=install
diff --git a/apigee_mirror/clean.yml b/apigee_mirror/clean.yml
deleted file mode 100644
index 72ff1ad..0000000
--- a/apigee_mirror/clean.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: localhost
-  connection: local
-
-  tasks:
-  - name: Remove .ansible_cache
-    file:
-      path: '{{ item }}'
-      state: absent
-      force: yes
-    with_items:
-    - '~/.ansible/tmp/cache'
-    - '~/.ansible/tmp/ansible.log'
-    - 'ssh_keys'
-    - 'configs_and_logs'
-    - 'rpm_resources'
-
diff --git a/apigee_mirror/components/opdk-create-download-apigee-mirror.yml b/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
deleted file mode 100644
index 0844a2d..0000000
--- a/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-apigee-user
-  tags:
-  - user
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-os-limits
-  tags:
-  - os
-
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-openjdk
-  tags:
-  - openjdk
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-bootstrap
-  tags:
-  - bootstrap
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-silent-installation-config
-  - apigee-opdk-setup-component-installer
-  tags:
-  - installer
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-bootstrap-create-archive
-  tags:
-  - create
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-bootstrap-download-archive
-  tags:
-  - download
-
diff --git a/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml b/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml
deleted file mode 100644
index 8f94c4f..0000000
--- a/apigee_mirror/components/opdk-upload-install-apigee-mirror.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-bootstrap-upload-archive
-  tags:
-  - upload
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-bootstrap-archive-installer
-  tags:
-  - install
diff --git a/apigee_mirror/configuration/load-opdk-credentials.yml b/apigee_mirror/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/apigee_mirror/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/apigee_mirror/configuration/opdk-setup-os.yml b/apigee_mirror/configuration/opdk-setup-os.yml
deleted file mode 100644
index b0461fe..0000000
--- a/apigee_mirror/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/apigee_mirror/configuration/update-user.yml b/apigee_mirror/configuration/update-user.yml
deleted file mode 100644
index 98c405f..0000000
--- a/apigee_mirror/configuration/update-user.yml
+++ /dev/null
@@ -1,39 +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/apigee_mirror/create_download_apigee_mirror.yml b/apigee_mirror/create_download_apigee_mirror.yml
deleted file mode 100644
index ab9e91a..0000000
--- a/apigee_mirror/create_download_apigee_mirror.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- include: configuration/opdk-setup-os.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - os
-
-- include: configuration/update-user.yml
-  vars:
-    hosts: 'planet'
-    user: 'root'
-  tags:
-  - user
-
-- include: components/opdk-create-download-apigee-mirror.yml
-  vars:
-    hosts: 'planet[0]'
-    jdk_version: '1.8'
-  tags:
-  - create_download
-
diff --git a/apigee_mirror/requirements.yml b/apigee_mirror/requirements.yml
deleted file mode 100644
index 6d819cf..0000000
--- a/apigee_mirror/requirements.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: apigee-opdk-setup-default-settings
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-create-archive
-  name: apigee-opdk-setup-bootstrap-create-archive
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: apigee-opdk-setup-os-minimum
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: apigee-opdk-setup-default-settings
-
-- src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: apigee-opdk-time-sync
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: apigee-opdk-setup-os-common
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: apigee-opdk-setup-apigee-user
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: apigee-opdk-setup-os-limits
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: apigee-opdk-setup-selinux-disable
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: apigee-opdk-setup-openjdk
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: apigee-opdk-setup-bootstrap
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: apigee-opdk-setup-bootstrap-rollback
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-upload-archive
-  name: apigee-opdk-setup-bootstrap-upload-archive
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-archive-installer
-  name: apigee-opdk-setup-bootstrap-archive-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-upload-archive
-  name: apigee-opdk-setup-bootstrap-archive-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-archive-installer
-  name: apigee-opdk-setup-bootstrap-archive-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: apigee-opdk-setup-silent-installation-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: apigee-opdk-setup-component-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: apigee-opdk-shutdown-iptables
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-download-archive
-  name: apigee-opdk-setup-bootstrap-download-archive
diff --git a/apigee_mirror/upload_install_apigee_mirror.yml b/apigee_mirror/upload_install_apigee_mirror.yml
deleted file mode 100644
index 3b024c6..0000000
--- a/apigee_mirror/upload_install_apigee_mirror.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-
-- include: components/opdk-upload-install-apigee-mirror.yml
-  vars:
-    hosts: 'planet'
-    jdk_version: '1.8'
-  tags:
-  - upload_install
-
diff --git a/backups/README.md b/backups/README.md
deleted file mode 100644
index f8fa73f..0000000
--- a/backups/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Apigee Backup Playbook Sample
-=============================
-
-This playbook demonstrates how to perform backups of Apigee OPDK nodes. 
-
-# Backup a Planet
-
-You can use this playbook to backup a planet as follows: 
-
-    ansible-playbook backup.yml -vv -b
-
diff --git a/backups/backup.yml b/backups/backup.yml
deleted file mode 100644
index abcd706..0000000
--- a/backups/backup.yml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'ds'
-    profile: 'apigee-zookeeper'
-  tags:
-  - zookeeper
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'ds'
-    profile: 'apigee-cassandra'
-  tags:
-  - cassandra
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'rmp'
-    profile: 'edge-router'
-  tags:
-  - router
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'rmp'
-    profile: 'edge-message-processor'
-  tags:
-  - mp
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'pg'
-    profile: 'edge-postgres-server'
-  tags:
-  - ps
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'pgmaster[0]'
-    profile: 'apigee-postgresql'
-  tags:
-  - pg
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'qpid'
-    profile: 'edge-qpid-server'
-  tags:
-  - qs
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'qpid'
-    profile: 'apigee-qpidd'
-  tags:
-  - qpid
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'ldap'
-    profile: 'apigee-openldap'
-  tags:
-  - ldap
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'ms'
-    profile: 'edge-management-server'
-  tags:
-  - ms
-
-- include: components/opdk-backup.yml
-  vars:
-    hosts: 'ui'
-    profile: 'edge-ui'
-  tags:
-  - ui
-
diff --git a/backups/clean.yml b/backups/clean.yml
deleted file mode 100644
index 72ff1ad..0000000
--- a/backups/clean.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: localhost
-  connection: local
-
-  tasks:
-  - name: Remove .ansible_cache
-    file:
-      path: '{{ item }}'
-      state: absent
-      force: yes
-    with_items:
-    - '~/.ansible/tmp/cache'
-    - '~/.ansible/tmp/ansible.log'
-    - 'ssh_keys'
-    - 'configs_and_logs'
-    - 'rpm_resources'
-
diff --git a/backups/components/opdk-backup.yml b/backups/components/opdk-backup.yml
deleted file mode 100644
index fd4fd07..0000000
--- a/backups/components/opdk-backup.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-backup, component_profile: '{{ profile }}' }
-
-
diff --git a/backups/configuration/load-opdk-credentials.yml b/backups/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/backups/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/backups/requirements.yml b/backups/requirements.yml
deleted file mode 100644
index e5c628a..0000000
--- a/backups/requirements.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: apigee-opdk-setup-default-settings
-
-- src: https://github.com/carlosfrias/apigee-opdk-backup
-  name: apigee-opdk-backup
diff --git a/environments/aws/aws_create.yml b/environments/aws/aws_create.yml
deleted file mode 100644
index 357db31..0000000
--- a/environments/aws/aws_create.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- hosts: localhost
-  connection: local
-
-  vars_files:
-  - ~/.apigee/credentials.yml
-
-  pre_tasks:
-  - setup:
-
-  - ec2_facts:
-
-  - name: Validate that provision_profile is provided
-    fail:
-      msg: Please indicate the provision_profile to use from those available in the profiles folder
-    when: provision_profile is not defined
-
-  - name: Validate that os_selection is provided
-    fail:
-      msg: Please indicate the os_selection to use from those available in the os folder
-    when: os_selection is not defined
-
-  - name: Validate that security_group is provided
-    fail:
-      msg: Please indicate the security_group to use from those available in the security folder
-    when: security_group is not defined
-
-  - name: Validate that start is provided
-    fail:
-      msg: Please indicate the starting node
-    when: start is not defined
-
-  - name: Validate that end is provided
-    fail:
-      msg: Please indicate the starting node
-    when: end is not defined
-
-  - name: Validate that security_group is provided
-    fail:
-      msg: Please indicate the security_group to use from those available in the security folder
-    when: security_group is not defined
-
-  - name: "Load provision profile settings"
-    include_vars: "profiles/{{ provision_profile }}.yml"
-
-  - name: "Load operating system"
-    include_vars: "os/{{ os_selection }}.yml"
-
-  - name: "Load security group settings"
-    include_vars: "security/{{ security_group }}.yml"
-
-  roles:
-  - apigee-opdk-aws-security-group
-  - apigee-opdk-aws-create
diff --git a/environments/aws/aws_facts.yml b/environments/aws/aws_facts.yml
deleted file mode 100644
index b950108..0000000
--- a/environments/aws/aws_facts.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: planet
-  strategy: free
-  tasks:
-  - setup:
-  - ec2_facts:
diff --git a/environments/aws/aws_security_group_manager.yml b/environments/aws/aws_security_group_manager.yml
deleted file mode 100644
index fc3d0a7..0000000
--- a/environments/aws/aws_security_group_manager.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: localhost
-  connection: local
-  vars_files:
-  - ~/.apigee/credentials.yml
-  pre_tasks:
-  - setup:
-
-  - ec2_facts:
-
-  - name: Validate security_group is provided
-    fail:
-      msg: "Please provide the name of the security_group from the files listed in the security folder"
-    when: security_group is not defined
-
-  - name: "Load security group settings"
-    include_vars: "security/{{ security_group }}.yml"
-
-  roles:
-  - { role: apigee-opdk-aws-security-group, ec2_group_state: "{{ security_group_state | default('absent') }}", security_group: '{{ security_group }}' }
diff --git a/environments/aws/aws_terminate.yml b/environments/aws/aws_terminate.yml
deleted file mode 100644
index e434a67..0000000
--- a/environments/aws/aws_terminate.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  connection: local
-  strategy: free
-
-  vars_files:
-  - ~/.apigee/credentials.yml
-
-  pre_tasks:
-
-  - setup:
-
-  - ec2_facts:
-
-  roles:
-  - apigee-opdk-aws-terminate
-
-
diff --git a/environments/aws/os/centos72.yml b/environments/aws/os/centos72.yml
deleted file mode 100644
index 3ef3ece..0000000
--- a/environments/aws/os/centos72.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# centos 7.2
-image_id: ami-7209f41f
diff --git a/environments/aws/os/ol68.yml b/environments/aws/os/ol68.yml
deleted file mode 100644
index 2bd045e..0000000
--- a/environments/aws/os/ol68.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# oraclelinux 6.8
-image_id: ami-755ba918
diff --git a/environments/aws/os/rhel72.yml b/environments/aws/os/rhel72.yml
deleted file mode 100644
index abcd309..0000000
--- a/environments/aws/os/rhel72.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# rhel 7.2
-image_id: ami-2051294a
diff --git a/environments/aws/profiles/baas-1601.yml b/environments/aws/profiles/baas-1601.yml
deleted file mode 100644
index b66fc88..0000000
--- a/environments/aws/profiles/baas-1601.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-instance_type: 't2.medium'
-wait: yes
-assign_public_ip: yes
-session_name: baas-1601-dc
-application: baas
-aws_env_name: baas
-pod: NA
-security_group: OPDK
-rules:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 9000
-    to_port: 9010
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 8080
-    to_port: 8080
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 22
-    to_port: 22
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 443
-    to_port: 443
-rules_egress:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 172.16.0.0/12
-    from_port: 0
-    to_port: 65535
diff --git a/environments/aws/profiles/control-server.yml b/environments/aws/profiles/control-server.yml
deleted file mode 100644
index f80db7c..0000000
--- a/environments/aws/profiles/control-server.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-instance_type: 't2.medium'
-wait: yes
-assign_public_ip: yes
-session_name: control-server
-application: edge
-aws_env_name: control-server
-pod: NA
-security_group: OPDK
-rules:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 9000
-    to_port: 9010
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 8080
-    to_port: 8080
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 22
-    to_port: 22
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 443
-    to_port: 443
-rules_egress:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 172.16.0.0/12
-    from_port: 0
-    to_port: 65535
diff --git a/environments/aws/profiles/edge-1601.yml b/environments/aws/profiles/edge-1601.yml
deleted file mode 100644
index ad32ce3..0000000
--- a/environments/aws/profiles/edge-1601.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-instance_type: 't2.medium'
-wait: yes
-assign_public_ip: yes
-session_name: edge-1601-dc
-application: edge
-pod: NA
diff --git a/environments/aws/profiles/edgemicro-1601.yml b/environments/aws/profiles/edgemicro-1601.yml
deleted file mode 100644
index 6087852..0000000
--- a/environments/aws/profiles/edgemicro-1601.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-instance_type: 't2.medium'
-wait: yes
-assign_public_ip: yes
-session_name: edgemicro-1601-dc
-application: edgemicro
-pod: NA
diff --git a/environments/aws/requirements.yml b/environments/aws/requirements.yml
deleted file mode 100644
index a39edc1..0000000
--- a/environments/aws/requirements.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-aws-create
-
-- src: https://github.com/carlosfrias/apigee-opdk-aws-setup
-
-- src: https://github.com/carlosfrias/apigee-opdk-aws-terminate
-
-- src: https://github.com/carlosfrias/apigee-opdk-aws-security-group
-
diff --git a/environments/aws/security/EDGEMICRO.yml b/environments/aws/security/EDGEMICRO.yml
deleted file mode 100644
index cd533cd..0000000
--- a/environments/aws/security/EDGEMICRO.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-security_group: EDGEMICRO
-security_group_description: Security group for Edgemicro
-rules:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 9000
-    to_port: 9010
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 8080
-    to_port: 8080
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 22
-    to_port: 22
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 443
-    to_port: 443
-  - proto: tcp
-    cidr_ip: 172.16.0.0/12
-    from_port: 0
-    to_port: 65535
-rules_egress:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: all
-    cidr_ip: 172.16.0.0/12
-    from_port: 0
-    to_port: 65535
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 443
-    to_port: 443
-  - proto: tcp
-    cidr_ip: 172.16.0.0/12
-    from_port: 22
-    to_port: 22
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 9001
-    to_port: 9001
diff --git a/environments/aws/security/OPDK.yml b/environments/aws/security/OPDK.yml
deleted file mode 100644
index f984c03..0000000
--- a/environments/aws/security/OPDK.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-security_group: OPDK
-security_group_description: Default OPDK ports
-rules:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 9000
-    to_port: 9010
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 8080
-    to_port: 8080
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 22
-    to_port: 22
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 443
-    to_port: 443
-rules_egress:
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 80
-    to_port: 80
-  - proto: tcp
-    cidr_ip: 172.16.0.0/12
-    from_port: 0
-    to_port: 65535
-  - proto: tcp
-    cidr_ip: 0.0.0.0/0
-    from_port: 443
-    to_port: 443
-  - proto: tcp
-    cidr_ip: 172.16.0.0/12
-    from_port: 22
-    to_port: 22
-  - proto: udp
-    cidr_ip: 0.0.0.0/0
-    from_port: 123
-    to_port: 123
diff --git a/environments/aws/security/OPDK_WITH_MIRROR.yml b/environments/aws/security/OPDK_WITH_MIRROR.yml
deleted file mode 100644
index ed97d53..0000000
--- a/environments/aws/security/OPDK_WITH_MIRROR.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/environments/vagrant/expand_virtualbox_disk.yml b/environments/vagrant/expand_virtualbox_disk.yml
deleted file mode 100644
index a4b6de0..0000000
--- a/environments/vagrant/expand_virtualbox_disk.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- hosts: 127.0.0.1
-  connection: local
-  vars:
-    vbox_manage: 'VBoxManage'
-    vmdk_path: '~/.vagrant.d/boxes/uclbioresource-VAGRANTSLASH-oracle68/1.0.0/virtualbox'
-    original_hd: '{{ vmdk_path }}/box-disk1.vmdk'
-    resize_hd: '{{ vmdk_path }}/resized-box-disk1.vdi'
-    swap_hd: '{{ vmdk_path }}/swap-box-disk1.vmdk'
-    size: '32678'
-
-  tasks:
-  - name: Check for existing resize hd
-    stat:
-      path: '{{ resize_hd }}'
-    register: exists
-    tags:
-    - clean
-
-  - name: Remove existing resize hd
-    ignore_errors: yes
-    shell: "{{ vbox_manage }} closemedium {{ resize_hd }}"
-    register: exists.stat.exists
-    tags:
-    - clean
-
-  - name: Remove existing resize hd file if it still remains
-    file:
-      path: '{{ resize_hd }}'
-      state: absent
-    register: exists.stat.exists
-    tags:
-    - clean
-
-  - name: Clone and reformat hd
-    shell: "{{ vbox_manage }} clonehd {{ original_hd }} {{ resize_hd }} --format VDI"
-    tags:
-    - clone
-
-  - name: Resize hd
-    shell: "{{ vbox_manage }} modifyhd {{ resize_hd }} --resize {{ size }}"
-    tags:
-    - resize
-
-  - name: Reformat resized hd for swap
-    shell: "{{ vbox_manage }} clonehd {{ original_hd }} {{ swap_hd }} --format VMDK"
-    tags:
-    - format
-
-  - name: Removed interim resize
-    shell: "{{ vbox_manage }} closemedium {{ resize_hd }}"
-    tags:
-    - remove
-
-#  - name: Remove original_hd
-#    shell: "{{ vbox_manage }} closemedium {{ original_hd }}"
-#    tags:
-#    - remove
-
-  - name: Rename swap file to original
-    copy:
-      src: '{{ swap_hd }}'
-      dest: '{{ original_hd }}'
-      force: yes
-    tags:
-    - rename
-
-#  - name: Attached resized hd to vm
-#    shell: "{{ vbox_manage }} modifyvm {{ vm_id }} --hda {{ original_hd }}"
-#    tags:
-#    - attach
-
diff --git a/environments/vagrant/profiles/centos7/Vagrantfile b/environments/vagrant/profiles/centos7/Vagrantfile
deleted file mode 100644
index 3a0db17..0000000
--- a/environments/vagrant/profiles/centos7/Vagrantfile
+++ /dev/null
@@ -1,70 +0,0 @@
-#-*- mode: ruby -*-
-# vi: set ft=ruby :
-
-ms_jmx_port = 1099
-router_jmx_port = 1100
-mp_jmx_port = 1101
-ingest_jmx_port = 1102
-pgserver_jmx_port = 1103
-pg_db_port = 5432
-zk_jmx_port = 2181
-cassandra_jmx_port = 7199
-ms_http_port = 8080
-router_self_port = 8081
-mp_self_port = 8082
-qpid_self_port = 8083
-pgserver_self_port = 8084
-cassandra_db_port = 9160
-cassandra_interal_comm_port1 = 7000
-cassandra_interal_comm_port2 = 9042
-ui_http_port = 9000
-edge_proxy_port = 9001
-mysql_port = 3306
-open_ldap_port = 10389
-http_port = 80
-expose_graphite_port = 9090
-grafana_http_port = 3000
-
-local_address = "172.28.128.55"
-vm_memory = 8192
-
-Vagrant.configure(2) do |config|
-  config.ssh.insert_key = false
-
-  config.vm.box = "centos/7"
-
-  config.vm.define "aio_node" do |node|
-
-    node.vm.hostname = '127.0.0.1'
-    node.vm.network "private_network", ip: local_address
-
-    node.vm.network "forwarded_port", guest: ms_http_port, host: ms_http_port
-    node.vm.network "forwarded_port", guest: ms_jmx_port, host: ms_jmx_port
-    node.vm.network "forwarded_port", guest: grafana_http_port, host: grafana_http_port
-    node.vm.network "forwarded_port", guest: cassandra_jmx_port, host: cassandra_jmx_port
-    node.vm.network "forwarded_port", guest: cassandra_db_port, host: cassandra_db_port
-    node.vm.network "forwarded_port", guest: cassandra_interal_comm_port1, host: cassandra_interal_comm_port1
-    node.vm.network "forwarded_port", guest: cassandra_interal_comm_port2, host: cassandra_interal_comm_port2
-    node.vm.network "forwarded_port", guest: zk_jmx_port, host: zk_jmx_port
-    node.vm.network "forwarded_port", guest: ui_http_port, host: ui_http_port
-    node.vm.network "forwarded_port", guest: edge_proxy_port, host: edge_proxy_port
-    node.vm.network "forwarded_port", guest: open_ldap_port, host: open_ldap_port
-    node.vm.network "forwarded_port", guest: router_jmx_port, host: router_jmx_port
-    node.vm.network "forwarded_port", guest: router_self_port, host: router_self_port
-    node.vm.network "forwarded_port", guest: mp_jmx_port, host: mp_jmx_port
-    node.vm.network "forwarded_port", guest: mp_self_port, host: mp_self_port
-    node.vm.network "forwarded_port", guest: http_port, host: expose_graphite_port
-    node.vm.network "forwarded_port", guest: mysql_port, host: mysql_port
-    node.vm.network "forwarded_port", guest: qpid_self_port, host: qpid_self_port
-    node.vm.network "forwarded_port", guest: pgserver_self_port, host: pgserver_self_port
-    node.vm.network "forwarded_port", guest: pg_db_port, host: pg_db_port
-    node.vm.network "forwarded_port", guest: pgserver_jmx_port, host: pgserver_jmx_port
-    node.vm.network "forwarded_port", guest: ingest_jmx_port, host: ingest_jmx_port
-
-  end
-
-  config.vm.provider :virtualbox do |vb|
-    vb.memory = vm_memory
-  end
-
-end
diff --git a/environments/vagrant/profiles/oraclelinux68/Vagrantfile b/environments/vagrant/profiles/oraclelinux68/Vagrantfile
deleted file mode 100644
index 7e97e4f..0000000
--- a/environments/vagrant/profiles/oraclelinux68/Vagrantfile
+++ /dev/null
@@ -1,70 +0,0 @@
-#-*- mode: ruby -*-
-# vi: set ft=ruby :
-
-ms_jmx_port = 1099
-router_jmx_port = 1100
-mp_jmx_port = 1101
-ingest_jmx_port = 1102
-pgserver_jmx_port = 1103
-pg_db_port = 5432
-zk_jmx_port = 2181
-cassandra_jmx_port = 7199
-ms_http_port = 8080
-router_self_port = 8081
-mp_self_port = 8082
-qpid_self_port = 8083
-pgserver_self_port = 8084
-cassandra_db_port = 9160
-cassandra_interal_comm_port1 = 7000
-cassandra_interal_comm_port2 = 9042
-ui_http_port = 9000
-edge_proxy_port = 9001
-mysql_port = 3306
-open_ldap_port = 10389
-http_port = 80
-expose_graphite_port = 9090
-grafana_http_port = 3000
-
-local_address = "172.28.128.55"
-vm_memory = 8192
-
-Vagrant.configure(2) do |config|
-  config.ssh.insert_key = false
-
-  config.vm.box = "uclbioresource/oracle68"
-
-  config.vm.define "aio_node" do |node|
-
-    node.vm.hostname = '127.0.0.1'
-    node.vm.network "private_network", ip: local_address
-
-    node.vm.network "forwarded_port", guest: ms_http_port, host: ms_http_port
-    node.vm.network "forwarded_port", guest: ms_jmx_port, host: ms_jmx_port
-    node.vm.network "forwarded_port", guest: grafana_http_port, host: grafana_http_port
-    node.vm.network "forwarded_port", guest: cassandra_jmx_port, host: cassandra_jmx_port
-    node.vm.network "forwarded_port", guest: cassandra_db_port, host: cassandra_db_port
-    node.vm.network "forwarded_port", guest: cassandra_interal_comm_port1, host: cassandra_interal_comm_port1
-    node.vm.network "forwarded_port", guest: cassandra_interal_comm_port2, host: cassandra_interal_comm_port2
-    node.vm.network "forwarded_port", guest: zk_jmx_port, host: zk_jmx_port
-    node.vm.network "forwarded_port", guest: ui_http_port, host: ui_http_port
-    node.vm.network "forwarded_port", guest: edge_proxy_port, host: edge_proxy_port
-    node.vm.network "forwarded_port", guest: open_ldap_port, host: open_ldap_port
-    node.vm.network "forwarded_port", guest: router_jmx_port, host: router_jmx_port
-    node.vm.network "forwarded_port", guest: router_self_port, host: router_self_port
-    node.vm.network "forwarded_port", guest: mp_jmx_port, host: mp_jmx_port
-    node.vm.network "forwarded_port", guest: mp_self_port, host: mp_self_port
-    node.vm.network "forwarded_port", guest: http_port, host: expose_graphite_port
-    node.vm.network "forwarded_port", guest: mysql_port, host: mysql_port
-    node.vm.network "forwarded_port", guest: qpid_self_port, host: qpid_self_port
-    node.vm.network "forwarded_port", guest: pgserver_self_port, host: pgserver_self_port
-    node.vm.network "forwarded_port", guest: pg_db_port, host: pg_db_port
-    node.vm.network "forwarded_port", guest: pgserver_jmx_port, host: pgserver_jmx_port
-    node.vm.network "forwarded_port", guest: ingest_jmx_port, host: ingest_jmx_port
-
-  end
-
-  config.vm.provider :virtualbox do |vb|
-    vb.memory = vm_memory
-  end
-
-end
diff --git a/installations/aio/clean.yml b/installations/aio/clean.yml
deleted file mode 100644
index 2419405..0000000
--- a/installations/aio/clean.yml
+++ /dev/null
@@ -1,18 +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'
-
diff --git a/installations/aio/components/opdk-install-component.yml b/installations/aio/components/opdk-install-component.yml
deleted file mode 100644
index b2b370f..0000000
--- a/installations/aio/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/aio/components/opdk-pre-requisites.yml b/installations/aio/components/opdk-pre-requisites.yml
deleted file mode 100644
index 9071b44..0000000
--- a/installations/aio/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/aio/configuration/load-opdk-credentials.yml b/installations/aio/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/aio/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/aio/configuration/opdk-setup-org-config.yml b/installations/aio/configuration/opdk-setup-org-config.yml
deleted file mode 100644
index d24ed2e..0000000
--- a/installations/aio/configuration/opdk-setup-org-config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  roles:
-  - apigee-opdk-setup-org-config
-
diff --git a/installations/aio/configuration/opdk-setup-org.yml b/installations/aio/configuration/opdk-setup-org.yml
deleted file mode 100644
index e3911bf..0000000
--- a/installations/aio/configuration/opdk-setup-org.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  roles:
-  - apigee-opdk-setup-org
diff --git a/installations/aio/configuration/opdk-setup-os.yml b/installations/aio/configuration/opdk-setup-os.yml
deleted file mode 100644
index 1eedbf4..0000000
--- a/installations/aio/configuration/opdk-setup-os.yml
+++ /dev/null
@@ -1,16 +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-enable-swap
-  - apigee-opdk-setup-selinux-disable
-  - apigee-opdk-shutdown-iptables
-  - apigee-opdk-time-sync
-  - apigee-opdk-setup-os-common
-
diff --git a/installations/aio/configuration/update-user.yml b/installations/aio/configuration/update-user.yml
deleted file mode 100644
index 01e9745..0000000
--- a/installations/aio/configuration/update-user.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  become: yes
-#  gather_facts: no
-
-  vars:
-    pubkey: '~/.ssh/id_rsa.pub'
-
-  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
-
-  handlers:
-  - name: Restart SSH service
-    service:
-      name: sshd
-      state: restarted
diff --git a/installations/aio/configuration/update_cache.yml b/installations/aio/configuration/update_cache.yml
deleted file mode 100644
index 6404ede..0000000
--- a/installations/aio/configuration/update_cache.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: planet
-
-  pre_tasks:
-  - setup:
-  - ec2_facts:
-    when: "{{ ansible_bios_version | lower | search('amazon') }}"
-
-  roles:
-  - apigee-opdk-setup-default-settings
-
diff --git a/installations/aio/installation-rollback.yml b/installations/aio/installation-rollback.yml
deleted file mode 100644
index 2c7e889..0000000
--- a/installations/aio/installation-rollback.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- hosts: planet
-  roles:
-  - { role: apigee-opdk-setup-bootstrap-rollback, remove_apigee: true }
diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml
deleted file mode 100644
index 324eab1..0000000
--- a/installations/aio/installation.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: planet
-  tags:
-  - credentials
-
-- hosts: planet
-  tasks:
-  - name: Update cache with basic node info
-    setup:
-
-  - name: Update cache with AWS info, if running on aws
-    ec2_facts:
-    when: ansible_bios_version is defined and ansible_bios_version | lower | search('amazon')
-
-- include: configuration/opdk-setup-os.yml
-  vars:
-    hosts: planet
-  tags:
-  - os
-
-- include: configuration/update-user.yml
-  vars:
-    hosts: planet
-    user: 'root'
-  tags:
-  - user
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: planet
-    component_profile: 'aio'
-  tags:
-  - aio
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: planet
-  tags:
-  - org-config
-
-- include: configuration/opdk-setup-org.yml
-  vars:
-    hosts: planet
-  tags:
-  - org
-
-- include: validations/opdk-setup-validate.yml
-  tags:
-  - validation
-
-- include: validations/opdk-setup-log-files.yml
-  tags:
-  - logs
diff --git a/installations/aio/requirements.yml b/installations/aio/requirements.yml
deleted file mode 100644
index f4a48d3..0000000
--- a/installations/aio/requirements.yml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: apigee-opdk-setup-apigee-user
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: apigee-opdk-setup-os-common
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-ds
-  name: apigee-opdk-setup-os-ds
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: apigee-opdk-setup-os-minimum
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: apigee-opdk-setup-default-settings
-
-- src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: apigee-opdk-time-sync
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: apigee-opdk-setup-openjdk
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: apigee-opdk-setup-os-limits
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: apigee-opdk-setup-bootstrap
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: apigee-opdk-setup-silent-installation-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: apigee-opdk-setup-component
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: apigee-opdk-setup-component-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: apigee-opdk-setup-selinux-disable
-
-- src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: apigee-opdk-shutdown-iptables
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: apigee-opdk-setup-org-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: apigee-opdk-setup-org
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: apigee-opdk-setup-validate
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: apigee-opdk-setup-validate-cleanup
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: apigee-opdk-setup-apigee-log-files
-
-- src: https://github.com/carlosfrias/apigee-fetch-files
-  name: fetch-files
-
-- src: https://github.com/carlosfrias/apigee-opdk-enable-swap
-  name: apigee-opdk-enable-swap
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: apigee-opdk-setup-postgres-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: apigee-opdk-setup-postgres-master
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: apigee-opdk-setup-postgres-standby
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: apigee-opdk-setup-os-postgres
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: apigee-opdk-setup-status
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/aio/validations/opdk-server-self.yml b/installations/aio/validations/opdk-server-self.yml
deleted file mode 100644
index c95adcf..0000000
--- a/installations/aio/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/aio/validations/opdk-setup-log-files.yml b/installations/aio/validations/opdk-setup-log-files.yml
deleted file mode 100644
index 9b6d002..0000000
--- a/installations/aio/validations/opdk-setup-log-files.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- hosts: planet
-  strategy: free
-  roles:
-  - apigee-opdk-setup-default-settings
-  - { role: fetch-files, fetch_files: '{{ apigee_log_files }}' }
-  tags:
-  - logs
-  - apigee-logs
-
-- hosts: planet
-  become: true
-  strategy: free
-  roles:
-  - apigee-opdk-setup-default-settings
-  - { role: fetch-files, fetch_files: '{{ system_config_files }}' }
-  tags:
-  - logs
-  - os-logs
-
-- hosts: planet
-  strategy: free
-  roles:
-  - apigee-opdk-setup-default-settings
-  - { role: fetch-files, fetch_files: '{{ apigee_config_files }}' }
-  tags:
-  - logs
-  - config-logs
diff --git a/installations/aio/validations/opdk-setup-status.yml b/installations/aio/validations/opdk-setup-status.yml
deleted file mode 100644
index a5dff3e..0000000
--- a/installations/aio/validations/opdk-setup-status.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-status
-  tags:
-  - status
diff --git a/installations/aio/validations/opdk-setup-validate.yml b/installations/aio/validations/opdk-setup-validate.yml
deleted file mode 100644
index eb94d55..0000000
--- a/installations/aio/validations/opdk-setup-validate.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- hosts: rmp
-  serial: 1
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-validate
-  tags:
-  - validate
-
-- hosts: rmp
-  serial: 1
-  roles:
-  - apigee-opdk-setup-validate-cleanup
-  tags:
-  - validate
-  - validate-cleanup
diff --git a/installations/baas/clean.yml b/installations/baas/clean.yml
deleted file mode 100644
index 2419405..0000000
--- a/installations/baas/clean.yml
+++ /dev/null
@@ -1,18 +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'
-
diff --git a/installations/baas/components/opdk-install-component.yml b/installations/baas/components/opdk-install-component.yml
deleted file mode 100644
index 00808f3..0000000
--- a/installations/baas/components/opdk-install-component.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - { 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/baas/components/opdk-pre-requisites.yml b/installations/baas/components/opdk-pre-requisites.yml
deleted file mode 100644
index 57e829d..0000000
--- a/installations/baas/components/opdk-pre-requisites.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - 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-bootstrap
-  tags:
-  - apigee-pre-req
-  - apigee-bootstrap
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-baas-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/baas/configuration/load-opdk-credentials.yml b/installations/baas/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/baas/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/baas/configuration/opdk-baas-create-org-user.yml b/installations/baas/configuration/opdk-baas-create-org-user.yml
deleted file mode 100644
index 4ec9bc6..0000000
--- a/installations/baas/configuration/opdk-baas-create-org-user.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-baas-create-org-and-user
\ No newline at end of file
diff --git a/installations/baas/configuration/opdk-setup-os.yml b/installations/baas/configuration/opdk-setup-os.yml
deleted file mode 100644
index b0461fe..0000000
--- a/installations/baas/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/baas/configuration/update-user.yml b/installations/baas/configuration/update-user.yml
deleted file mode 100644
index 98c405f..0000000
--- a/installations/baas/configuration/update-user.yml
+++ /dev/null
@@ -1,39 +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/baas/configuration/update_cache.yml b/installations/baas/configuration/update_cache.yml
deleted file mode 100644
index 6404ede..0000000
--- a/installations/baas/configuration/update_cache.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: planet
-
-  pre_tasks:
-  - setup:
-  - ec2_facts:
-    when: "{{ ansible_bios_version | lower | search('amazon') }}"
-
-  roles:
-  - apigee-opdk-setup-default-settings
-
diff --git a/installations/baas/installation-rollback.yml b/installations/baas/installation-rollback.yml
deleted file mode 100644
index efae214..0000000
--- a/installations/baas/installation-rollback.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- hosts: '{{ hosts }}'
-  vars:
-    remove_apigee: true
-  roles:
-  - apigee-opdk-setup-bootstrap-rollback
diff --git a/installations/baas/installation.yml b/installations/baas/installation.yml
deleted file mode 100644
index 4ecf23a..0000000
--- a/installations/baas/installation.yml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- include: configuration/update_cache.yml
-  tags:
-  - cache
-  - os-pre-req
-  - apigee-pre-req
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-  - os-pre-req
-  - apigee-pre-req
-
-- include: configuration/opdk-setup-os.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - os
-  - os-pre-req
-
-- include: configuration/update-user.yml
-  vars:
-    hosts: 'planet'
-    user: 'root'
-  tags:
-  - root-user
-
-- include: components/opdk-pre-requisites.yml
-  vars:
-    hosts: 'planet'
-    jdk_version: '1.8'
-  tags:
-  - apigee-pre-req
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'cassandra'
-    component_profile: 'c'
-  tags:
-  - cassandra
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'elastic'
-    component_profile: 'e'
-  tags:
-  - elastic
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'baas'
-    component_profile: 'b'
-  tags:
-  - baas
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'portal'
-    component_profile: 'p'
-  tags:
-  - portal
-
-- include: configuration/opdk-baas-create-org-user.yml
-  vars:
-    hosts: 'baas[0]'
-  tags:
-  - org
diff --git a/installations/baas/requirements.yml b/installations/baas/requirements.yml
deleted file mode 100644
index 0c22fbb..0000000
--- a/installations/baas/requirements.yml
+++ /dev/null
@@ -1,105 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: apigee-opdk-setup-apigee-user
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: apigee-opdk-setup-os-common
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: apigee-opdk-setup-os-limits
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: apigee-opdk-setup-os-minimum
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: apigee-opdk-setup-default-settings
-
-- src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: apigee-opdk-time-sync
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: apigee-opdk-setup-openjdk
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: apigee-opdk-setup-bootstrap
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: apigee-opdk-setup-silent-installation-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: apigee-opdk-setup-component
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: apigee-opdk-setup-component-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: apigee-opdk-setup-selinux-disable
-
-- src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: apigee-opdk-shutdown-iptables
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: apigee-opdk-setup-org-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: apigee-opdk-setup-org
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: apigee-opdk-setup-validate
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: apigee-opdk-setup-validate-cleanup
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: apigee-opdk-setup-apigee-log-files
-
-- src: https://github.com/carlosfrias/apigee-fetch-files
-  name: fetch-files
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: apigee-opdk-setup-postgres-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: apigee-opdk-setup-postgres-master
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: apigee-opdk-setup-postgres-standby
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: apigee-opdk-setup-os-postgres
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: apigee-opdk-setup-status
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: apigee-opdk-setup-bootstrap-rollback
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
-  name: internal-port-connectivity-validator-mp
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ldap
-  name: internal-port-connectivity-validator-ldap
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-cassandra
-  name: internal-port-connectivity-validator-cassandra
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-zookeeper
-  name: internal-port-connectivity-validator-zookeeper
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ms
-  name: internal-port-connectivity-validator-ms
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-postgres
-  name: internal-port-connectivity-validator-postgres
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-router
-  name: internal-port-connectivity-validator-router
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-qpid
-  name: internal-port-connectivity-validator-qpid
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ui
-  name: internal-port-connectivity-validator-ui
-
-- src: https://github.com/carlosfrias/apigee-opdk-baas-create-org-and-user
-  name: apigee-opdk-baas-create-org-and-user
diff --git a/installations/cassandra-validation/cassandra-validation.yml b/installations/cassandra-validation/cassandra-validation.yml
deleted file mode 100644
index e35ad13..0000000
--- a/installations/cassandra-validation/cassandra-validation.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- hosts: "{{ hosts }}"
-  roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Capture nodetool ring status
-    shell: "{{ apigee_installation_home }}/apigee-cassandra/bin/nodetool -h 127.0.0.1 status"
-    register: ring_status
-
-  - name: Report nodetool ring status
-    debug:
-      var: ring_status.stdout_lines
-
diff --git a/installations/cassandra-validation/configuration/update_cache.yml b/installations/cassandra-validation/configuration/update_cache.yml
deleted file mode 100644
index 754e9e4..0000000
--- a/installations/cassandra-validation/configuration/update_cache.yml
+++ /dev/null
@@ -1,11 +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/cassandra-validation/requirements.yml b/installations/cassandra-validation/requirements.yml
deleted file mode 100644
index 1f5795d..0000000
--- a/installations/cassandra-validation/requirements.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-
diff --git a/installations/edge-region-update/README.md b/installations/edge-region-update/README.md
deleted file mode 100644
index 3a23557..0000000
--- a/installations/edge-region-update/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/edge-region-update/clean.yml b/installations/edge-region-update/clean.yml
deleted file mode 100644
index 2419405..0000000
--- a/installations/edge-region-update/clean.yml
+++ /dev/null
@@ -1,18 +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'
-
diff --git a/installations/edge-region-update/components/opdk-update-component.yml b/installations/edge-region-update/components/opdk-update-component.yml
deleted file mode 100644
index 4ba2805..0000000
--- a/installations/edge-region-update/components/opdk-update-component.yml
+++ /dev/null
@@ -1 +0,0 @@
---
diff --git a/installations/edge-region-update/configuration/load-opdk-credentials.yml b/installations/edge-region-update/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/edge-region-update/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/edge-region-update/configuration/update_cache.yml b/installations/edge-region-update/configuration/update_cache.yml
deleted file mode 100644
index 6404ede..0000000
--- a/installations/edge-region-update/configuration/update_cache.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: planet
-
-  pre_tasks:
-  - setup:
-  - ec2_facts:
-    when: "{{ ansible_bios_version | lower | search('amazon') }}"
-
-  roles:
-  - apigee-opdk-setup-default-settings
-
diff --git a/installations/edge-region-update/requirements.yml b/installations/edge-region-update/requirements.yml
deleted file mode 100644
index 371139b..0000000
--- a/installations/edge-region-update/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
diff --git a/installations/edge-region-update/resources/postgresql.properties.j2 b/installations/edge-region-update/resources/postgresql.properties.j2
deleted file mode 100644
index 835e8c8..0000000
--- a/installations/edge-region-update/resources/postgresql.properties.j2
+++ /dev/null
@@ -1 +0,0 @@
-conf_pg_hba_replication.connection=host replication apigee {{ groups['dc-1-pgstandby'][0] }}/32 trust\ \nhost replication apigee {{ groups['dc-1-pgstandby'][1] }}/32 trust
\ No newline at end of file
diff --git a/installations/edge-region-update/update.yml b/installations/edge-region-update/update.yml
deleted file mode 100644
index 059e7cb..0000000
--- a/installations/edge-region-update/update.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- include: configuration/update_cache.yml
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-
-- hosts: planet
-  roles:
-  - apigee-opdk-start-components
-
-- hosts: pgmaster[0]
-
-  roles:
-  - apigee-opdk-setup-default-settings
-
-  tasks:
-  - name: Configure new standby node
-    template:
-      src: resources/postgresql.properties.j2
-      dest: '{{ apigee_installation_home }}/customer/application/postgresql.properties'
-
-  - name: Restarting pgmaster to begin replicating to the extra standby
-    shell: '{{ apigee_service }} apigee-postgresql restart'
-
-  - name: Verify that pg_hba.conf reflects both standby servers
-    shell: 'cat {{ apigee_installation_home }}/apigee-postgresql/conf/pg_hba.conf'
-
-  - name: Pause and view pg_hba.conf rendered above
-    pause:
-
-
-
diff --git a/installations/edgemicro/installation.yml b/installations/edgemicro/installation.yml
deleted file mode 100644
index a6c8ad1..0000000
--- a/installations/edgemicro/installation.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-os-minimum
-  - apigee-opdk-setup-os-common
-  tasks:
-  - name: Install needed Python libraries
-    become: yes
-    pip:
-      name: '{{ item }}'
-      state: present
-    with_items:
-    - urllib3
-    - pyopenssl
-    - ndg-httpsclient
-    - pyasn1
-
-  - name: Download OS package manager configuration script
-    become: yes
-    get_url:
-      url: https://rpm.nodesource.com/setup_6.x
-      dest: /tmp/setup_node.sh
-      mode: 0700
-
-  - name: Configure OS package manager
-    become: yes
-    shell: "/tmp/setup_node.sh"
-
-  - name:  Install OS packages
-    become: yes
-    yum:
-      name: '{{ item }}'
-      state: present
-    with_items:
-    - nodejs
-    - gcc-c++
-    - make
-
-  - name: Install edgemicro
-    become: yes
-    npm:
-      name: '{{ item.name }}'
-      version: '{{ item.version }}'
-      global: yes
-      state: present
-    with_items:
-    - { name: edgemicro, version: '2.2.1' }
-
-  - name: Create edgemicro default configuration
-    shell: 'edgemicro init'
-
-
-# configure with edge
-# edgemicro private configure -m http://172.31.23.239:8080 -r http://172.31.22.140:9001 -o opdk -e test -u opdk@apigee.com -p Apigee123! -v default
\ No newline at end of file
diff --git a/installations/expansion-to-second-region/README.md b/installations/expansion-to-second-region/README.md
deleted file mode 100644
index 24eb4e6..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/clean.yml b/installations/expansion-to-second-region/clean.yml
deleted file mode 100644
index 489da83..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-cassandra-client-update.yml b/installations/expansion-to-second-region/components/opdk-cassandra-client-update.yml
deleted file mode 100644
index 461ecd9..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-cassandra-rebuild.yml b/installations/expansion-to-second-region/components/opdk-cassandra-rebuild.yml
deleted file mode 100644
index ac712e1..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-install-component.yml b/installations/expansion-to-second-region/components/opdk-install-component.yml
deleted file mode 100644
index b2b370f..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-pre-requisites.yml b/installations/expansion-to-second-region/components/opdk-pre-requisites.yml
deleted file mode 100644
index 9071b44..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-setup-postgres-common.yml b/installations/expansion-to-second-region/components/opdk-setup-postgres-common.yml
deleted file mode 100644
index 7015614..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-setup-postgres-master.yml b/installations/expansion-to-second-region/components/opdk-setup-postgres-master.yml
deleted file mode 100644
index 1fa4f95..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/components/opdk-setup-postgres-standby.yml b/installations/expansion-to-second-region/components/opdk-setup-postgres-standby.yml
deleted file mode 100644
index a8dbba2..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/load-opdk-credentials.yml b/installations/expansion-to-second-region/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/opdk-set-reachable.yml b/installations/expansion-to-second-region/configuration/opdk-set-reachable.yml
deleted file mode 100644
index 0a5eb9d..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/opdk-setup-org-config.yml b/installations/expansion-to-second-region/configuration/opdk-setup-org-config.yml
deleted file mode 100644
index 6b2e672..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/opdk-setup-org.yml b/installations/expansion-to-second-region/configuration/opdk-setup-org.yml
deleted file mode 100644
index 002ae70..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/opdk-setup-os.yml b/installations/expansion-to-second-region/configuration/opdk-setup-os.yml
deleted file mode 100644
index b0461fe..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/update-user.yml b/installations/expansion-to-second-region/configuration/update-user.yml
deleted file mode 100644
index 0fb0e4e..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/configuration/update_cache.yml b/installations/expansion-to-second-region/configuration/update_cache.yml
deleted file mode 100644
index 2a3b521..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/installation-rollback.yml b/installations/expansion-to-second-region/installation-rollback.yml
deleted file mode 100644
index 971818d..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/installation.yml b/installations/expansion-to-second-region/installation.yml
deleted file mode 100644
index 783f866..0000000
--- a/installations/expansion-to-second-region/installation.yml
+++ /dev/null
@@ -1,183 +0,0 @@
----
-- include: configuration/update_cache.yml
-  tags:
-  - cache
-  - os-pre-req
-  - apigee-pre-req
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-  - os-pre-req
-  - apigee-pre-req
-
-- include: configuration/opdk-setup-os.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - os
-  - os-pre-req
-
-- include: configuration/update-user.yml
-  vars:
-    hosts: 'planet'
-    user: 'root'
-  tags:
-  - root-user
-
-- include: components/opdk-pre-requisites.yml
-  vars:
-    hosts: 'planet'
-    jdk_version: '1.8'
-    opdk_ldap_type: '2'
-  tags:
-  - apigee-pre-req
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-ds'
-    component_profile: 'ds'
-    jdk_version: '1.8'
-  tags:
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ds'
-    component_profile: 'ds'
-    jdk_version: '1.8'
-    opdk_ldap_type: '2'
-  tags:
-  - ds
-
-- include: components/opdk-cassandra-client-update.yml
-  vars:
-     hosts: 'dc-1-ms'
-     jdk_version: '1.8'
-  tags:
-  - ms
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ms'
-    component_profile: 'ms'
-    jdk_version: '1.8'
-  tags:
-  - ms
-
-- include: components/opdk-cassandra-rebuild.yml
-  vars:
-    hosts: 'dc-2-ds'
-    jdk_version: '1.8'
-  tags:
-  - ms
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-ms'
-    component_profile: 'ms'
-    jdk_version: '1.8'
-  tags:
-  - ms
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    reachability: 'false'
-  tags:
-  - rmp
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    component_profile: 'rmp'
-    jdk_version: '1.8'
-  tags:
-  - rmp
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    reachability: 'true'
-  tags:
-  - rmp
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'false'
-  tags:
-  - rmp
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    component_profile: 'rmp'
-    jdk_version: '1.8'
-  tags:
-  - rmp
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'true'
-  tags:
-  - rmp
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-qpid'
-    component_profile: 'qs'
-    jdk_version: '1.8'
-  tags:
-  - qpid
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-2-pgmaster'
-    pg_component: 'master'
-    jdk_version: '1.8'
-  tags:
-  - pgmaster
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-2-pgstandby'
-    pg_component: 'standby'
-    jdk_version: '1.8'
-  tags:
-  - pgstandby
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: 'dc-2-ms'
-  tags:
-  - org
-
-- include: configuration/opdk-setup-org.yml
-  vars:
-    hosts: 'dc-2-ms'
-  tags:
-  - org
-
-- include: validations/opdk-setup-validate.yml
-  vars:
-    hosts: 'dc-2-rmp'
-  tags:
-  - validation
-
-- include: validations/opdk-internal-port-connectivity-validator.yml
-  tags:
-  - port-validator
-
-- include: validations/opdk-setup-status.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - status
-
-- include: validations/opdk-setup-log-files.yml
-  tags:
-  - logs
diff --git a/installations/expansion-to-second-region/requirements.yml b/installations/expansion-to-second-region/requirements.yml
deleted file mode 100644
index 181d698..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/validations/opdk-internal-port-connectivity-validator.yml b/installations/expansion-to-second-region/validations/opdk-internal-port-connectivity-validator.yml
deleted file mode 100644
index 0e5d7bc..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/validations/opdk-server-self.yml b/installations/expansion-to-second-region/validations/opdk-server-self.yml
deleted file mode 100644
index c95adcf..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/validations/opdk-setup-log-files.yml b/installations/expansion-to-second-region/validations/opdk-setup-log-files.yml
deleted file mode 100644
index 7fd87c6..0000000
--- a/installations/expansion-to-second-region/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/expansion-to-second-region/validations/opdk-setup-status.yml b/installations/expansion-to-second-region/validations/opdk-setup-status.yml
deleted file mode 100644
index a5dff3e..0000000
--- a/installations/expansion-to-second-region/validations/opdk-setup-status.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-status
-  tags:
-  - status
diff --git a/installations/expansion-to-second-region/validations/opdk-setup-validate.yml b/installations/expansion-to-second-region/validations/opdk-setup-validate.yml
deleted file mode 100644
index 861f295..0000000
--- a/installations/expansion-to-second-region/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/monetization/clean.yml b/installations/monetization/clean.yml
deleted file mode 100644
index 489da83..0000000
--- a/installations/monetization/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/monetization/components/opdk-install-component.yml b/installations/monetization/components/opdk-install-component.yml
deleted file mode 100644
index aedc523..0000000
--- a/installations/monetization/components/opdk-install-component.yml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-apigee-user
-  tags:
-  - user
-
-- 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:
-  - os-tuning
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  roles:
-  - apigee-opdk-setup-openjdk
-  tags:
-  - openjdk
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-bootstrap
-  tags:
-  - 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:
-  - installer
-
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - { role: apigee-opdk-set-reachable, reachable: false }
-  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-  - { role: apigee-opdk-set-reachable, reachable: true }
-#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
-  tags:
-  - component
diff --git a/installations/monetization/components/opdk-provision-component.yml b/installations/monetization/components/opdk-provision-component.yml
deleted file mode 100644
index 31610f3..0000000
--- a/installations/monetization/components/opdk-provision-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  roles:
-  - { role: apigee-opdk-setup-provisioning, provisioning_action: 'enable-monetization', provisioning_config_file: '{{ opdk_installation_config_file }}'}
diff --git a/installations/monetization/configuration/load-opdk-credentials.yml b/installations/monetization/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/monetization/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/monetization/configuration/opdk-set-reachable.yml b/installations/monetization/configuration/opdk-set-reachable.yml
deleted file mode 100644
index 7de99ce..0000000
--- a/installations/monetization/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:
-  - user
\ No newline at end of file
diff --git a/installations/monetization/configuration/opdk-setup-os.yml b/installations/monetization/configuration/opdk-setup-os.yml
deleted file mode 100644
index 5cdf02f..0000000
--- a/installations/monetization/configuration/opdk-setup-os.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  become: yes
-  gather_facts: no
-  strategy: free
-  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/monetization/configuration/update-user.yml b/installations/monetization/configuration/update-user.yml
deleted file mode 100644
index 01e9745..0000000
--- a/installations/monetization/configuration/update-user.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  become: yes
-#  gather_facts: no
-
-  vars:
-    pubkey: '~/.ssh/id_rsa.pub'
-
-  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
-
-  handlers:
-  - name: Restart SSH service
-    service:
-      name: sshd
-      state: restarted
diff --git a/installations/monetization/configuration/update_cache.yml b/installations/monetization/configuration/update_cache.yml
deleted file mode 100644
index 6404ede..0000000
--- a/installations/monetization/configuration/update_cache.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: planet
-
-  pre_tasks:
-  - setup:
-  - ec2_facts:
-    when: "{{ ansible_bios_version | lower | search('amazon') }}"
-
-  roles:
-  - apigee-opdk-setup-default-settings
-
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
deleted file mode 100644
index 1a561b1..0000000
--- a/installations/monetization/installation.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- include: configuration/update_cache.yml
-  tags:
-  - cache
-  - os-pre-req
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'ms,rmp'
-    component_profile: 'mo'
-    opdk_monetization: true
-  tags:
-  - money
-
-- include: components/opdk-provision-component.yml
-  vars:
-    hosts: 'ms,rmp'
-  tags:
-  - provision
-
-- include: validations/opdk-setup-status.yml
-  vars:
-    hosts: 'ms,rmp'
-  tags:
-  - status
-
-- include: validations/opdk-setup-log-files.yml
-  tags:
-  - logs
diff --git a/installations/monetization/requirements.yml b/installations/monetization/requirements.yml
deleted file mode 100644
index 737d44a..0000000
--- a/installations/monetization/requirements.yml
+++ /dev/null
@@ -1,111 +0,0 @@
----
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-user
-  name: apigee-opdk-setup-apigee-user
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-common
-  name: apigee-opdk-setup-os-common
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-limits
-  name: apigee-opdk-setup-os-limits
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-minimum
-  name: apigee-opdk-setup-os-minimum
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
-  name: apigee-opdk-setup-default-settings
-
-- src: https://github.com/carlosfrias/apigee-opdk-time-sync
-  name: apigee-opdk-time-sync
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-openjdk
-  name: apigee-opdk-setup-openjdk
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
-  name: apigee-opdk-setup-bootstrap
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-silent-installation-config
-  name: apigee-opdk-setup-silent-installation-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component
-  name: apigee-opdk-setup-component
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
-  name: apigee-opdk-setup-component-installer
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-selinux-disable
-  name: apigee-opdk-setup-selinux-disable
-
-- src: https://github.com/carlosfrias/apigee-opdk-shutdown-iptables
-  name: apigee-opdk-shutdown-iptables
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-org-config
-  name: apigee-opdk-setup-org-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-org
-  name: apigee-opdk-setup-org
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-validate
-  name: apigee-opdk-setup-validate
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-validate-cleanup
-  name: apigee-opdk-setup-validate-cleanup
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-apigee-log-files
-  name: apigee-opdk-setup-apigee-log-files
-
-- src: https://github.com/carlosfrias/apigee-fetch-files
-  name: fetch-files
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
-  name: apigee-opdk-setup-postgres-config
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-master
-  name: apigee-opdk-setup-postgres-master
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-standby
-  name: apigee-opdk-setup-postgres-standby
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-os-postgres
-  name: apigee-opdk-setup-os-postgres
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-status
-  name: apigee-opdk-setup-status
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
-  name: apigee-opdk-setup-bootstrap-rollback
-
-- src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild
-  name: apigee-opdk-cassandra-rebuild
-
-- src: https://github.com/carlosfrias/apigee-opdk-cassandra-client-update
-  name: apigee-opdk-cassandra-client-update
-
-- src: https://github.com/carlosfrias/apigee-opdk-setup-provisioning
-  name: apigee-opdk-setup-provisioning
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-mp
-  name: internal-port-connectivity-validator-mp
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ldap
-  name: internal-port-connectivity-validator-ldap
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-cassandra
-  name: internal-port-connectivity-validator-cassandra
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-zookeeper
-  name: internal-port-connectivity-validator-zookeeper
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ms
-  name: internal-port-connectivity-validator-ms
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-postgres
-  name: internal-port-connectivity-validator-postgres
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-router
-  name: internal-port-connectivity-validator-router
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-qpid
-  name: internal-port-connectivity-validator-qpid
-
-- src: https://github.com/carlosfrias/apigee-internal-port-connectivity-validator-ui
-  name: internal-port-connectivity-validator-ui
diff --git a/installations/monetization/test.yml b/installations/monetization/test.yml
deleted file mode 100644
index 04910d4..0000000
--- a/installations/monetization/test.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  vars:
-    opdk_monetization: true
-  roles:
-  - apigee-opdk-setup-silent-installation-config
-
diff --git a/installations/monetization/validations/opdk-setup-log-files.yml b/installations/monetization/validations/opdk-setup-log-files.yml
deleted file mode 100644
index 041c9f4..0000000
--- a/installations/monetization/validations/opdk-setup-log-files.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- hosts: planet
-  strategy: free
-  roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}' }
-  tags:
-  - logs
-  - apigee-logs
-
-- hosts: planet
-  become: true
-  strategy: free
-  roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}' }
-  tags:
-  - logs
-  - os-logs
-
-- hosts: planet
-  strategy: free
-  roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}' }
-  tags:
-  - logs
-  - config-logs
diff --git a/installations/monetization/validations/opdk-setup-status.yml b/installations/monetization/validations/opdk-setup-status.yml
deleted file mode 100644
index a5dff3e..0000000
--- a/installations/monetization/validations/opdk-setup-status.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-status
-  tags:
-  - status
diff --git a/installations/single-region-installation/README.md b/installations/single-region-installation/README.md
deleted file mode 100644
index 3a23557..0000000
--- a/installations/single-region-installation/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/single-region-installation/clean.yml b/installations/single-region-installation/clean.yml
deleted file mode 100644
index 489da83..0000000
--- a/installations/single-region-installation/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/single-region-installation/components/opdk-backup.yml b/installations/single-region-installation/components/opdk-backup.yml
deleted file mode 100644
index 6226910..0000000
--- a/installations/single-region-installation/components/opdk-backup.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-backup, component_name: '{{ component }}' }
diff --git a/installations/single-region-installation/components/opdk-install-component.yml b/installations/single-region-installation/components/opdk-install-component.yml
deleted file mode 100644
index b2b370f..0000000
--- a/installations/single-region-installation/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/single-region-installation/components/opdk-pre-requisites.yml b/installations/single-region-installation/components/opdk-pre-requisites.yml
deleted file mode 100644
index 9071b44..0000000
--- a/installations/single-region-installation/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/single-region-installation/components/opdk-restore-postgresql.yml b/installations/single-region-installation/components/opdk-restore-postgresql.yml
deleted file mode 100644
index 9871c56..0000000
--- a/installations/single-region-installation/components/opdk-restore-postgresql.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- hosts: '{{ hosts_ms }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-stop-components, component_name: '{{ ms_server }}' }
-
-- hosts: '{{ hosts_qpid }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-stop-components, component_name: '{{ qpid_server }}' }
-
-- hosts: '{{ hosts_ps }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-stop-components, component_name: '{{ ps_server }}' }
-
-- hosts: '{{ hosts }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-restore, component_name: '{{ component }}', backup_time: '{{ backup }}' }
-
-- hosts: '{{ hosts_ms }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-start-components, component_name: '{{ ms_server }}' }
-
-- hosts: '{{ hosts_qpid }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-start-components, component_name: '{{ qpid_server }}' }
-
-- hosts: '{{ hosts_ps }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-start-components, component_name: '{{ ps_server }}' }
diff --git a/installations/single-region-installation/components/opdk-restore.yml b/installations/single-region-installation/components/opdk-restore.yml
deleted file mode 100644
index dc1f693..0000000
--- a/installations/single-region-installation/components/opdk-restore.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  gather_facts: yes
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - { role: apigee-opdk-restore, component_name: '{{ component }}', backup_time: '{{ backup }}' }
diff --git a/installations/single-region-installation/components/opdk-setup-postgres-common.yml b/installations/single-region-installation/components/opdk-setup-postgres-common.yml
deleted file mode 100644
index c444235..0000000
--- a/installations/single-region-installation/components/opdk-setup-postgres-common.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-enable-swap
-  - apigee-opdk-setup-default-settings
-  - 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/single-region-installation/components/opdk-setup-postgres-master.yml b/installations/single-region-installation/components/opdk-setup-postgres-master.yml
deleted file mode 100644
index 1fa4f95..0000000
--- a/installations/single-region-installation/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/single-region-installation/components/opdk-setup-postgres-standby.yml b/installations/single-region-installation/components/opdk-setup-postgres-standby.yml
deleted file mode 100644
index a8dbba2..0000000
--- a/installations/single-region-installation/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/single-region-installation/configuration/load-opdk-credentials.yml b/installations/single-region-installation/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/single-region-installation/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/single-region-installation/configuration/opdk-set-reachable.yml b/installations/single-region-installation/configuration/opdk-set-reachable.yml
deleted file mode 100644
index 0a5eb9d..0000000
--- a/installations/single-region-installation/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/single-region-installation/configuration/opdk-setup-org-config.yml b/installations/single-region-installation/configuration/opdk-setup-org-config.yml
deleted file mode 100644
index 5897f95..0000000
--- a/installations/single-region-installation/configuration/opdk-setup-org-config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  strategy: free
-  roles:
-  - apigee-opdk-setup-org-config
-
diff --git a/installations/single-region-installation/configuration/opdk-setup-org.yml b/installations/single-region-installation/configuration/opdk-setup-org.yml
deleted file mode 100644
index 5efc1ab..0000000
--- a/installations/single-region-installation/configuration/opdk-setup-org.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-org
diff --git a/installations/single-region-installation/configuration/opdk-setup-os.yml b/installations/single-region-installation/configuration/opdk-setup-os.yml
deleted file mode 100644
index 39b0146..0000000
--- a/installations/single-region-installation/configuration/opdk-setup-os.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- hosts: planet
-  become: true
-  strategy: free
-  roles:
-  - apigee-opdk-aws-setup
-
-- 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/single-region-installation/configuration/update-user.yml b/installations/single-region-installation/configuration/update-user.yml
deleted file mode 100644
index b6361df..0000000
--- a/installations/single-region-installation/configuration/update-user.yml
+++ /dev/null
@@ -1,39 +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: enable_root_login is defined and enable_root_login
-
-  handlers:
-  - name: Restart SSH service
-    service:
-      name: sshd
-      state: restarted
diff --git a/installations/single-region-installation/configuration/update_cache.yml b/installations/single-region-installation/configuration/update_cache.yml
deleted file mode 100644
index 754e9e4..0000000
--- a/installations/single-region-installation/configuration/update_cache.yml
+++ /dev/null
@@ -1,11 +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/single-region-installation/installation-rollback.yml b/installations/single-region-installation/installation-rollback.yml
deleted file mode 100644
index 971818d..0000000
--- a/installations/single-region-installation/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/single-region-installation/installation.yml b/installations/single-region-installation/installation.yml
deleted file mode 100644
index aab43b4..0000000
--- a/installations/single-region-installation/installation.yml
+++ /dev/null
@@ -1,128 +0,0 @@
----
-- include: configuration/update_cache.yml
-  tags:
-  - cache
-  - os-pre-req
-  - apigee-pre-req
-  - ms
-  - ds
-  - qpid
-  - pgmaster
-  - pgstandby
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-  - os-pre-req
-  - apigee-pre-req
-
-- include: configuration/opdk-setup-os.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - os
-  - os-pre-req
-
-- include: configuration/update-user.yml
-  vars:
-    hosts: 'planet'
-    user: 'root'
-  tags:
-  - root-user
-
-- include: components/opdk-pre-requisites.yml
-  vars:
-    hosts: 'dc-1-ds'
-    jdk_version: '1.8'
-  tags:
-  - apigee-pre-req
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ds'
-    component_profile: 'ds'
-  tags:
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ms'
-    component_profile: 'ms'
-  tags:
-  - ms
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'false'
-  tags:
-  - rmp
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    component_profile: 'rmp'
-  tags:
-  - rmp
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'true'
-  tags:
-  - rmp
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-qpid'
-    component_profile: 'qs'
-  tags:
-  - qpid
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-1-pgmaster'
-    pg_component: 'master'
-  tags:
-  - pgmaster
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-1-pgstandby'
-    pg_component: 'standby'
-  tags:
-  - pgstandby
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: 'dc-1-ms'
-  tags:
-  - org
-
-- include: configuration/opdk-setup-org.yml
-  vars:
-    hosts: 'dc-1-ms'
-  tags:
-  - org
-
-- include: validations/opdk-setup-validate.yml
-  vars:
-    hosts: 'dc-1-rmp'
-  tags:
-  - validation
-
-- include: validations/opdk-internal-port-connectivity-validator.yml
-  tags:
-  - port-validator
-
-- include: validations/opdk-setup-status.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - status
-
-- include: validations/opdk-setup-log-files.yml
-  tags:
-  - logs
diff --git a/installations/single-region-installation/requirements.yml b/installations/single-region-installation/requirements.yml
deleted file mode 100644
index dc17d06..0000000
--- a/installations/single-region-installation/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-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-start-component
-
-- src: https://github.com/carlosfrias/apigee-opdk-stop-component
-
-- src: https://github.com/carlosfrias/apigee-opdk-backup
-
-- src: https://github.com/carlosfrias/apigee-opdk-restore
diff --git a/installations/single-region-installation/validations/opdk-internal-port-connectivity-validator.yml b/installations/single-region-installation/validations/opdk-internal-port-connectivity-validator.yml
deleted file mode 100644
index 0e5d7bc..0000000
--- a/installations/single-region-installation/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/single-region-installation/validations/opdk-server-self.yml b/installations/single-region-installation/validations/opdk-server-self.yml
deleted file mode 100644
index 7550f75..0000000
--- a/installations/single-region-installation/validations/opdk-server-self.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- hosts: ms
-  serial: 1
-  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 }}'
-
-  - name: Report management server self
-    debug:
-      var: edge_ms_self
-    when: edge_ms_self is defined
-
-- hosts: rmp
-  vars_files:
-  - ~/.apigee/credentials.yml
-  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 }}'
-
-  - name: Router self report
-    debug:
-      var: edge_router_self
-    when: edge_router_self is defined
-
-  - name: Obtain message processor server self report
-    ignore_errors: yes
-    opdk_server_self:
-      server_type: 'mp'
-      username: '{{ opdk_user_email }}'
-      password: '{{ opdk_user_pass }}'
-
-  - name: Message processor self report
-    debug:
-      var: edge_mp_self
-    when: edge_mp_self is defined
-
-- hosts: qpid
-  serial: 1
-  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 }}'
-
-  - name: Qpid server self report
-    debug:
-      var: edge_qs_self
-    when: edge_qs_self is defined
-
-- hosts: pg
-  serial: 1
-  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 }}'
-
-  - name: Postgres server self report
-    debug:
-      var: edge_ps_self
-    when: edge_ps_self is defined
diff --git a/installations/single-region-installation/validations/opdk-setup-log-files.yml b/installations/single-region-installation/validations/opdk-setup-log-files.yml
deleted file mode 100644
index 7fd87c6..0000000
--- a/installations/single-region-installation/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/single-region-installation/validations/opdk-setup-status.yml b/installations/single-region-installation/validations/opdk-setup-status.yml
deleted file mode 100644
index 1184364..0000000
--- a/installations/single-region-installation/validations/opdk-setup-status.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-status
-  tags:
-  - status
-
-- include: opdk-server-self.yml
\ No newline at end of file
diff --git a/installations/single-region-installation/validations/opdk-setup-validate.yml b/installations/single-region-installation/validations/opdk-setup-validate.yml
deleted file mode 100644
index 8420b67..0000000
--- a/installations/single-region-installation/validations/opdk-setup-validate.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  serial: 1
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-validate
-  tags:
-  - validate
-
-- hosts: '{{ hosts }}'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  serial: 1
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-validate-cleanup
-  tags:
-  - validate
-  - validate-cleanup
diff --git a/installations/two-region-installation/README.md b/installations/two-region-installation/README.md
deleted file mode 100644
index 24eb4e6..0000000
--- a/installations/two-region-installation/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/two-region-installation/clean.yml b/installations/two-region-installation/clean.yml
deleted file mode 100644
index 5cf1303..0000000
--- a/installations/two-region-installation/clean.yml
+++ /dev/null
@@ -1,18 +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/edge-1601-dc3-dc4'
-    - '~/.ansible/tmp/edge-1601-dc3-dc4.log'
-    - '~/.apigee/ssh_keys'
-    - '~/.apigee/logs_configs/edge-1601-dc3-dc4/'
-
-
diff --git a/installations/two-region-installation/components/opdk-cassandra-client-update.yml b/installations/two-region-installation/components/opdk-cassandra-client-update.yml
deleted file mode 100644
index 461ecd9..0000000
--- a/installations/two-region-installation/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/two-region-installation/components/opdk-cassandra-rebuild.yml b/installations/two-region-installation/components/opdk-cassandra-rebuild.yml
deleted file mode 100644
index ac712e1..0000000
--- a/installations/two-region-installation/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/two-region-installation/components/opdk-install-component.yml b/installations/two-region-installation/components/opdk-install-component.yml
deleted file mode 100644
index b2b370f..0000000
--- a/installations/two-region-installation/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/two-region-installation/components/opdk-pre-requisites.yml b/installations/two-region-installation/components/opdk-pre-requisites.yml
deleted file mode 100644
index 9071b44..0000000
--- a/installations/two-region-installation/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/two-region-installation/components/opdk-setup-postgres-common.yml b/installations/two-region-installation/components/opdk-setup-postgres-common.yml
deleted file mode 100644
index ee339fb..0000000
--- a/installations/two-region-installation/components/opdk-setup-postgres-common.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-enable-swap
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-os-postgres
-  tags:
-  - os-pre-req
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-postgres-config
-  tags:
-  - apigee-pre-req
-
-- include: opdk-install-component.yml
-  vars:
-    hosts: '{{ hosts }}'
-    component_profile: 'ps'
-  tags:
-  - apigee-component
-
-- include: 'opdk-setup-postgres-{{ pg_component }}.yml'
-  when: pg_component is defined
-  tags:
-  - apigee-component
-
-- 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/two-region-installation/components/opdk-setup-postgres-master.yml b/installations/two-region-installation/components/opdk-setup-postgres-master.yml
deleted file mode 100644
index 1fa4f95..0000000
--- a/installations/two-region-installation/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/two-region-installation/components/opdk-setup-postgres-standby.yml b/installations/two-region-installation/components/opdk-setup-postgres-standby.yml
deleted file mode 100644
index a8dbba2..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/load-opdk-credentials.yml b/installations/two-region-installation/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/opdk-set-reachable.yml b/installations/two-region-installation/configuration/opdk-set-reachable.yml
deleted file mode 100644
index 0a5eb9d..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/opdk-setup-org-config.yml b/installations/two-region-installation/configuration/opdk-setup-org-config.yml
deleted file mode 100644
index 6b2e672..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/opdk-setup-org.yml b/installations/two-region-installation/configuration/opdk-setup-org.yml
deleted file mode 100644
index 002ae70..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/opdk-setup-os.yml b/installations/two-region-installation/configuration/opdk-setup-os.yml
deleted file mode 100644
index b0461fe..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/update-user.yml b/installations/two-region-installation/configuration/update-user.yml
deleted file mode 100644
index 0fb0e4e..0000000
--- a/installations/two-region-installation/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/two-region-installation/configuration/update_cache.yml b/installations/two-region-installation/configuration/update_cache.yml
deleted file mode 100644
index 2a3b521..0000000
--- a/installations/two-region-installation/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/two-region-installation/installation-rollback.yml b/installations/two-region-installation/installation-rollback.yml
deleted file mode 100644
index 971818d..0000000
--- a/installations/two-region-installation/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/two-region-installation/installation.yml b/installations/two-region-installation/installation.yml
deleted file mode 100644
index fe97cf9..0000000
--- a/installations/two-region-installation/installation.yml
+++ /dev/null
@@ -1,331 +0,0 @@
----
-- include: configuration/update_cache.yml
-  tags:
-  - cache
-  - os-pre-req
-  - apigee-pre-req
-  - dc-1
-  - dc-2
-  - apigee-logs
-  - logs
-  - os-logs
-  - ds
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-  - os-pre-req
-  - apigee-pre-req
-  - dc-1
-  - dc-2
-  - dc-1-validation
-  - dc-2-validation
-  - apigee-logs
-  - logs
-  - os-logs
-  - ds
-
-- include: configuration/opdk-setup-os.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - os
-  - os-pre-req
-  - dc-1
-  - dc-2
-  - ds
-
-- include: configuration/update-user.yml
-  vars:
-    hosts: 'planet'
-    user: 'root'
-  tags:
-  - root-user
-  - dc-1
-  - dc-2
-  - ds
-
-# Region 1
-- include: components/opdk-pre-requisites.yml
-  vars:
-    hosts: 'dc-1'
-    jdk_version: '1.8'
-  tags:
-  - apigee-pre-req
-  - dc-1
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ds'
-    component_profile: 'ds'
-  tags:
-  - dc-1-ds
-  - dc-1
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ms'
-    component_profile: 'ms'
-  tags:
-  - dc-1-ms
-  - dc-1
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'false'
-  tags:
-  - dc-1-rmp
-  - dc-1
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    component_profile: 'rmp'
-  tags:
-  - dc-1-rmp
-  - dc-1
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'true'
-  tags:
-  - dc-1-rmp
-  - dc-1
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-qpid'
-    component_profile: 'qs'
-  tags:
-  - dc-1-qpid
-  - dc-1
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-1-pgmaster'
-    pg_component: 'master'
-  tags:
-  - dc-1-pgmaster
-  - dc-1
-  - dc-1-pg
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-1-pgstandby'
-    pg_component: 'standby'
-  tags:
-  - dc-1-pgstandby
-  - dc-1
-  - dc-1-pg
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: 'dc-1-ms'
-  tags:
-  - dc-1-org
-  - dc-1
-
-- include: configuration/opdk-setup-org.yml
-  vars:
-    hosts: 'dc-1-ms'
-  tags:
-  - dc-1-org
-  - dc-1
-
-- include: validations/opdk-setup-validate.yml
-  vars:
-    hosts: 'dc-1-rmp'
-  tags:
-  - dc-1-validation
-  - dc-1
-
-# Region 2
-- include: components/opdk-pre-requisites.yml
-  vars:
-    hosts: 'planet'
-    jdk_version: '1.8'
-    opdk_ldap_type: '2'
-  tags:
-  - apigee-pre-req
-  - dc-2
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-ds'
-    component_profile: 'ds'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-ds
-  - dc-2
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ds'
-    component_profile: 'ds'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-ds
-  - dc-2
-  - ds
-
-- include: components/opdk-cassandra-client-update.yml
-  vars:
-     hosts: 'dc-1-ms'
-     jdk_version: '1.8'
-  tags:
-  - dc-2-ms
-  - dc-2
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-ms'
-    component_profile: 'ms'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-ms
-  - dc-2
-
-- include: components/opdk-cassandra-rebuild.yml
-  vars:
-    hosts: 'dc-2-ds'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-ms
-  - dc-2
-  - ds
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-ms'
-    component_profile: 'ms'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-ms
-  - dc-2
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    reachability: 'false'
-  tags:
-  - dc-2-rmp
-  - dc-2
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    component_profile: 'rmp'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-rmp
-  - dc-2
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-2-rmp'
-    reachability: 'true'
-  tags:
-  - dc-2-rmp
-  - dc-2
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'false'
-  tags:
-  - dc-2-rmp
-  - dc-2
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    component_profile: 'rmp'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-rmp
-  - dc-2
-
-- include: configuration/opdk-set-reachable.yml
-  vars:
-    hosts: 'dc-1-rmp'
-    reachability: 'true'
-  tags:
-  - dc-2-rmp
-  - dc-2
-
-- include: components/opdk-install-component.yml
-  vars:
-    hosts: 'dc-2-qpid'
-    component_profile: 'qs'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-qpid
-  - dc-2
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-2-pgmaster'
-    pg_component: 'master'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-pgmaster
-  - dc-2
-  - dc-2-pg
-
-- include: components/opdk-setup-postgres-common.yml
-  vars:
-    hosts: 'dc-2-pgstandby'
-    pg_component: 'standby'
-    jdk_version: '1.8'
-  tags:
-  - dc-2-pgstandby
-  - dc-2
-  - dc-2-pg
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: 'dc-2-ms'
-  tags:
-  - dc-2-org
-  - dc-2
-
-- include: configuration/opdk-setup-org.yml
-  vars:
-    hosts: 'dc-2-ms'
-  tags:
-  - dc-2-org
-  - dc-2
-
-- include: validations/opdk-setup-validate.yml
-  vars:
-    hosts: 'dc-2-rmp'
-  tags:
-  - dc-2-validation
-  - dc-2
-
-- include: validations/opdk-internal-port-connectivity-validator.yml
-  tags:
-  - port-validator
-
-- include: validations/opdk-setup-status.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - status
-  - dc-1
-  - dc-2
-
-- include: validations/opdk-setup-log-files.yml
-  tags:
-  - logs
-  - dc-1
-  - dc-2
diff --git a/installations/two-region-installation/requirements.yml b/installations/two-region-installation/requirements.yml
deleted file mode 100644
index 181d698..0000000
--- a/installations/two-region-installation/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/two-region-installation/validations/opdk-internal-port-connectivity-validator.yml b/installations/two-region-installation/validations/opdk-internal-port-connectivity-validator.yml
deleted file mode 100644
index 0e5d7bc..0000000
--- a/installations/two-region-installation/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/two-region-installation/validations/opdk-server-self.yml b/installations/two-region-installation/validations/opdk-server-self.yml
deleted file mode 100644
index c95adcf..0000000
--- a/installations/two-region-installation/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/two-region-installation/validations/opdk-setup-log-files.yml b/installations/two-region-installation/validations/opdk-setup-log-files.yml
deleted file mode 100644
index aadeb2f..0000000
--- a/installations/two-region-installation/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: "~/.apigee/logs_configs/edge-1601-dc3-dc4/" }
-  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: "~/.apigee/logs_configs/edge-1601-dc3-dc4/" }
-  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: "~/.apigee/logs_configs/edge-1601-dc3-dc4/" }
-  tags:
-  - logs
-  - config-logs
diff --git a/installations/two-region-installation/validations/opdk-setup-status.yml b/installations/two-region-installation/validations/opdk-setup-status.yml
deleted file mode 100644
index a5dff3e..0000000
--- a/installations/two-region-installation/validations/opdk-setup-status.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-status
-  tags:
-  - status
diff --git a/installations/two-region-installation/validations/opdk-setup-validate.yml b/installations/two-region-installation/validations/opdk-setup-validate.yml
deleted file mode 100644
index 3ed2d6d..0000000
--- a/installations/two-region-installation/validations/opdk-setup-validate.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-validate
-  tags:
-  - validate
-
-- hosts: '{{ hosts }}'
-  serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-validate-cleanup
-  tags:
-  - validate-cleanup