Merge ~cjwatson/txpkgupload:charm-oops-prefix-name into txpkgupload:master

[Colin Watson]

charm: Rename oopses_prefix to oops_prefix

This brings it into line with the `launchpad-base` layer; there's no need to use a different spelling here.

[Guruprasad (lgp171188)]

LGTM 👍

review: Approve

[Ines Almeida (ines-almeida)]

review: Approve

diff --git a/charm/txpkgupload/config.yaml b/charm/txpkgupload/config.yaml
index bcfe498..8257478 100644
--- a/charm/txpkgupload/config.yaml
+++ b/charm/txpkgupload/config.yaml
@@ -3,6 +3,10 @@ options:
     type: int
     default: 2221
     description: The port to run the FTP server on.
+  oops_prefix:
+    type: string
+    default: local
+    description: The prefix used when generating OOPS reports.
   sftp_authentication_endpoint:
     type: string
     default: http://xmlrpc-private.launchpad.dev:8087/authserver
@@ -19,7 +23,3 @@ options:
     type: int
     default: 5023
     description: The port to run the SFTP server on.
-  oopses_prefix:
-    type: string
-    default: local
-    description: The prefix used when generating OOPS reports.
diff --git a/charm/txpkgupload/templates/txpkgupload_config.yaml.j2 b/charm/txpkgupload/templates/txpkgupload_config.yaml.j2
index ebfa052..78b1edb 100644
--- a/charm/txpkgupload/templates/txpkgupload_config.yaml.j2
+++ b/charm/txpkgupload/templates/txpkgupload_config.yaml.j2
@@ -9,7 +9,7 @@ sftp:
 
 oops:
   directory: "{{ oopses_dir }}"
-  reporter: "{{ oopses_prefix }}"
+  reporter: "{{ oops_prefix }}"
 
 access_log: "{{ logs_dir }}/txpkgupload-access.log"