Merge "Configure SSL for qpid in clients"

packstack/plugins/qpid_002.py

@@ -156,6 +156,8 @@ def createmanifest(config):
     if config['CONFIG_QPID_ENABLE_SSL'] == 'y':
         ports.add("'%s'" % (config['CONFIG_QPID_SSL_PORT']))
         config['CONFIG_QPID_ENABLE_SSL'] = 'true'
+        config['CONFIG_QPID_PROTOCOL'] = 'ssl'
+        config['CONFIG_QPID_CLIENTS_PORT'] = "5671"
         if config['CONFIG_QPID_SSL_SELF_SIGNED'] == 'y':
             server.append( "openssl req -batch -new -x509 -nodes -keyout %s -out %s -days 1095"
                 % (config['CONFIG_QPID_SSL_KEY_FILE'], config['CONFIG_QPID_SSL_CERT_FILE']) )
@@ -163,11 +165,13 @@ def createmanifest(config):
         ssl_manifestdata = getManifestTemplate('qpid_ssl.pp')
     else:
         #Set default values 
+        config['CONFIG_QPID_CLIENTS_PORT'] = "5672"
         config['CONFIG_QPID_SSL_PORT'] = "5671"
         config['CONFIG_QPID_SSL_CERT_FILE'] = ""
         config['CONFIG_QPID_SSL_KEY_FILE'] = ""
         config['CONFIG_QPID_NSS_CERTDB_PW'] = ""
         config['CONFIG_QPID_ENABLE_SSL'] = 'false'
+        config['CONFIG_QPID_PROTOCOL'] = 'tcp'
 
     manifestdata = getManifestTemplate('qpid.pp')
     manifestdata += ssl_manifestdata

packstack/puppet/templates/ceilometer.pp

@@ -20,6 +20,8 @@ class { 'ceilometer':
     rpc_backend     => 'ceilometer.openstack.common.rpc.impl_qpid',
     verbose         => true,
     debug           => false,
+    qpid_port       => '%(CONFIG_QPID_CLIENTS_PORT)s',
+    qpid_protocol   => '%(CONFIG_QPID_PROTOCOL)s'
 }
 
 class { 'ceilometer::db':

packstack/puppet/templates/cinder.pp

@@ -3,6 +3,8 @@ class {'cinder':
     rpc_backend    => 'cinder.openstack.common.rpc.impl_qpid',
     qpid_hostname  => "%(CONFIG_QPID_HOST)s",
     qpid_password  => "notused",
+    qpid_port       => '%(CONFIG_QPID_CLIENTS_PORT)s',
+    qpid_protocol   => '%(CONFIG_QPID_PROTOCOL)s',
     sql_connection => "mysql://cinder:%(CONFIG_CINDER_DB_PW)s@%(CONFIG_MYSQL_HOST)s/cinder"
 }
 

packstack/puppet/templates/heat.pp

@@ -6,7 +6,9 @@ class { 'heat':
     rpc_backend   => 'heat.openstack.common.rpc.impl_qpid',
     qpid_hostname => '%(CONFIG_QPID_HOST)s',
     verbose       => true,
-    debug         => false
+    debug         => false,
+    qpid_port       => '%(CONFIG_QPID_CLIENTS_PORT)s',
+    qpid_protocol   => '%(CONFIG_QPID_PROTOCOL)s'
 }
 
 class {"heat::db":

packstack/puppet/templates/neutron.pp

@@ -12,4 +12,6 @@ class { 'neutron':
   core_plugin => '%(CONFIG_NEUTRON_CORE_PLUGIN)s',
   allow_overlapping_ips => true,
   verbose => true,
+  qpid_port       => '%(CONFIG_QPID_CLIENTS_PORT)s',
+  qpid_protocol   => '%(CONFIG_QPID_PROTOCOL)s'
 }

packstack/puppet/templates/nova_common.pp

@@ -14,4 +14,6 @@ class { "nova":
     rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
     verbose     => true,
     debug       => true,
+    qpid_port       => '%(CONFIG_QPID_CLIENTS_PORT)s',
+    qpid_protocol   => '%(CONFIG_QPID_PROTOCOL)s'
 }