merged from development
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index bbba673..b940bea 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -12,6 +12,7 @@
vars:
hosts: 'dc-1-ds'
component_profile: 'ds'
+ jdk_version: '1.8'
tags:
- ds
@@ -19,6 +20,7 @@
vars:
hosts: 'dc-1-ms'
component_profile: 'ms'
+ jdk_version: '1.8'
tags:
- ms
@@ -26,6 +28,7 @@
vars:
hosts: 'dc-1-rmp'
component_profile: 'rmp'
+ jdk_version: '1.8'
tags:
- rmp
@@ -33,6 +36,7 @@
vars:
hosts: 'dc-1-qpid'
component_profile: 'qs'
+ jdk_version: '1.8'
tags:
- qpid
@@ -40,6 +44,7 @@
vars:
hosts: 'dc-1-pgmaster'
pg_component: 'master'
+ jdk_version: '1.8'
tags:
- pgmaster
@@ -47,6 +52,7 @@
vars:
hosts: 'dc-1-pgstandby'
pg_component: 'standby'
+ jdk_version: '1.8'
tags:
- pgstandby
diff --git a/installations/monetization/components/opdk-install-component.yml b/installations/monetization/components/opdk-install-component.yml
new file mode 100644
index 0000000..8e67039
--- /dev/null
+++ b/installations/monetization/components/opdk-install-component.yml
@@ -0,0 +1,29 @@
+---
+- hosts: '{{ hosts }}'
+ strategy: free
+ roles:
+ - opdk-setup-apigee-user
+ - opdk-setup-os-ds
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ roles:
+ - opdk-setup-openjdk
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ roles:
+ - opdk-setup-bootstrap
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ roles:
+ - opdk-setup-silent-installation-config
+ - opdk-setup-component-installer
+
+- hosts: '{{ hosts }}'
+ serial: 1
+ roles:
+ - { role: opdk-setup-component, profile: '{{ component_profile }}' }
+
+
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index aeedd03..a2ecd99 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -19,10 +19,6 @@
- include: components/opdk-install-component.yml
vars:
hosts: 'dc-1-rmp'
- component_profile: 'mo'
- opdk_monetization: true
- tags:
- - mo-rmp
- include: validations/opdk-setup-status.yml
vars:
