Add preinstall execd hooks

charm-helpers.yaml

@@ -8,4 +8,4 @@ include:
     - contrib.hahelpers:
         - apache
         - ceph
-        - cluster
+    - payload.execd

hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf

@@ -1 +0,0 @@
-openstack_https_frontend

hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf

@@ -0,0 +1,23 @@
+{% if endpoints -%}
+{% for ext, int in endpoints -%}
+Listen {{ ext }}
+NameVirtualHost *:{{ ext }}
+<VirtualHost *:{{ ext }}>
+    ServerName {{ private_address }}
+    SSLEngine on
+    SSLCertificateFile /etc/apache2/ssl/{{ namespace }}/cert
+    SSLCertificateKeyFile /etc/apache2/ssl/{{ namespace }}/key
+    ProxyPass / http://localhost:{{ int }}/
+    ProxyPassReverse / http://localhost:{{ int }}/
+    ProxyPreserveHost on
+</VirtualHost>
+<Proxy *>
+    Order deny,allow
+    Allow from all
+</Proxy>
+<Location />
+    Order allow,deny
+    Allow from all
+</Location>
+{% endfor -%}
+{% endif -%}

hooks/charmhelpers/contrib/storage/linux/ceph.py

@@ -97,12 +97,13 @@ def pool_exists(service, name):
         return name in out
 
 
-def get_osds():
+def get_osds(service):
     '''
     Return a list of all Ceph Object Storage Daemons
     currently in the cluster
     '''
-    return json.loads(check_output(['ceph', 'osd', 'ls', '--format=json']))
+    return json.loads(check_output(['ceph', '--id', service,
+                                    'osd', 'ls', '--format=json']))
 
 
 def create_pool(service, name, replicas=2):
@@ -113,17 +114,17 @@ def create_pool(service, name, replicas=2):
         return
     # Calculate the number of placement groups based
     # on upstream recommended best practices.
-    pgnum = (len(get_osds()) * 100 / replicas)
+    pgnum = (len(get_osds(service)) * 100 / replicas)
     cmd = [
         'ceph', '--id', service,
         'osd', 'pool', 'create',
-        name, pgnum
+        name, str(pgnum)
     ]
     check_call(cmd)
     cmd = [
         'ceph', '--id', service,
-        'osd', 'set', name,
-        'size', replicas
+        'osd', 'pool', 'set', name,
+        'size', str(replicas)
     ]
     check_call(cmd)
 

hooks/charmhelpers/payload/__init__.py

@@ -0,0 +1 @@
+"Tools for working with files injected into a charm just before deployment."

hooks/charmhelpers/payload/execd.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import subprocess
+from charmhelpers.core import hookenv
+
+
+def default_execd_dir():
+    return os.path.join(os.environ['CHARM_DIR'], 'exec.d')
+
+
+def execd_module_paths(execd_dir=None):
+    """Generate a list of full paths to modules within execd_dir."""
+    if not execd_dir:
+        execd_dir = default_execd_dir()
+
+    if not os.path.exists(execd_dir):
+        return
+
+    for subpath in os.listdir(execd_dir):
+        module = os.path.join(execd_dir, subpath)
+        if os.path.isdir(module):
+            yield module
+
+
+def execd_submodule_paths(command, execd_dir=None):
+    """Generate a list of full paths to the specified command within exec_dir.
+    """
+    for module_path in execd_module_paths(execd_dir):
+        path = os.path.join(module_path, command)
+        if os.access(path, os.X_OK) and os.path.isfile(path):
+            yield path
+
+
+def execd_run(command, execd_dir=None, die_on_error=False, stderr=None):
+    """Run command for each module within execd_dir which defines it."""
+    for submodule_path in execd_submodule_paths(command, execd_dir):
+        try:
+            subprocess.check_call(submodule_path, shell=True, stderr=stderr)
+        except subprocess.CalledProcessError as e:
+            hookenv.log("Error ({}) running  {}. Output: {}".format(
+                e.returncode, e.cmd, e.output))
+            if die_on_error:
+                sys.exit(e.returncode)
+
+
+def execd_preinstall(execd_dir=None):
+    """Run charm-pre-install for each module within execd_dir."""
+    execd_run('charm-pre-install', execd_dir=execd_dir)

hooks/nova_cc_hooks.py

@@ -70,12 +70,15 @@ from charmhelpers.contrib.hahelpers.cluster import (
     is_leader,
 )
 
+from charmhelpers.payload.execd import execd_preinstall
+
 hooks = Hooks()
 CONFIGS = register_configs()
 
 
 @hooks.hook()
 def install():
+    execd_preinstall()
     configure_installation_source(config('openstack-origin'))
     apt_update()
     apt_install(determine_packages(), fatal=True)

unit_tests/test_nova_cc_hooks.py

@@ -33,6 +33,7 @@ TO_PATCH = [
     'ssh_known_hosts_b64',
     'ssh_authorized_keys_b64',
     'save_script_rc',
+    'execd_preinstall'
 ]
 
 
@@ -50,6 +51,7 @@ class NovaCCHooksTests(CharmTestCase):
         hooks.install()
         self.apt_install.assert_called_with(
             ['nova-scheduler', 'nova-api-ec2'], fatal=True)
+        self.execd_preinstall.assert_called()
 
     @patch.object(hooks, 'configure_https')
     def test_config_changed_no_upgrade(self, conf_https):