updated output
diff --git a/components/opdk-cassandra-client-update.yml b/components/opdk-cassandra-client-update.yml
index 461ecd9..105f7d7 100644
--- a/components/opdk-cassandra-client-update.yml
+++ b/components/opdk-cassandra-client-update.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Update cassandra clients
+ hosts: '{{ hosts }}'
+ gather_facts: no
roles:
- apigee-opdk-start-components
- apigee-opdk-cassandra-client-update
diff --git a/components/opdk-cassandra-rebuild.yml b/components/opdk-cassandra-rebuild.yml
index ac712e1..b280e6c 100644
--- a/components/opdk-cassandra-rebuild.yml
+++ b/components/opdk-cassandra-rebuild.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Rebuild cassandra
+ hosts: '{{ hosts }}'
+ gather_facts: no
vars:
opdk_region: dc-1
roles:
diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index dcf2f08..2a62998 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Setup component installer and install component
+ hosts: '{{ hosts }}'
+ gather_facts: no
serial: 1
roles:
- apigee-opdk-setup-component-installer
diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index a3ce6d2..cd34189 100644
--- a/components/opdk-pre-requisites.yml
+++ b/components/opdk-pre-requisites.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Create apigee user if not already there
+ hosts: '{{ hosts }}'
+ gather_facts: no
strategy: free
vars_files:
- ~/.apigee/credentials.yml
@@ -9,7 +11,9 @@
- apigee-user
- apigee-pre-req
-- hosts: '{{ hosts }}'
+- name: Update limits.conf
+ hosts: '{{ hosts }}'
+ gather_facts: no
strategy: free
vars_files:
- ~/.apigee/credentials.yml
@@ -19,16 +23,20 @@
- apigee-pre-req
- apigee-tuning
-- hosts: '{{ hosts }}'
+- name: Setup openjdk
+ hosts: '{{ hosts }}'
strategy: free
+ gather_facts: no
roles:
- apigee-opdk-setup-openjdk
tags:
- apigee-pre-req
- openjdk
-- hosts: '{{ hosts }}'
+- name: Configure the bootstrap
+ hosts: '{{ hosts }}'
strategy: free
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
roles:
@@ -37,8 +45,10 @@
- apigee-pre-req
- apigee-bootstrap
-- hosts: '{{ hosts }}'
+- name: Construct silent installation configuration file
+ hosts: '{{ hosts }}'
strategy: free
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
roles:
diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
index 7808b58..569969d 100644
--- a/components/opdk-setup-postgres-common.yml
+++ b/components/opdk-setup-postgres-common.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Configure OS for Postgres
+ hosts: '{{ hosts }}'
+ gather_facts: no
strategy: free
vars_files:
- ~/.apigee/credentials.yml
@@ -9,22 +11,27 @@
- apigee-opdk-setup-os-postgres
- apigee-opdk-setup-postgres-config
-- include: opdk-install-component.yml
+- name: Install Postgres component installation
+ include: opdk-install-component.yml
vars:
hosts: '{{ hosts }}'
component_profile: 'ps'
-- include: 'opdk-setup-postgres-master.yml'
+- name: Configure Postgres master
+ include: 'opdk-setup-postgres-master.yml'
when: pg_component is defined and pg_component == 'master'
tags:
- apigee-component
-- include: 'opdk-setup-postgres-standby.yml'
+- name: Configure Postgres standby
+ include: 'opdk-setup-postgres-standby.yml'
when: pg_component is defined and pg_component == 'standby'
tags:
- apigee-component
-- hosts: '{{ hosts }}'
+- name: Report Postgres server report
+ hosts: '{{ hosts }}'
+ gather_facts: no
serial: 1
roles:
- { role: apigee-opdk-server-self, server_types: ['ps'] }
diff --git a/components/opdk-setup-postgres-master.yml b/components/opdk-setup-postgres-master.yml
index 1fa4f95..a443b85 100644
--- a/components/opdk-setup-postgres-master.yml
+++ b/components/opdk-setup-postgres-master.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Setting up Postgres master
+ hosts: '{{ hosts }}'
+ gather_facts: no
serial: 1
roles:
- apigee-opdk-setup-postgres-master
diff --git a/components/opdk-setup-postgres-standby.yml b/components/opdk-setup-postgres-standby.yml
index a8dbba2..977497f 100644
--- a/components/opdk-setup-postgres-standby.yml
+++ b/components/opdk-setup-postgres-standby.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Setting up Postgres standby
+ hosts: '{{ hosts }}'
+ gather_facts: no
serial: 1
roles:
- apigee-opdk-setup-postgres-standby
diff --git a/components/opdk-setup-postgresql-add.yml b/components/opdk-setup-postgresql-add.yml
index 863312b..2251930 100644
--- a/components/opdk-setup-postgresql-add.yml
+++ b/components/opdk-setup-postgresql-add.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Register Postgres
+ hosts: '{{ hosts }}'
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
roles:
diff --git a/components/opdk-setup-qpid-add.yml b/components/opdk-setup-qpid-add.yml
index ffb5114..badbcdb 100644
--- a/components/opdk-setup-qpid-add.yml
+++ b/components/opdk-setup-qpid-add.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Register Qpid
+ hosts: '{{ hosts }}'
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
roles:
diff --git a/configuration/load-opdk-credentials.yml b/configuration/load-opdk-credentials.yml
deleted file mode 100644
index afd76f6..0000000
--- a/configuration/load-opdk-credentials.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
- become: yes
- gather_facts: no
- strategy: free
- tasks:
- - name: Load credentials from file
- include_vars: '~/.apigee/credentials.yml'
\ No newline at end of file
diff --git a/configuration/opdk-set-reachable.yml b/configuration/opdk-set-reachable.yml
index 04ac5e8..c7cd585 100644
--- a/configuration/opdk-set-reachable.yml
+++ b/configuration/opdk-set-reachable.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Set reachability flag
+ hosts: '{{ hosts }}'
+ gather_facts: no
strategy: free
vars_files:
- ~/.apigee/credentials.yml
diff --git a/configuration/opdk-setup-org.yml b/configuration/opdk-setup-org.yml
index 37fa528..6a377a7 100644
--- a/configuration/opdk-setup-org.yml
+++ b/configuration/opdk-setup-org.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Set up organization
+ hosts: '{{ hosts }}'
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
serial: 1
diff --git a/configuration/opdk-setup-os.yml b/configuration/opdk-setup-os.yml
index 7056363..50e3276 100644
--- a/configuration/opdk-setup-os.yml
+++ b/configuration/opdk-setup-os.yml
@@ -1,5 +1,6 @@
---
-- hosts: '{{ hosts }}'
+- name: Configure OS for Edge
+ hosts: '{{ hosts }}'
become: yes
gather_facts: no
strategy: free
diff --git a/configuration/update-user.yml b/configuration/update-user.yml
index 0fb0e4e..895e189 100644
--- a/configuration/update-user.yml
+++ b/configuration/update-user.yml
@@ -1,5 +1,7 @@
---
-- hosts: '{{ hosts }}'
+- name: Update SSH keys for user
+ hosts: '{{ hosts }}'
+ gather_facts: no
become: yes
vars:
pubkey: '~/.ssh/id_rsa.pub'
diff --git a/configuration/update_cache.yml b/configuration/update_cache.yml
index 2a3b521..89271d9 100644
--- a/configuration/update_cache.yml
+++ b/configuration/update_cache.yml
@@ -1,5 +1,7 @@
---
-- hosts: planet
+- name: Update full cache
+ hosts: planet
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
pre_tasks:
diff --git a/installation.yml b/installation.yml
index 5911fcc..0869006 100644
--- a/installation.yml
+++ b/installation.yml
@@ -1,23 +1,28 @@
---
-- include: configuration/update_cache.yml
+- name: Update local cache
+ include: configuration/update_cache.yml
tags:
- cache
-- include: configuration/opdk-setup-os.yml
+- name: Setup OS
+ include: configuration/opdk-setup-os.yml
vars:
hosts: 'planet'
tags:
- os
- os-pre-req
-- include: configuration/update-user.yml
+- name: Update user with root privilege
+ include: configuration/update-user.yml
vars:
hosts: 'planet'
user: 'root'
tags:
- root-user
+ - os-pre-req
-- include: components/opdk-pre-requisites.yml
+- name: Setup Edge pre-requisites
+ include: components/opdk-pre-requisites.yml
vars:
hosts: 'planet'
jdk_version: '1.8'
@@ -25,7 +30,8 @@
tags:
- apigee-pre-req
-- include: components/opdk-install-component.yml
+- name: Setup Cassandra & Zookeeper in DC-2
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-2-ds'
component_profile: 'ds'
@@ -35,7 +41,8 @@
- dc-2-ds
- ds
-- include: components/opdk-install-component.yml
+- name: Refresh Cassandra & Zookeeper in DC-1 with DC-2 setup
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-1-ds'
component_profile: 'ds'
@@ -45,7 +52,8 @@
- dc-1-ds
- ds
-- include: components/opdk-cassandra-client-update.yml
+- name: Update Cassandra client on DC-1
+ include: components/opdk-cassandra-client-update.yml
vars:
hosts: 'dc-1-ms'
jdk_version: '1.8'
@@ -53,7 +61,8 @@
- dc-1-ms
- ms
-- include: components/opdk-install-component.yml
+- name: Refresh Management Server on DC-1
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-1-ms'
component_profile: 'ms'
@@ -63,7 +72,8 @@
- dc-1-ms
- ms
-- include: components/opdk-cassandra-rebuild.yml
+- name: Rebuild Cassandra on DC-2
+ include: components/opdk-cassandra-rebuild.yml
vars:
hosts: 'dc-2-ds'
jdk_version: '1.8'
@@ -71,7 +81,8 @@
- dc-2-ms
- ms
-- include: components/opdk-install-component.yml
+- name: Setup Management Server on DC-2
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-2-ms'
component_profile: 'ms'
@@ -81,7 +92,8 @@
- dc-2-ms
- ms
-- include: components/opdk-install-component.yml
+- name: Setup RMP on DC-2
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-2-rmp'
component_profile: 'rmp'
@@ -90,7 +102,8 @@
- dc-2-rmp
- rmp
-- include: configuration/opdk-set-reachable.yml
+- name: Unset reachable flag for RMP on DC-1
+ include: configuration/opdk-set-reachable.yml
vars:
hosts: 'dc-1-rmp'
reachability: 'false'
@@ -98,7 +111,8 @@
- dc-1-rmp
- rmp
-- include: components/opdk-install-component.yml
+- name: Refresh the RMP setup on DC-1
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-1-rmp'
component_profile: 'rmp'
@@ -107,7 +121,8 @@
- dc-1-rmp
- rmp
-- include: configuration/opdk-set-reachable.yml
+- name: Set reachable flag for RMP on DC-1
+ include: configuration/opdk-set-reachable.yml
vars:
hosts: 'dc-1-rmp'
reachability: 'true'
@@ -115,7 +130,8 @@
- dc-1-rmp
- rmp
-- include: components/opdk-install-component.yml
+- name: Setup Qpid on DC-2
+ include: components/opdk-install-component.yml
vars:
hosts: 'dc-2-qpid'
component_profile: 'qs'
@@ -124,14 +140,16 @@
- dc-2-qpid
- qpid
-- include: components/opdk-setup-qpid-add.yml
+- name: Register Qpid on DC-2
+ include: components/opdk-setup-qpid-add.yml
vars:
hosts: 'dc-2-qpid'
tags:
- dc-2-qpid-registration
- qpid
-- include: components/opdk-setup-postgres-common.yml
+- name: Setup Postgres Master on DC-2
+ include: components/opdk-setup-postgres-common.yml
vars:
hosts: 'dc-2-pgmaster'
pg_component: 'master'
@@ -141,7 +159,8 @@
- pgmaster
- pg
-- include: components/opdk-setup-postgres-common.yml
+- name: Setup Postgres Standby on DC-2
+ include: components/opdk-setup-postgres-common.yml
vars:
hosts: 'dc-2-pgstandby'
pg_component: 'standby'
@@ -151,7 +170,8 @@
- pg
- pgstandby
-- include: components/opdk-setup-postgresql-add.yml
+- name: Register analytics cluster on DC-2
+ include: components/opdk-setup-postgresql-add.yml
vars:
hosts: 'dc-2-pgmaster'
pgmaster_group_name: 'dc-2-pgmaster'
@@ -161,106 +181,122 @@
- pg
- pg-add
-- include: configuration/opdk-setup-org.yml
+- name: Setup org on DC-2
+ include: configuration/opdk-setup-org.yml
vars:
hosts: 'dc-2-ms'
tags:
- org
-- include: validations/opdk-setup-validate.yml
+- name: Validate RMP proxy functionality on DC-2
+ include: validations/opdk-setup-validate.yml
vars:
hosts: 'dc-2-rmp'
tags:
- validation
-- include: validations/opdk-internal-port-connectivity-validator.yml
+- name: Validate internal port connectivity
+ include: validations/opdk-internal-port-connectivity-validator.yml
tags:
- port-validator
-- include: validations/opdk-setup-status.yml
+- name: Report status for all nodes
+ include: validations/opdk-setup-status.yml
vars:
hosts: 'planet'
tags:
- status
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-1-DS
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-1-ds
tags:
- logs
- dc-1
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-2-DS
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-2-ds
tags:
- logs
- dc-2
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-1-MS
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-1-ms
tags:
- logs
- dc-1
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-2-MS
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-2-ms
tags:
- logs
- dc-2
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-1-RMP
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-1-rmp
tags:
- logs
- dc-1
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-2-RMP
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-2-rmp
tags:
- logs
- dc-2
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-1-QPID
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-1-qpid
tags:
- logs
- dc-1
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-2-QPID
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-2-qpid
tags:
- logs
- dc-2
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-1-PGMASTER
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-1-pgmaster
tags:
- logs
- dc-1
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-2-PGMASTER
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-2-pgmaster
tags:
- logs
- dc-2
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-1-PGSTANDBY
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-1-pgstandby
tags:
- logs
- dc-1
-- include: validations/opdk-setup-log-files.yml
+- name: Download logs and configs from DC-2-PGSTANDBY
+ include: validations/opdk-setup-log-files.yml
vars:
hosts: dc-2-pgstandby
tags:
diff --git a/validations/opdk-internal-port-connectivity-validator.yml b/validations/opdk-internal-port-connectivity-validator.yml
index 0e5d7bc..14d51df 100644
--- a/validations/opdk-internal-port-connectivity-validator.yml
+++ b/validations/opdk-internal-port-connectivity-validator.yml
@@ -1,38 +1,54 @@
---
-
-- hosts: rmp
+- name: Validate internal ports for MP
+ hosts: rmp
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-mp
-- hosts: ldap
+- name: Validate internal ports for LDAP
+ hosts: ldap
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-ldap
-- hosts: ds
+- name: Validate internal ports for Cassandra
+ hosts: ds
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-cassandra
-- hosts: ds
+- name: Validate internal ports for Zookeeper
+ hosts: ds
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-zookeeper
-- hosts: ms
+- name: Validate internal ports for Management Server
+ hosts: ms
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-ms
-- hosts: pg
+- name: Validate internal ports for Postgres
+ hosts: pg
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-postgres
-- hosts: rmp
+- name: Validate internal ports for Router and Message Processor
+ hosts: rmp
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-router
-- hosts: qpid
+- name: Validate internal ports for Qpid
+ hosts: qpid
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-qpid
-- hosts: ui
+- name: Validate internal ports for UI
+ hosts: ui
+ gather_facts: no
roles:
- apigee-internal-port-connectivity-validator-ui
-
diff --git a/validations/opdk-server-self.yml b/validations/opdk-server-self.yml
index bc9f923..23b118e 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -1,6 +1,7 @@
---
- hosts: rmp
serial: 1
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
tasks:
@@ -24,6 +25,7 @@
- hosts: pg
serial: 1
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
tasks:
@@ -39,6 +41,7 @@
- hosts: qpid
serial: 1
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
tasks:
@@ -54,6 +57,7 @@
- hosts: ms
serial: 1
+ gather_facts: no
vars_files:
- ~/.apigee/credentials.yml
tasks:
diff --git a/validations/opdk-setup-log-files.yml b/validations/opdk-setup-log-files.yml
index 187faf0..5a26457 100644
--- a/validations/opdk-setup-log-files.yml
+++ b/validations/opdk-setup-log-files.yml
@@ -1,5 +1,6 @@
---
- hosts: '{{ hosts }}'
+ gather_facts: no
become: true
strategy: free
vars:
diff --git a/validations/opdk-setup-status.yml b/validations/opdk-setup-status.yml
index a5dff3e..68971dd 100644
--- a/validations/opdk-setup-status.yml
+++ b/validations/opdk-setup-status.yml
@@ -1,5 +1,6 @@
---
- hosts: '{{ hosts }}'
+ gather_facts: no
roles:
- apigee-opdk-setup-status
tags:
diff --git a/validations/opdk-setup-validate.yml b/validations/opdk-setup-validate.yml
index af304a1..53aacb3 100644
--- a/validations/opdk-setup-validate.yml
+++ b/validations/opdk-setup-validate.yml
@@ -1,5 +1,6 @@
---
- hosts: '{{ hosts }}'
+ gather_facts: no
serial: 1
roles:
- apigee-opdk-setup-validate
@@ -7,6 +8,7 @@
- validate
- hosts: '{{ hosts }}'
+ gather_facts: no
serial: 1
roles:
- apigee-opdk-setup-validate-cleanup
