Merge lp:~hopem/charms/precise/nova-cloud-controller/lp1273469 into lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

[Edward Hope-Morley]

Quoting ivoks from merge/206634:

As part of changing OpenStack charm to provide better SSL experience, we need to put HAproxy in front of the Apache. Apache then does SSL termination on destination host, and HAproxy balances TCP traffic instead of HTTP. This allows us to keep all outside server traffic - crypted.

In addition, we stop and start services, instead of restarting. This avoids TCP port conflicts.

Depends on charm-helpers from: lp:~ivoks/charm-helpers/new-ssl

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-02-19 11:02:03 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-02-26 14:17:33 +0000
@@ -29,6 +29,7 @@
     determine_apache_port,
     determine_api_port,
     https,
+    is_clustered
 )
 
 from charmhelpers.contrib.hahelpers.apache import (
@@ -240,10 +241,13 @@
         '''This generates context for /etc/ceph/ceph.conf templates'''
         if not relation_ids('ceph'):
             return {}
+
         log('Generating template context for ceph')
+
         mon_hosts = []
         auth = None
         key = None
+        use_syslog = str(config('use-syslog')).lower()
         for rid in relation_ids('ceph'):
             for unit in related_units(rid):
                 mon_hosts.append(relation_get('private-address', rid=rid,
@@ -255,6 +259,7 @@
             'mon_hosts': ' '.join(mon_hosts),
             'auth': auth,
             'key': key,
+            'use_syslog': use_syslog
         }
 
         if not os.path.isdir('/etc/ceph'):
@@ -391,7 +396,7 @@
         return ctxt
 
 
-class NeutronContext(object):
+class NeutronContext(OSContextGenerator):
     interfaces = []
 
     @property
@@ -452,6 +457,22 @@
 
         return nvp_ctxt
 
+    def neutron_ctxt(self):
+        if https():
+            proto = 'https'
+        else:
+            proto = 'http'
+        if is_clustered():
+            host = config('vip')
+        else:
+            host = unit_get('private-address')
+        url = '%s://%s:%s' % (proto, host, '9292')
+        ctxt = {
+            'network_manager': self.network_manager,
+            'neutron_url': url,
+        }
+        return ctxt
+
     def __call__(self):
         self._ensure_packages()
 
@@ -461,7 +482,7 @@
         if not self.plugin:
             return {}
 
-        ctxt = {'network_manager': self.network_manager}
+        ctxt = self.neutron_ctxt()
 
         if self.plugin == 'ovs':
             ctxt.update(self.ovs_ctxt())

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/ceph.conf'
--- hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2013-08-02 03:42:16 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2014-02-26 14:17:33 +0000
@@ -9,3 +9,6 @@
  keyring = /etc/ceph/$cluster.$name.keyring
  mon host = {{ mon_hosts }}
 {% endif -%}
+log to syslog = {{ use_syslog }}
+err to syslog = {{ use_syslog }}
+clog to syslog = {{ use_syslog }}

=== modified file 'hooks/charmhelpers/contrib/storage/linux/ceph.py'
--- hooks/charmhelpers/contrib/storage/linux/ceph.py	2013-11-06 03:48:26 +0000
+++ hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-02-26 14:17:33 +0000
@@ -49,6 +49,9 @@
  auth supported = {auth}
  keyring = {keyring}
  mon host = {mon_hosts}
+ log to syslog = {use_syslog}
+ err to syslog = {use_syslog}
+ clog to syslog = {use_syslog}
 """
 
 
@@ -194,7 +197,7 @@
     return hosts
 
 
-def configure(service, key, auth):
+def configure(service, key, auth, use_syslog):
     ''' Perform basic configuration of Ceph '''
     create_keyring(service, key)
     create_key_file(service, key)
@@ -202,7 +205,8 @@
     with open('/etc/ceph/ceph.conf', 'w') as ceph_conf:
         ceph_conf.write(CEPH_CONF.format(auth=auth,
                                          keyring=_keyring_path(service),
-                                         mon_hosts=",".join(map(str, hosts))))
+                                         mon_hosts=",".join(map(str, hosts)),
+                                         use_syslog=use_syslog))
     modprobe('rbd')
 
 

=== modified file 'templates/folsom/nova.conf'
--- templates/folsom/nova.conf	2014-02-19 13:29:35 +0000
+++ templates/folsom/nova.conf	2014-02-26 14:17:33 +0000
@@ -73,6 +73,7 @@
 
 {% if network_manager and network_manager == 'quantum' -%}
 network_api_class = nova.network.quantumv2.api.API
+quantum_url = {{ neutron_url }}
 {% if auth_host -%}
 quantum_auth_strategy = keystone
 quantum_admin_tenant_name = {{ admin_tenant_name }}
@@ -82,6 +83,7 @@
 {% endif -%}
 {% elif network_manager and network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
+neutron_url = {{ neutron_url }}
 {% if auth_host -%}
 neutron_auth_strategy = keystone
 neutron_admin_tenant_name = {{ admin_tenant_name }}