updated use of default settings

components/opdk-cassandra-client-update.yml

diff --git a/components/opdk-cassandra-client-update.yml b/components/opdk-cassandra-client-update.yml
index fdd5df8..461ecd9 100644
--- a/components/opdk-cassandra-client-update.yml
+++ b/components/opdk-cassandra-client-update.yml
@@ -1,7 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-start-components
   - apigee-opdk-cassandra-client-update
   tags:

components/opdk-cassandra-rebuild.yml

diff --git a/components/opdk-cassandra-rebuild.yml b/components/opdk-cassandra-rebuild.yml
index bfa3ded..ac712e1 100644
--- a/components/opdk-cassandra-rebuild.yml
+++ b/components/opdk-cassandra-rebuild.yml
@@ -3,7 +3,6 @@
   vars:
     opdk_region: dc-1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-cassandra-rebuild
   tags:
   - c-rebuild

components/opdk-install-component.yml

diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index 2428fa1..dcf2f08 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -2,7 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:

components/opdk-pre-requisites.yml

diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index 7493cc4..2e62c9e 100644
--- a/components/opdk-pre-requisites.yml
+++ b/components/opdk-pre-requisites.yml
@@ -23,7 +23,6 @@
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-openjdk
   tags:
   - apigee-pre-req
@@ -34,7 +33,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-bootstrap
   tags:
   - apigee-pre-req
@@ -45,7 +43,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-silent-installation-config
   tags:
   - apigee-pre-req

components/opdk-setup-postgres-common.yml

diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
index f0258bd..ba5f1b3 100644
--- a/components/opdk-setup-postgres-common.yml
+++ b/components/opdk-setup-postgres-common.yml
@@ -5,7 +5,6 @@
   - ~/.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
@@ -28,5 +27,4 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-server-self, server_type: 'ps'}

components/opdk-setup-postgres-master.yml

diff --git a/components/opdk-setup-postgres-master.yml b/components/opdk-setup-postgres-master.yml
index b473ec1..1fa4f95 100644
--- a/components/opdk-setup-postgres-master.yml
+++ b/components/opdk-setup-postgres-master.yml
@@ -2,7 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-postgres-master
   tags:
   - pgmaster

components/opdk-setup-postgres-standby.yml

diff --git a/components/opdk-setup-postgres-standby.yml b/components/opdk-setup-postgres-standby.yml
index fa8265e..a8dbba2 100644
--- a/components/opdk-setup-postgres-standby.yml
+++ b/components/opdk-setup-postgres-standby.yml
@@ -2,7 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-postgres-standby
   tags:
   - pgstandby

components/opdk-setup-postgresql-add.yml

diff --git a/components/opdk-setup-postgresql-add.yml b/components/opdk-setup-postgresql-add.yml
index 6e45161..84f2607 100644
--- a/components/opdk-setup-postgresql-add.yml
+++ b/components/opdk-setup-postgresql-add.yml
@@ -3,7 +3,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-server-self, server_type: 'ps'}
   - apigee-opdk-setup-postgresql-add
 

components/opdk-setup-qpid-add.yml

diff --git a/components/opdk-setup-qpid-add.yml b/components/opdk-setup-qpid-add.yml
index fc4cb5b..6a6ffca 100644
--- a/components/opdk-setup-qpid-add.yml
+++ b/components/opdk-setup-qpid-add.yml
@@ -3,7 +3,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-server-self, server_type: 'qs'}
   - apigee-opdk-setup-qpid-add
 

configuration/opdk-set-reachable.yml

diff --git a/configuration/opdk-set-reachable.yml b/configuration/opdk-set-reachable.yml
index 4cedf06..0a5eb9d 100644
--- a/configuration/opdk-set-reachable.yml
+++ b/configuration/opdk-set-reachable.yml
@@ -4,7 +4,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'router' }
   - { role: apigee-opdk-set-reachable, reachable: '{{ reachability }}', server_type: 'mp' }
   tags:

configuration/opdk-setup-org-config.yml

diff --git a/configuration/opdk-setup-org-config.yml b/configuration/opdk-setup-org-config.yml
index 33c4211..6b2e672 100644
--- a/configuration/opdk-setup-org-config.yml
+++ b/configuration/opdk-setup-org-config.yml
@@ -4,6 +4,5 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-org-config
 

configuration/opdk-setup-org.yml

diff --git a/configuration/opdk-setup-org.yml b/configuration/opdk-setup-org.yml
index 7bbba19..002ae70 100644
--- a/configuration/opdk-setup-org.yml
+++ b/configuration/opdk-setup-org.yml
@@ -4,5 +4,4 @@
   - ~/.apigee/credentials.yml
   strategy: free
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-org

validations/opdk-server-self.yml

diff --git a/validations/opdk-server-self.yml b/validations/opdk-server-self.yml
index 79b61ba..bc9f923 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -3,8 +3,6 @@
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain router server self report
     ignore_errors: yes
@@ -28,8 +26,6 @@
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain postgres server self report
     ignore_errors: yes
@@ -45,8 +41,6 @@
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain qpid server self report
     ignore_errors: yes
@@ -62,8 +56,6 @@
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
   tasks:
   - name: Obtain management server self report
     ignore_errors: yes

validations/opdk-setup-status.yml

diff --git a/validations/opdk-setup-status.yml b/validations/opdk-setup-status.yml
index c5f0a16..a5dff3e 100644
--- a/validations/opdk-setup-status.yml
+++ b/validations/opdk-setup-status.yml
@@ -1,7 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-status
   tags:
   - status

validations/opdk-setup-validate.yml

diff --git a/validations/opdk-setup-validate.yml b/validations/opdk-setup-validate.yml
index 861f295..af304a1 100644
--- a/validations/opdk-setup-validate.yml
+++ b/validations/opdk-setup-validate.yml
@@ -2,7 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-validate
   tags:
   - validate
@@ -10,7 +9,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-validate-cleanup
   tags:
   - validate-cleanup