Drop use-https and associate configuration options

config.yaml

@@ -63,28 +63,6 @@ options:
     type: string
     description: |
       Base64 encoded SSL key to use with certificate specified as ssl_cert.
-  # Locally generated CA Cert info (only use without keystone)
-  # These options are deprecated and will be removed sometime
-  use-https:
-    default: "yes"
-    type: string
-    description: Whether to listen on HTTPS
-  country:
-    default: US
-    type: string
-    description: Country
-  state:
-    default: ST
-    type: string
-    description: State
-  locale:
-    default: City
-    type: string
-    description: Locale
-  common-name:
-    default: CN
-    type: string
-    description: Common Name
   # General Swift Proxy configuration
   bind-port:
     default: 8080

tests/basic_deployment.py

@@ -58,8 +58,7 @@ class SwiftProxyBasicDeployment(OpenStackAmuletDeployment):
                            'admin-token': 'ubuntutesting'}
         swift_proxy_config = {'zone-assignment': 'manual',
                            'replicas': '1',
-                           'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae',
-                           'use-https': 'no'}
+                           'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae'}
         swift_storage_config = {'zone': '1',
                                 'block-device': 'vdb',
                                 'overwrite': 'true'}