From 2caed2ae12df2cd696a65df10b1c19520d998673 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:24 -0400
Subject: [PATCH] Rename remaining "pvc_prov" items to pvc_api

---
 group_vars/default/pvc.yml               |  6 +++---
 roles/pvc/defaults/main.yml              |  6 +++---
 roles/pvc/tasks/patroni/bootstrap.yml    | 14 +++++++-------
 roles/pvc/templates/pvc/pvcapid.yaml.j2  |  6 +++---
 roles/pvc/templates/pvc/pvcnoded.yaml.j2 |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/group_vars/default/pvc.yml b/group_vars/default/pvc.yml
index 6f84983..0c63820 100644
--- a/group_vars/default/pvc.yml
+++ b/group_vars/default/pvc.yml
@@ -43,9 +43,9 @@ pvc_ceph_storage_secret_uuid: ""            # Use uuidgen to generate
 pvc_dns_database_name: "pvcdns"
 pvc_dns_database_user: "pvcdns"
 pvc_dns_database_password: ""               # Use pwgen to generate
-pvc_prov_database_name: "pvcapi"
-pvc_prov_database_user: "pvcapi"
-pvc_prov_database_password: ""               # Use pwgen to generate
+pvc_api_database_name: "pvcapi"
+pvc_api_database_user: "pvcapi"
+pvc_api_database_password: ""               # Use pwgen to generate
 pvc_replication_database_user: "replicator"
 pvc_replication_database_password: ""       # Use pwgen to generate
 pvc_superuser_database_user: "postgres"
diff --git a/roles/pvc/defaults/main.yml b/roles/pvc/defaults/main.yml
index 3debc0b..1f23c27 100644
--- a/roles/pvc/defaults/main.yml
+++ b/roles/pvc/defaults/main.yml
@@ -25,9 +25,9 @@ ceph_storage_secret_uuid: ""
 pvc_dns_database_name: "pvcdns"
 pvc_dns_database_user: "pvcdns"
 pvc_dns_database_password: "PVCdnsPassw0rd"
-pvc_prov_database_name: "pvcapi"
-pvc_prov_database_user: "pvcapi"
-pvc_prov_database_password: "PVCprovPassw0rd"
+pvc_api_database_name: "pvcapi"
+pvc_api_database_user: "pvcapi"
+pvc_api_database_password: "PVCprovPassw0rd"
 # Coordinators
 pvc_nodes:
   - hostname: "pvc1"
diff --git a/roles/pvc/tasks/patroni/bootstrap.yml b/roles/pvc/tasks/patroni/bootstrap.yml
index 60d6754..fcebf2a 100644
--- a/roles/pvc/tasks/patroni/bootstrap.yml
+++ b/roles/pvc/tasks/patroni/bootstrap.yml
@@ -49,24 +49,24 @@
   
     - name: create user for Provisioner role
       postgresql_user:
-        name: "{{ pvc_prov_database_user }}"
-        password: "{{ pvc_prov_database_password }}"
+        name: "{{ pvc_api_database_user }}"
+        password: "{{ pvc_api_database_password }}"
         encrypted: yes
         state: present
         login_host: /run/postgresql
   
     - name: create database for Provisioner role
       postgresql_db:
-        name: "{{ pvc_prov_database_name }}"
-        owner: "{{ pvc_prov_database_user }}"
+        name: "{{ pvc_api_database_name }}"
+        owner: "{{ pvc_api_database_user }}"
         encoding: utf8
         state: present
         login_host: /run/postgresql
   
     - name: set user privs for Provisioner role
       postgresql_user:
-        name: "{{ pvc_prov_database_user }}"
-        db: "{{ pvc_prov_database_name }}"
+        name: "{{ pvc_api_database_user }}"
+        db: "{{ pvc_api_database_name }}"
         priv: ALL
         login_host: /run/postgresql
   
@@ -81,7 +81,7 @@
     - name: create extensions for Provisioner database
       postgresql_ext:
         name: "{{ item }}"
-        db: "{{ pvc_prov_database_name }}"
+        db: "{{ pvc_api_database_name }}"
         login_host: /run/postgresql
       with_items: "{{ extensions }}"
       when: extensions is defined
diff --git a/roles/pvc/templates/pvc/pvcapid.yaml.j2 b/roles/pvc/templates/pvc/pvcapid.yaml.j2
index 7901d81..bb51696 100644
--- a/roles/pvc/templates/pvc/pvcapid.yaml.j2
+++ b/roles/pvc/templates/pvc/pvcapid.yaml.j2
@@ -42,11 +42,11 @@ pvc:
             # port: PostgreSQL port, invariably '5432'
             port: 5432
             # name: PostgreSQL database name, invariably 'pvcapi'
-            name: {{ pvc_prov_database_name }}
+            name: {{ pvc_api_database_name }}
             # user: PostgreSQL username, invariable 'pvcapi'
-            user: {{ pvc_prov_database_user }}
+            user: {{ pvc_api_database_user }}
             # pass: PostgreSQL user password, randomly generated
-            pass: {{ pvc_prov_database_password }}
+            pass: {{ pvc_api_database_password }}
         # queue: Celery backend queue using the PVC Zookeeper cluster
         queue:
             # host: Redis hostname, usually 'localhost'
diff --git a/roles/pvc/templates/pvc/pvcnoded.yaml.j2 b/roles/pvc/templates/pvc/pvcnoded.yaml.j2
index da92614..057218e 100644
--- a/roles/pvc/templates/pvc/pvcnoded.yaml.j2
+++ b/roles/pvc/templates/pvc/pvcnoded.yaml.j2
@@ -41,9 +41,9 @@ pvc:
       database:
         host: localhost
         port: 5432
-        name: {{ pvc_prov_database_name }}
-        user: {{ pvc_prov_database_user }}
-        pass: {{ pvc_prov_database_password }}
+        name: {{ pvc_api_database_name }}
+        user: {{ pvc_api_database_user }}
+        pass: {{ pvc_api_database_password }}
   system:
     intervals:
       vm_shutdown_timeout: {{ pvc_vm_shutdown_timeout }}