Merge lp:~psivaa/charms/precise/ubuntu-ci-services-itself/upstart-with-proxy-2 into lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart

[Para Siva]

This is for ppa-cleaner upstart job to take in http proxies.

This is for ppa-cleaner upstart job to take in http proxies.

[Para Siva (psivaa)]

Just realised the need for this to work with uci-engine trunk. Still WIP

[Para Siva (psivaa)]

This should work for both private clouds and otherwise. The change look cumbersome. Please feel free to correct.

[Andy Doan (doanac)]

You should be able to keep this diff smaller with jinja2 conditional logic like:

{% if proxy_url %}
env http_proxy={proxy_url}
env https_proxy={proxy_url}
{% endif %}

Then you won't need those two big blocks that are essentially the same logic

review: Needs Fixing

[lp:~psivaa/charms/precise/ubuntu-ci-services-itself/upstart-with-proxy-2]

11. By Para Siva on 2014-05-21

Better conditional format

12. By Para Siva on 2014-05-21

Upstart command to work with both type of clouds-fixed

13. By Para Siva on 2014-05-21

Typo fix

[Para Siva (psivaa)]

Thanks for that doanac. Direct copying of that snippet is throwing KeyError during the charm installation and therefore I've used the fix in r13. This atleast does not throw errors during deployments. I've tried to verify if that'd give me the needed upstart job but it's taking too long to get one deployment going. Will update once i've been able to deploy.

[Andy Doan (doanac)]

small comment to make it better

[lp:~psivaa/charms/precise/ubuntu-ci-services-itself/upstart-with-proxy-2]

14. By Para Siva on 2014-05-22

Using doanac's hack for conditional proxy

15. By Para Siva on 2014-05-27

Adding no-proxy for the needed urls

16. By Para Siva on 2014-05-27

Fix the syntax in no proxy inclusion

Unmerged revisions

16. By Para Siva on 2014-05-27

Fix the syntax in no proxy inclusion

15. By Para Siva on 2014-05-27

Adding no-proxy for the needed urls

14. By Para Siva on 2014-05-22

Using doanac's hack for conditional proxy

13. By Para Siva on 2014-05-21

Typo fix

12. By Para Siva on 2014-05-21

Upstart command to work with both type of clouds-fixed

11. By Para Siva on 2014-05-21

Better conditional format

10. By Para Siva on 2014-05-20

Making the hooks conditional if the proxy is defined

9. By Para Siva on 2014-05-20

Pep8 fix

8. By Para Siva on 2014-05-20

Add http proxy env variable for ppa-cleaner upstart job

=== modified file 'config.yaml'
--- config.yaml	2014-01-15 18:39:50 +0000
+++ config.yaml	2014-05-27 12:39:07 +0000
@@ -2,6 +2,14 @@
   script:
     type: string
     description: "The script to execute as a daemon. Can be a relative path"
+  proxy-url:
+    type: string
+    default: ""
+    description: The http proxy url for private clouds.
+  no-proxy:
+    type: string
+    default: ""
+    description: The hopt ips to bypass proxy.
   service-name:
     type: string
     description: "The name of the upstart job"

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-03-21 23:22:42 +0000
+++ hooks/hooks.py	2014-05-27 12:39:07 +0000
@@ -46,10 +46,15 @@
 
     setuid {uid}
     setgid {gid}
-
     chdir {sdir}
+    {proxy}
     exec {main}
     ''')
+    proxy = ''
+    if config['proxy-url']:
+        url = config['proxy-url']
+        no_proxy = config['no-proxy']
+        proxy = 'env http_proxy=%s\nenv https_proxy=%s\nenv no_proxy=%s\n' % (url, url, no_proxy)
     defstart = '(local-filesystems and net-device-up IFACE=eth0)'
     defstop = 'runlevel [!12345]'
     params = {
@@ -60,6 +65,7 @@
         'stop_on': config.get('stop-on', defstop),
         'uid': config.get('uid', 'nobody'),
         'gid': config.get('gid', 'nogroup'),
+        'proxy': proxy,
     }
 
     with open(_upstart_file(config), 'w') as f: