Merge lp:~danilo/linaro-license-protection/bounce-apache into lp:~linaro-automation/linaro-license-protection/trunk

[Данило Шеган]

Use the command as allowed in https://rt.linaro.org/Ticket/Display.html?id=584
to bounce Apache to allow staging deployments to be fully automatic.

We'll have to modify the cronjob to include --bounce-apache command line option as well.

[Georgy Redkozubov (gesha)]

Looks good. Thanks.

review: Approve

=== modified file 'scripts/update-deployment.py'
--- scripts/update-deployment.py	2012-08-23 18:43:44 +0000
+++ scripts/update-deployment.py	2012-08-30 11:04:20 +0000
@@ -66,6 +66,7 @@
         self.run_subcommand(["bzr", "up"], branch_dir)
 
     def run_subcommand(self, arguments, cwd=None):
+        self.logger.debug("In %s, running: %s\n", cwd, str(arguments))
         process = subprocess.Popen(arguments, cwd=cwd, stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
         process_out, process_err = process.communicate()
@@ -114,6 +115,9 @@
     def setup_parser(self):
         super(UpdateDeploymentScript, self).setup_parser()
         self.argument_parser.add_argument(
+            '--bounce-apache', action='store_true', default=False,
+            help="Whether to make Apache reload the configuration.")
+        self.argument_parser.add_argument(
             'configs', metavar='CONFIG', nargs='+',
             choices=configs_to_use.keys(),
             help=("Django configuration module to use. One of " +
@@ -128,6 +132,10 @@
         for config in self.arguments.configs:
             self.update_installation(config, configs_to_use[config])
 
+        # Finally, bounce apache.
+        if self.arguments.bounce_apache:
+            self.run_subcommand(["sudo", "/etc/init.d/apache2", "reload"])
+
 
 if __name__ == '__main__':
     script = UpdateDeploymentScript(