Updated to apply pre-requisite to the planet separately from the installation of the component.
diff --git a/installations/aio/components/opdk-install-component.yml b/installations/aio/components/opdk-install-component.yml
index fc3c608..b2b370f 100644
--- a/installations/aio/components/opdk-install-component.yml
+++ b/installations/aio/components/opdk-install-component.yml
@@ -1,54 +1,9 @@
---
- 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:
+ - 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:
- - component
+ - apigee-component
diff --git a/installations/aio/components/opdk-pre-requisites.yml b/installations/aio/components/opdk-pre-requisites.yml
new file mode 100644
index 0000000..9071b44
--- /dev/null
+++ b/installations/aio/components/opdk-pre-requisites.yml
@@ -0,0 +1,53 @@
+---
+- 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/baas/components/opdk-install-component.yml b/installations/baas/components/opdk-install-component.yml
index bec47fa..b2b370f 100644
--- a/installations/baas/components/opdk-install-component.yml
+++ b/installations/baas/components/opdk-install-component.yml
@@ -1,68 +1,6 @@
---
- 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
- vars_files:
- - ~/.apigee/credentials.yml
- 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
-
-- include: ../configuration/update_cache.yml
- tags:
- - apigee-pre-req
- - apigee-installer
-
-- 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
-
-- hosts: '{{ hosts }}'
serial: 1
- vars_files:
- - ~/.apigee/credentials.yml
roles:
- apigee-opdk-setup-default-settings
- { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
diff --git a/installations/baas/components/opdk-pre-requisites.yml b/installations/baas/components/opdk-pre-requisites.yml
new file mode 100644
index 0000000..9071b44
--- /dev/null
+++ b/installations/baas/components/opdk-pre-requisites.yml
@@ -0,0 +1,53 @@
+---
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-default-settings
+ - apigee-opdk-setup-apigee-user
+ tags:
+ - apigee-user
+ - apigee-pre-req
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-os-limits
+# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+ tags:
+ - apigee-pre-req
+ - apigee-tuning
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ roles:
+ - apigee-opdk-setup-openjdk
+ tags:
+ - apigee-pre-req
+ - openjdk
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-default-settings
+ - apigee-opdk-setup-bootstrap
+ tags:
+ - apigee-pre-req
+ - apigee-bootstrap
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-silent-installation-config
+ - apigee-opdk-setup-component-installer
+# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+ tags:
+ - apigee-pre-req
+ - apigee-installer
diff --git a/installations/dc2/components/opdk-install-component.yml b/installations/dc2/components/opdk-install-component.yml
index 279d06a..b2b370f 100644
--- a/installations/dc2/components/opdk-install-component.yml
+++ b/installations/dc2/components/opdk-install-component.yml
@@ -1,58 +1,5 @@
---
- 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
-
-- hosts: '{{ hosts }}'
serial: 1
roles:
- apigee-opdk-setup-default-settings
diff --git a/installations/dc2/components/opdk-pre-requisites.yml b/installations/dc2/components/opdk-pre-requisites.yml
new file mode 100644
index 0000000..9071b44
--- /dev/null
+++ b/installations/dc2/components/opdk-pre-requisites.yml
@@ -0,0 +1,53 @@
+---
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-default-settings
+ - apigee-opdk-setup-apigee-user
+ tags:
+ - apigee-user
+ - apigee-pre-req
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-os-limits
+# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+ tags:
+ - apigee-pre-req
+ - apigee-tuning
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ roles:
+ - apigee-opdk-setup-openjdk
+ tags:
+ - apigee-pre-req
+ - openjdk
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-default-settings
+ - apigee-opdk-setup-bootstrap
+ tags:
+ - apigee-pre-req
+ - apigee-bootstrap
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
+ - apigee-opdk-setup-silent-installation-config
+ - apigee-opdk-setup-component-installer
+# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+ tags:
+ - apigee-pre-req
+ - apigee-installer
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index 8822568..783f866 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -27,12 +27,19 @@
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'
- opdk_ldap_type: '2'
tags:
- ds
@@ -57,7 +64,6 @@
hosts: 'dc-1-ms'
component_profile: 'ms'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- ms
@@ -73,7 +79,6 @@
hosts: 'dc-2-ms'
component_profile: 'ms'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- ms
@@ -89,7 +94,6 @@
hosts: 'dc-2-rmp'
component_profile: 'rmp'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- rmp
@@ -112,7 +116,6 @@
hosts: 'dc-1-rmp'
component_profile: 'rmp'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- rmp
@@ -128,7 +131,6 @@
hosts: 'dc-2-qpid'
component_profile: 'qs'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- qpid
@@ -137,7 +139,6 @@
hosts: 'dc-2-pgmaster'
pg_component: 'master'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- pgmaster
@@ -146,21 +147,18 @@
hosts: 'dc-2-pgstandby'
pg_component: 'standby'
jdk_version: '1.8'
- opdk_ldap_type: '2'
tags:
- pgstandby
- include: configuration/opdk-setup-org-config.yml
vars:
hosts: 'dc-2-ms'
- opdk_ldap_type: '2'
tags:
- org
- include: configuration/opdk-setup-org.yml
vars:
hosts: 'dc-2-ms'
- opdk_ldap_type: '2'
tags:
- org
