Remove deprecated glance-replicator options

The mastertoken and slavetoken options were deprecated in Pike. This
completes the deprecation and removes those options.

Change-Id: Ifaaaa9cdd3240913e5b257d6a99aecd6be840b36
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

glance/cmd/replicator.py

@@ -60,20 +60,6 @@ cli_opts = [
                help=("Pass in your authentication token if you have "
                      "one. If you use this option the same token is "
                      "used for both the source and the target.")),
-    cfg.StrOpt('mastertoken',
-               short='M',
-               default='',
-               deprecated_since='Pike',
-               deprecated_reason='use sourcetoken instead',
-               help=("Pass in your authentication token if you have "
-                     "one. This is the token used for the source system.")),
-    cfg.StrOpt('slavetoken',
-               short='S',
-               default='',
-               deprecated_since='Pike',
-               deprecated_reason='use targettoken instead',
-               help=("Pass in your authentication token if you have "
-                     "one. This is the token used for the target system.")),
     cfg.StrOpt('command',
                positional=True,
                required=False,
@@ -87,17 +73,14 @@ cli_opts = [
 CONF = cfg.CONF
 CONF.register_cli_opts(cli_opts)
 
-# TODO(stevelle) Remove deprecated opts some time after Queens
 CONF.register_opt(
     cfg.StrOpt('sourcetoken',
                default='',
-               deprecated_opts=[cfg.DeprecatedOpt('mastertoken')],
                help=("Pass in your authentication token if you have "
                      "one. This is the token used for the source.")))
 CONF.register_opt(
     cfg.StrOpt('targettoken',
                default='',
-               deprecated_opts=[cfg.DeprecatedOpt('slavetoken')],
                help=("Pass in your authentication token if you have "
                      "one. This is the token used for the target.")))
 

releasenotes/notes/replicator-token-cleanup-4a573c86f1acccc0.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The ``glance-replicator`` options ``mastertoken`` and ``slavetoken`` were
+    deprecated in the Pike release cycle. These options have now been removed.
+    The options ``sourcetoken`` and ``targettoken`` should be used instead.