separated credentials
diff --git a/installations/aio/configuration/opdk-credentials.yml b/installations/aio/configuration/opdk-credentials.yml
new file mode 100644
index 0000000..c8f19e8
--- /dev/null
+++ b/installations/aio/configuration/opdk-credentials.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+ become: yes
+ gather_facts: no
+ strategy: free
+ tasks:
+ - name: Load credentials from encrypted file
+ include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml
index 18c98c1..a2edbd5 100644
--- a/installations/aio/installation.yml
+++ b/installations/aio/installation.yml
@@ -1,4 +1,8 @@
---
+- include: configuration/opdk-credentials.yml
+ vars:
+ hosts: 'planet'
+
- hosts: 'planet'
tasks:
- name: Update cache with basic node info
diff --git a/installations/dc1/configuration/opdk-credentials.yml b/installations/dc1/configuration/opdk-credentials.yml
new file mode 100644
index 0000000..c8f19e8
--- /dev/null
+++ b/installations/dc1/configuration/opdk-credentials.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+ become: yes
+ gather_facts: no
+ strategy: free
+ tasks:
+ - name: Load credentials from encrypted file
+ include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index e473ad1..5d4fd50 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -1,4 +1,8 @@
---
+- include: configuration/opdk-credentials.yml
+ vars:
+ hosts: 'planet'
+
- include: configuration/opdk-setup-os.yml
vars:
hosts: 'dc-1'
diff --git a/installations/dc2/configuration/opdk-credentials.yml b/installations/dc2/configuration/opdk-credentials.yml
new file mode 100644
index 0000000..c8f19e8
--- /dev/null
+++ b/installations/dc2/configuration/opdk-credentials.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+ become: yes
+ gather_facts: no
+ strategy: free
+ tasks:
+ - name: Load credentials from encrypted file
+ include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index ca3629b..3463840 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -1,4 +1,8 @@
---
+- include: configuration/opdk-credentials.yml
+ vars:
+ hosts: 'planet'
+
- include: configuration/opdk-setup-os.yml
vars:
hosts: 'planet'
diff --git a/installations/monetization/configuration/opdk-credentials.yml b/installations/monetization/configuration/opdk-credentials.yml
new file mode 100644
index 0000000..c8f19e8
--- /dev/null
+++ b/installations/monetization/configuration/opdk-credentials.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+ become: yes
+ gather_facts: no
+ strategy: free
+ tasks:
+ - name: Load credentials from encrypted file
+ include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/installations/monetization/configuration/opdk-setup-os.yml b/installations/monetization/configuration/opdk-setup-os.yml
index 5b148a7..3de9556 100644
--- a/installations/monetization/configuration/opdk-setup-os.yml
+++ b/installations/monetization/configuration/opdk-setup-os.yml
@@ -3,9 +3,6 @@
become: yes
gather_facts: no
strategy: free
- pre_tasks:
- - name: Load credentials from encrypted file
- include_vars: '~/.apigee/credentials.yml'
roles:
- opdk-setup-os-minimum
- opdk-setup-selinux-disable
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index a2ecd99..997fa29 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -1,12 +1,7 @@
---
-- include: configuration/opdk-setup-os.yml
+- include: configuration/opdk-credentials.yml
vars:
- hosts: 'planet'
-
-- include: configuration/update-user.yml
- vars:
- hosts: 'planet'
- user: 'root'
+ hosts: 'dc-1-ms'
- include: components/opdk-install-component.yml
vars:
@@ -19,6 +14,8 @@
- include: components/opdk-install-component.yml
vars:
hosts: 'dc-1-rmp'
+ component_profile: 'mo'
+ opdk_monetization: true
- include: validations/opdk-setup-status.yml
vars:
diff --git a/installations/monetization/test.yml b/installations/monetization/test.yml
new file mode 100644
index 0000000..24261a9
--- /dev/null
+++ b/installations/monetization/test.yml
@@ -0,0 +1,9 @@
+---
+- hosts: '{{ hosts }}'
+ vars_files:
+ - ~/.apigee/credentials.yml
+ vars:
+ opdk_monetization: true
+ roles:
+ - opdk-setup-silent-installation-config
+
