Remove obsolete options

Note: turning on these options prevents mongo from starting, even in Trusty; there is therefore no reason to deprecate them first since noone could possibly be using them. Closes-Bug: 1580962 

2 files changed, 0 insertions, 54 deletions

diff --git a/config.yaml b/config.yaml
index 5347e63..05b2f79 100644
--- a/config.yaml
+++ b/config.yaml
@@ -63,14 +63,6 @@ options:
 default: 0
 type: int
 description: DEPRECATED Set oplogging level where n is 0=off (default), 1=W, 2=R, 3=both, 7=W+some reads
- nocursors:
- default: False
- type: boolean
- description: Diagnostic/debugging option
- nohints:
- default: False
- type: boolean
- description: Ignore query hints
 noscripting:
 default: False
 type: boolean
@@ -87,18 +79,6 @@ options:
 default: "default"
 type: string
 description: Specify .ns file size for new databases
- mms-token:
- default: "disabled"
- type: string
- description: Accout token for Mongo monitoring server
- mms-name:
- default: "disabled"
- type: string
- description: Server name for Mongo monitoring server
- mms-interval:
- default: "disabled"
- type: string
- description: Ping interval for Mongo monitoring server ( in number of seconds )
 autoresync:
 default: False
 type: boolean
@@ -107,10 +87,6 @@ options:
 default: "default"
 type: string
 description: Custom size for replication operation log
- opIdMem:
- default: "default"
- type: string
- description: Size limit for in-memory storage of op ids
 replicaset:
 default: myset
 type: string
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 5bd7ce7..b59a6a7 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -359,16 +359,6 @@ def mongodb_conf(config_data=None): # noqa: C901 is too complex (28)
 config.append("rest = true")
 config.append("")
 
- # nocursors
- if config_data['nocursors']:
- config.append("nocursors = true")
- config.append("")
-
- # nohints
- if config_data['nohints']:
- config.append("nohints = true")
- config.append("")
-
 # noscripting
 if config_data['noscripting']:
 config.append("noscripting = true")
@@ -389,21 +379,6 @@ def mongodb_conf(config_data=None): # noqa: C901 is too complex (28)
 config.append("nssize = %s" % config_data['nssize'])
 config.append("")
 
- # mms-token
- if config_data['mms-token'] != "disabled":
- config.append("mms-token = %s" % config_data['mms-token'])
- config.append("")
-
- # mms-name
- if config_data['mms-name'] != "disabled":
- config.append("mms-name = %s" % config_data['mms-name'])
- config.append("")
-
- # mms-interval
- if config_data['mms-interval'] != "disabled":
- config.append("mms-interval = %s" % config_data['mms-interval'])
- config.append("")
-
 # Set either replica-set or master, depending upon whether the
 # the replica-set (peer) relation is established. If the user
 # chooses to use juju scale out (e.g. juju add-unit) then the
@@ -438,11 +413,6 @@ def mongodb_conf(config_data=None): # noqa: C901 is too complex (28)
 config.append("oplogSize = %s" % config_data['oplogSize'])
 config.append("")
 
- # opIdMem
- if config_data['opIdMem'] != "default":
- config.append("opIdMem = %s" % config_data['opIdMem'])
- config.append("")
-
 # extra config options
 if config_data['extra_config_options'] != "none":
 for config_option in config_data['extra_config_options'].split(','):