Merge ~codersquid/hexr/+git/submission-service-charm:duplicated-store-proxy into ~hexr-dev/hexr/+git/submission-service-charm:master

[Sheila Miguez]

remove proxy store code because it happens in the snap layer.

remove proxy store code because it happens in the snap layer.

diff --git a/config.yaml b/config.yaml
index b1b605e..b2aafbd 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,8 +1,4 @@
 options:
-  snap_store_proxy:
-    type: string
-    default: ""
-    description: "Proxy server for accessing the snap store. Optional."
   submission_environment:
     type: string
     default: "dev"
diff --git a/reactive/submission_service.py b/reactive/submission_service.py
index e660aca..2352ae2 100644
--- a/reactive/submission_service.py
+++ b/reactive/submission_service.py
@@ -55,9 +55,6 @@ def install_snap():
     # expose the port that the service listens on
     update_port()
 
-    # Set the proxy server and restart the snapd service, if required
-    set_proxy_server()
-
     snap.install(SNAP)
 
     # let the user know if they need to add a database relation
@@ -337,25 +334,3 @@ def get_database():
 def update_port():
     config = hookenv.config()
     hookenv.open_port(config['submission_service_port'], protocol='TCP')
-
-
-def set_proxy_server():
-    """Set up the proxy server for snapd.
-
-    Some environments may need a proxy server to access the Snap Store. The
-    access is from snapd rather than the snap command, so the system-wide
-    environment file needs to be updated and snapd needs to be restarted.
-    """
-    config = hookenv.config()
-    if len(config.get('snap_store_proxy', "")) == 0:
-        return
-
-    # Update the /etc/environment file
-    env_command = 'echo "{}={}" | sudo tee -a /etc/environment'
-    subprocess.check_output(
-        env_command.format('http_proxy', config['snap_store_proxy']), shell=True)
-    subprocess.check_output(
-        env_command.format('https_proxy', config['snap_store_proxy']), shell=True)
-
-    # Restart the snapd service
-    service_restart('snapd')