Terminology: replace master with primary (#67)

* Terminology: replace master with primary * Fix CI
ansible-collections · Mar 13, 2021 · 5b87db2 · 5b87db2
1 parent ae30626
commit 5b87db2
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 56 deletions.
diff --git a/plugins/modules/postgresql_info.py b/plugins/modules/postgresql_info.py
@@ -859,7 +859,7 @@ def get_settings(self):
         self.pg_info["settings"] = set_dict
 
     def get_repl_info(self):
-        """Get information about replication if the server is a master."""
+        """Get information about replication if the server is a primary."""
         # Check that pg_replication_slots exists:
         res = self.__exec_sql("SELECT EXISTS (SELECT 1 FROM "
                               "information_schema.tables "

diff --git a/plugins/modules/postgresql_subscription.py b/plugins/modules/postgresql_subscription.py
@@ -342,7 +342,7 @@ def create(self, connparams, publications, subsparams, check_mode=True):
 
         Args:
             connparams (str): Connection string in libpq style.
-            publications (list): Publications on the master to use.
+            publications (list): Publications on the primary to use.
             subsparams (str): Parameters string in WITH () clause style.
 
         Kwargs:
@@ -368,7 +368,7 @@ def update(self, connparams, publications, subsparams, check_mode=True):
 
         Args:
             connparams (str): Connection string in libpq style.
-            publications (list): Publications on the master to use.
+            publications (list): Publications on the primary to use.
             subsparams (dict): Dictionary of optional parameters.
 
         Kwargs:
@@ -504,7 +504,7 @@ def __set_publications(self, publications, check_mode=True):
         """Update publications.
 
         Args:
-            publications (list): Publications on the master to use.
+            publications (list): Publications on the primary to use.
 
         Kwargs:
             check_mode (bool): If True, don't actually change anything,

diff --git a/tests/integration/targets/postgresql_info/defaults/main.yml b/tests/integration/targets/postgresql_info/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 pg_user: postgres
 db_default: postgres
-master_port: 5433
+primary_port: 5433
 replica_port: 5434
 
 test_table1: acme1

diff --git a/tests/integration/targets/postgresql_info/tasks/postgresql_info_initial.yml b/tests/integration/targets/postgresql_info/tasks/postgresql_info_initial.yml
@@ -23,7 +23,7 @@
       publications: '{{ test_pub }}'
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -39,7 +39,7 @@
       publications: '{{ test_pub2 }}'
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -143,7 +143,7 @@
     postgresql_info:
       <<: *pg_parameters
       login_db: '{{ test_db }}'
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       trust_input: yes
 
   - assert:
@@ -165,7 +165,7 @@
     postgresql_info:
       <<: *pg_parameters
       login_db: '{{ test_db }}'
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       trust_input: no
       session_role: 'curious.anonymous"; SELECT * FROM information_schema.tables; --'
     register: result

diff --git a/tests/integration/targets/postgresql_info/tasks/setup_publication.yml b/tests/integration/targets/postgresql_info/tasks/setup_publication.yml
@@ -16,15 +16,15 @@
     <<: *task_parameters
     postgresql_db:
       login_user: '{{ pg_user }}'
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       maintenance_db: '{{ db_default }}'
       name: '{{ test_db }}'
 
   - name: Create test role
     <<: *task_parameters
     postgresql_user:
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ replication_role }}'
       password: '{{ replication_pass }}'
       role_attr_flags: LOGIN,REPLICATION
@@ -33,14 +33,14 @@
     <<: *task_parameters
     postgresql_table:
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ test_table1 }}'
       columns:
       - id int
 
   - name: Master - dump schema
     <<: *task_parameters
-    shell: pg_dumpall -p '{{ master_port }}' -s > /tmp/schema.sql
+    shell: pg_dumpall -p '{{ primary_port }}' -s > /tmp/schema.sql
 
   - name: Replicat restore schema
     <<: *task_parameters
@@ -50,12 +50,12 @@
     <<: *task_parameters
     postgresql_publication: 
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ test_pub }}'
 
   - name: Create publication
     <<: *task_parameters
     postgresql_publication: 
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ test_pub2 }}'
diff --git a/tests/integration/targets/postgresql_subscription/defaults/main.yml b/tests/integration/targets/postgresql_subscription/defaults/main.yml
@@ -1,6 +1,6 @@
 pg_user: postgres
 db_default: postgres
-master_port: 5433
+primary_port: 5433
 replica_port: 5434
 
 test_table1: acme1

diff --git a/tests/integration/targets/postgresql_subscription/tasks/postgresql_subscription_initial.yml b/tests/integration/targets/postgresql_subscription/tasks/postgresql_subscription_initial.yml
@@ -37,7 +37,7 @@
       publications: '{{ test_pub }}'
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -47,7 +47,7 @@
       that:
       - result is changed
       - result.name == '{{ test_subscription }}'
-      - result.queries == ["CREATE SUBSCRIPTION test CONNECTION 'host=127.0.0.1 port={{ master_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }}' PUBLICATION {{ test_pub }}"]
+      - result.queries == ["CREATE SUBSCRIPTION test CONNECTION 'host=127.0.0.1 port={{ primary_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }}' PUBLICATION {{ test_pub }}"]
       - result.exists == true
       - result.initial_state == {}
       - result.final_state.owner == '{{ pg_user }}'
@@ -57,7 +57,7 @@
       - result.final_state.slotname == '{{ test_subscription }}'
       - result.final_state.conninfo.dbname == '{{ test_db }}'
       - result.final_state.conninfo.host == '127.0.0.1'
-      - result.final_state.conninfo.port == {{ master_port }}
+      - result.final_state.conninfo.port == {{ primary_port }}
       - result.final_state.conninfo.user == '{{ replication_role }}'
       - result.final_state.conninfo.password == '{{ replication_pass }}'
 
@@ -143,7 +143,7 @@
       owner: '{{ test_role1 }}'
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -267,7 +267,7 @@
       trust_input: no
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -350,7 +350,7 @@
       publications: '{{ test_pub }}'
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -363,7 +363,7 @@
       that:
       - result is changed
       - result.name == '{{ test_subscription }}'
-      - result.queries == ["CREATE SUBSCRIPTION test CONNECTION 'host=127.0.0.1 port={{ master_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }}' PUBLICATION {{ test_pub }} WITH (enabled = false, synchronous_commit = false)"]
+      - result.queries == ["CREATE SUBSCRIPTION test CONNECTION 'host=127.0.0.1 port={{ primary_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }}' PUBLICATION {{ test_pub }} WITH (enabled = false, synchronous_commit = false)"]
       - result.exists == true
       - result.final_state.enabled == false
       - result.final_state.synccommit == false
@@ -554,7 +554,7 @@
       state: present
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -566,7 +566,7 @@
       that:
       - result is changed
       - result.name == '{{ test_subscription }}'
-      - result.queries == ["ALTER SUBSCRIPTION {{ test_subscription }} CONNECTION 'host=127.0.0.1 port={{ master_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }} connect_timeout={{ conn_timeout }}'"]
+      - result.queries == ["ALTER SUBSCRIPTION {{ test_subscription }} CONNECTION 'host=127.0.0.1 port={{ primary_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }} connect_timeout={{ conn_timeout }}'"]
       - result.initial_state.conninfo == result.final_state.conninfo
 
   - name: Change conninfo
@@ -578,7 +578,7 @@
       state: present
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'
@@ -589,7 +589,7 @@
       that:
       - result is changed
       - result.name == '{{ test_subscription }}'
-      - result.queries == ["ALTER SUBSCRIPTION {{ test_subscription }} CONNECTION 'host=127.0.0.1 port={{ master_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }} connect_timeout={{ conn_timeout }}'"]
+      - result.queries == ["ALTER SUBSCRIPTION {{ test_subscription }} CONNECTION 'host=127.0.0.1 port={{ primary_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }} connect_timeout={{ conn_timeout }}'"]
       - result.initial_state.conninfo != result.final_state.conninfo
 
   - name: Check
@@ -601,7 +601,7 @@
 
   - assert:
       that:
-      - result.query_result[0].subconninfo == "host=127.0.0.1 port={{ master_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }} connect_timeout={{ conn_timeout }}"
+      - result.query_result[0].subconninfo == "host=127.0.0.1 port={{ primary_port }} user={{ replication_role }} password={{ replication_pass }} dbname={{ test_db }} connect_timeout={{ conn_timeout }}"
 
   - name: Try to change conninfo again with the same values
     <<: *task_parameters
@@ -612,7 +612,7 @@
       state: present
       connparams:
         host: 127.0.0.1
-        port: '{{ master_port }}'
+        port: '{{ primary_port }}'
         user: '{{ replication_role }}'
         password: '{{ replication_pass }}'
         dbname: '{{ test_db }}'

diff --git a/tests/integration/targets/postgresql_subscription/tasks/setup_publication.yml b/tests/integration/targets/postgresql_subscription/tasks/setup_publication.yml
@@ -16,15 +16,15 @@
     <<: *task_parameters
     postgresql_db:
       login_user: '{{ pg_user }}'
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       maintenance_db: '{{ db_default }}'
       name: '{{ test_db }}'
 
   - name: postgresql_publication - create test role
     <<: *task_parameters
     postgresql_user:
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ replication_role }}'
       password: '{{ replication_pass }}'
       role_attr_flags: LOGIN,REPLICATION
@@ -33,14 +33,14 @@
     <<: *task_parameters
     postgresql_table:
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ test_table1 }}'
       columns:
       - id int
 
-  - name: Master - dump schema
+  - name: Primary - dump schema
     <<: *task_parameters
-    shell: pg_dumpall -p '{{ master_port }}' -s > /tmp/schema.sql
+    shell: pg_dumpall -p '{{ primary_port }}' -s > /tmp/schema.sql
 
   - name: Replicat restore schema
     <<: *task_parameters
@@ -50,7 +50,7 @@
     <<: *task_parameters
     postgresql_publication: 
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ test_pub }}'
 
   - assert:
@@ -67,14 +67,14 @@
     <<: *task_parameters
     postgresql_publication: 
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       name: '{{ test_pub2 }}'
 
   - name: postgresql_publication - check the publication was created
     <<: *task_parameters
     postgresql_query:
       <<: *pg_parameters
-      login_port: '{{ master_port }}'
+      login_port: '{{ primary_port }}'
       query: >
         SELECT * FROM pg_publication WHERE pubname = '{{ test_pub }}'
         AND pubowner = '10' AND puballtables = 't'

diff --git a/tests/integration/targets/setup_postgresql_replication/defaults/main.yml b/tests/integration/targets/setup_postgresql_replication/defaults/main.yml
@@ -16,11 +16,11 @@ packages_to_remove:
 - python3-psycopg2
 
 # Master specific defaults:
-master_root_dir: '/var/lib/pgsql/master'
-master_data_dir: '{{ master_root_dir }}/data'
-master_postgresql_conf: '{{ master_data_dir }}/postgresql.conf'
-master_pg_hba_conf: '{{ master_data_dir }}/pg_hba.conf'
-master_port: 5433
+primary_root_dir: '/var/lib/pgsql/primary'
+primary_data_dir: '{{ primary_root_dir }}/data'
+primary_postgresql_conf: '{{ primary_data_dir }}/postgresql.conf'
+primary_pg_hba_conf: '{{ primary_data_dir }}/pg_hba.conf'
+primary_port: 5433
 
 # Replica specific defaults:
 replica_root_dir: '/var/lib/pgsql/replica'

diff --git a/tests/integration/targets/setup_postgresql_replication/handlers/main.yml b/tests/integration/targets/setup_postgresql_replication/handlers/main.yml
@@ -3,7 +3,7 @@
   become_user: '{{ pg_user }}'
   shell: '{{ pg_ctl }} -D {{ item.datadir }} -o "-p {{ item.port }}" -m immediate stop'
   loop:
-  - { datadir: '{{ master_data_dir }}', port: '{{ master_port }}' }
+  - { datadir: '{{ primary_data_dir }}', port: '{{ primary_port }}' }
   - { datadir: '{{ replica_data_dir }}', port: '{{ replica_port }}' }
   listen: stop postgresql
 
@@ -18,6 +18,6 @@
     state: absent
     path: "{{ item }}"
   loop:
-  - "{{ master_root_dir }}"
+  - "{{ primary_root_dir }}"
   - "{{ replica_root_dir }}"
   listen: cleanup postgresql
diff --git a/tests/integration/targets/setup_postgresql_replication/tasks/main.yml b/tests/integration/targets/setup_postgresql_replication/tasks/main.yml
@@ -6,7 +6,7 @@
 # Copyright: (c) 2019, Andrew Klychkov (@Andersson007) <[email protected]>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-# Setup PostgreSQL master-standby replication into one container:
+# Setup PostgreSQL primary-standby replication into one container:
 - import_tasks: setup_postgresql_cluster.yml
   when:
   - ansible_distribution == 'Ubuntu'