updated use of default settings
diff --git a/components/opdk-iptables-block.yml b/components/opdk-iptables-block.yml
index 744c8b3..8c14dac 100644
--- a/components/opdk-iptables-block.yml
+++ b/components/opdk-iptables-block.yml
@@ -4,6 +4,7 @@
vars_files:
- ~/.apigee/credentials.yml
roles:
+ - apigee-opdk-setup-default-settings
- apigee-opdk-setup-bootstrap
- apigee-opdk-setup-component-installer
- { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index 9955c6d..359a938 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -4,6 +4,7 @@
vars_files:
- ~/.apigee/credentials.yml
roles:
+ - apigee-opdk-setup-default-settings
- apigee-opdk-setup-bootstrap
- apigee-opdk-setup-component-installer
- { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
diff --git a/components/opdk-upgrade-reachability-component.yml b/components/opdk-upgrade-reachability-component.yml
index 613b39e..77e91e8 100644
--- a/components/opdk-upgrade-reachability-component.yml
+++ b/components/opdk-upgrade-reachability-component.yml
@@ -4,6 +4,7 @@
vars_files:
- ~/.apigee/credentials.yml
roles:
+ - apigee-opdk-setup-default-settings
- apigee-opdk-setup-bootstrap
- apigee-opdk-setup-component-installer
- { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
diff --git a/configuration/opdk-set-reachable.yml b/configuration/opdk-set-reachable.yml
index 0a5eb9d..4cedf06 100644
--- a/configuration/opdk-set-reachable.yml
+++ b/configuration/opdk-set-reachable.yml
@@ -4,6 +4,7 @@
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:
diff --git a/upgrade.yml b/upgrade.yml
index 7d06dec..a87f7df 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -1,8 +1,11 @@
---
- include: configuration/update_cache.yml
tags:
+ - cache
- ds
+ - ds_edge
- ms
+ - ms_edge
- qpid
- rmp
- pg
@@ -54,10 +57,10 @@
- include: components/opdk-upgrade-component.yml
vars:
update_apigee_service: true
- hosts: ds[0,2]
+ hosts: ds
upgrade_component: edge
tags:
- - ds
+ - ds_edge
- include: components/opdk-upgrade-component.yml
vars:
@@ -65,7 +68,7 @@
hosts: ms
upgrade_component: edge
tags:
- - ms
+ - ms_edge
- include: components/opdk-upgrade-reachability-component.yml
vars:
