Merge lp:~thomir-deactivatedaccount/adt-continuous-deployer/trunk-fix-warning-message into lp:adt-continuous-deployer

[Thomi Richards]

Fix warning message about using both config-on-disk and config-from-cli.

Fix a bug where the warning message about using config on disk and supplying config arguments was skipping any config argument with a '-' in the name.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'mojo.py'
--- mojo.py	2015-06-02 02:36:49 +0000
+++ mojo.py	2015-06-07 20:43:31 +0000
@@ -166,22 +166,22 @@
         # config on the command line, as they might get confused otherwise.
         deprecated_args = (
             'network',
-            'amqp-uris',
-            'logstash-host',
-            'swift-public-url',
-            'image-mapper-url',
-            'os-username',
-            'os-tenant-name',
-            'os-password',
-            'os-auth-url',
-            'os-region-name',
-            'adt-os-username',
-            'adt-os-tenant-name',
-            'adt-os-password',
-            'adt-os-auth-url',
-            'adt-os-region-name',
-            'adt-extra-args',
-            'adt-http-proxy',
+            'amqp_uris',
+            'logstash_host',
+            'swift_public_url',
+            'image_mapper_url',
+            'os_username',
+            'os_tenant_name',
+            'os_password',
+            'os_auth_url',
+            'os_region_name',
+            'adt_os_username',
+            'adt_os_tenant_name',
+            'adt_os_password',
+            'adt_os_auth_url',
+            'adt_os_region_name',
+            'adt_extra_args',
+            'adt_http_proxy',
         )
         used_deprepcated = [a for a in deprecated_args if a in args]
         if used_deprepcated: