updated names
diff --git a/opdk-external-port-connectivity-validator.yml b/port-validator-opdk-external.yml similarity index 98% rename from opdk-external-port-connectivity-validator.yml rename to port-validator-opdk-external.yml index 67d96c5..ab2cfc1 100644 --- a/opdk-external-port-connectivity-validator.yml +++ b/port-validator-opdk-external.yml
@@ -212,7 +212,8 @@ tags: - ms_read_ldap -- hosts: pg +- name: Configure port connectivity validation server on Postgres ports + hosts: pg gather_facts: no tags: ['pg'] roles: @@ -221,7 +222,8 @@ - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ pg_db_port }}' } - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ pg_ext_mgmt_port }}' } -- hosts: pg +- name: Validate port connectivity with port connectivity client on Postgres ports + hosts: pg gather_facts: no tags: ['pg'] roles: @@ -235,18 +237,20 @@ - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_db_port }}', target_server: "{{ hostvars[groups['pg'][1]].local_address }}" } - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ pg_ext_mgmt_port }}', target_server: "{{ hostvars[groups['pg'][1]].local_address }}" } -- hosts: qpid +- name: Configure port connectivity validation server on Postgres ports + hosts: qpid gather_facts: no + tags: ['qpid'] roles: - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ qpid_jmx_port }}' } - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ qpid_int_mgmt_port }}' } - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ qpid_messaging_port }}' } - { role: apigee-opdk-validate-external-port-connectivity-server, check_port: '{{ qpid_ext_mgmt_port }}' } - tags: - - pg_read_qpid + - hosts: pg gather_facts: no + tags: ['qpid'] roles: - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_jmx_port }}', target_server: "{{ hostvars[groups['qpid'][0]].local_address }}" } - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_int_mgmt_port }}', target_server: "{{ hostvars[groups['qpid'][0]].local_address }}" } @@ -257,5 +261,3 @@ - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_int_mgmt_port }}', target_server: "{{ hostvars[groups['qpid'][1]].local_address }}" } - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_messaging_port }}', target_server: "{{ hostvars[groups['qpid'][1]].local_address }}" } - { role: apigee-opdk-validate-external-port-connectivity-client, check_port: '{{ qpid_ext_mgmt_port }}', target_server: "{{ hostvars[groups['qpid'][1]].local_address }}" } - tags: - - pg_read_qpid \ No newline at end of file
diff --git a/requirements.yml b/port-validator-requirements.yml similarity index 100% rename from requirements.yml rename to port-validator-requirements.yml
diff --git a/validate-ports.yml b/validate-ports.yml index 5a3f206..1c4a74a 100644 --- a/validate-ports.yml +++ b/validate-ports.yml
@@ -2,5 +2,5 @@ - include: update_cache.yml tags: ['cache'] -- include: opdk-external-port-connectivity-validator.yml +- include: port-validator-opdk-external.yml tags: ['validate']