further aligned aio and dc2 with dc1
diff --git a/installations/aio/components/opdk-install-component.yml b/installations/aio/components/opdk-install-component.yml index a048a08..8e67039 100644 --- a/installations/aio/components/opdk-install-component.yml +++ b/installations/aio/components/opdk-install-component.yml
@@ -1,12 +1,7 @@ --- - hosts: '{{ hosts }}' -# strategy: free + strategy: free roles: - - opdk-setup-selinux-disable - - opdk-shutdown-iptables - - opdk-time-sync - - opdk-setup-os-minimum - - opdk-setup-os-common - opdk-setup-apigee-user - opdk-setup-os-ds
diff --git a/installations/aio/configuration/opdk-setup-os.yml b/installations/aio/configuration/opdk-setup-os.yml new file mode 100644 index 0000000..2160cc6 --- /dev/null +++ b/installations/aio/configuration/opdk-setup-os.yml
@@ -0,0 +1,16 @@ +--- +- hosts: '{{ hosts }}' + 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-enable-swap + - opdk-setup-selinux-disable + - opdk-shutdown-iptables + - opdk-time-sync + - opdk-setup-os-common +
diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml index 40553ff..913b7a9 100644 --- a/installations/aio/installation.yml +++ b/installations/aio/installation.yml
@@ -1,13 +1,7 @@ --- -- hosts: planet - become: yes - gather_facts: no - pre_tasks: - - name: Load credentials from encrypted file - include_vars: '~/.apigee/credentials.yml' - roles: - - opdk-setup-os-minimum - - opdk-enable-swap +- include: configuration/opdk-setup-os.yml + vars: + hosts: 'planet' tasks: - include: configuration/update-user.yml
diff --git a/installations/dc2/components/opdk-cassandra-client-update.yml b/installations/dc2/components/opdk-cassandra-client-update.yml new file mode 100644 index 0000000..836b422 --- /dev/null +++ b/installations/dc2/components/opdk-cassandra-client-update.yml
@@ -0,0 +1,6 @@ +--- +- hosts: '{{ hosts }}' + roles: + - opdk-cassandra-client-update + tags: + - c-update \ No newline at end of file
diff --git a/installations/dc2/components/opdk-cassandra-rebuild.yml b/installations/dc2/components/opdk-cassandra-rebuild.yml new file mode 100644 index 0000000..c3dfaf7 --- /dev/null +++ b/installations/dc2/components/opdk-cassandra-rebuild.yml
@@ -0,0 +1,8 @@ +--- +- hosts: '{{ hosts }}' + vars: + opdk_region: dc-1 + roles: + - opdk-cassandra-rebuild + tags: + - c-rebuild
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml index 93e7a1e..d0274f7 100644 --- a/installations/dc2/installation.yml +++ b/installations/dc2/installation.yml
@@ -1,95 +1,112 @@ --- -- include: component_installations/opdk-install-component.yml +#- hosts: 'planet' +# become: yes +# gather_facts: no +# strategy: free +# tasks: +# - name: Load credentials from encrypted file +# include_vars: '~/.apigee/credentials.yml' + +- include: configuration/opdk-setup-os.yml + vars: + hosts: 'planet' + +- include: configuration/update-user.yml + vars: + hosts: 'planet' + user: 'root' + +- include: components/opdk-install-component.yml vars: hosts: 'dc-2-ds' component_profile: 'ds' tags: - ds -- include: component_installations/opdk-install-component.yml +- include: components/opdk-install-component.yml vars: hosts: 'dc-1-ds' component_profile: 'ds' tags: - ds -- include: component_updates/opdk-cassandra-client-update.yml +- include: components/opdk-cassandra-client-update.yml vars: hosts: 'dc-1-ms' -- include: component_installations/opdk-install-component.yml +- include: components/opdk-install-component.yml vars: hosts: 'dc-1-ms' component_profile: 'ms' tags: - ms -- include: component_installations/opdk-cassandra-rebuild.yml +- include: components/opdk-cassandra-rebuild.yml vars: hosts: 'dc-2-ds' -- include: component_installations/opdk-install-component.yml +- include: components/opdk-install-component.yml vars: hosts: 'dc-2-ms' component_profile: 'ms' tags: - ms2 -- include: component_installations/opdk-install-component.yml +- include: components/opdk-install-component.yml vars: hosts: 'dc-2-rmp' component_profile: 'rmp' tags: - rmp -- include: component_installations/opdk-install-component.yml +- include: components/opdk-install-component.yml vars: hosts: 'dc-1-rmp' component_profile: 'rmp' tags: - rmp -- include: component_installations/opdk-install-component.yml +- include: components/opdk-install-component.yml vars: hosts: 'dc-2-qpid' component_profile: 'qs' tags: - qpid -- include: component_installations/opdk-setup-postgres-master.yml +- include: components/opdk-setup-postgres-master.yml vars: hosts: 'dc-2-pgmaster' tags: - pgmaster -- include: component_installations/opdk-setup-postgres-standby.yml +- include: components/opdk-setup-postgres-standby.yml vars: hosts: 'dc-2-pgstandby' tags: - pgstandby -- include: validation/opdk-setup-org-config.yml +- include: configuration/opdk-setup-org-config.yml vars: hosts: 'dc-2-ms' tags: - org-config -- include: validation/opdk-setup-org.yml +- include: configuration/opdk-setup-org.yml vars: hosts: 'dc-2-ms' tags: - org -- include: validation/opdk-setup-validate.yml +- include: validations/opdk-setup-validate.yml tags: - validate -- include: validation/opdk-setup-status.yml +- include: validations/opdk-setup-status.yml vars: hosts: 'planet' tags: - status -- include: validation/opdk-setup-log-files.yml +- include: validations/opdk-setup-log-files.yml tags: - logs