openstack
/
charm-nova-compute-proxy
Code Issues Proposed changes

rabbitmq ssl for quantum/neutron

This commit is contained in:
Kapil Thangavelu 2014-02-23 18:08:22 -05:00
parent d7e90c0064
commit 3e28c0d8b4
5 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hooks/nova_compute_utils.py
View File

@ -91,21 +91,25 @@ CEPH_RESOURCES = {
}
}
QUANTUM_CONF = '/etc/quantum/quantum.conf'
QUANTUM_CONF_DIR = "/etc/quantum"
QUANTUM_CONF = '%s/quantum.conf' % QUANTUM_CONF_DIR
QUANTUM_RESOURCES = {
QUANTUM_CONF: {
'services': [],
'contexts': [context.AMQPContext(), NeutronComputeContext()],
'contexts': [context.AMQPContext(ssl_dir=QUANTUM_CONF_DIR),
NeutronComputeContext()],
}
}
NEUTRON_CONF = '/etc/neutron/neutron.conf'
NEUTRON_CONF_DIR = "/etc/neutron"
NEUTRON_CONF = '%s/neutron.conf' % NEUTRON_CONF_DIR
NEUTRON_RESOURCES = {
NEUTRON_CONF: {
'services': [],
'contexts': [context.AMQPContext(), NeutronComputeContext()],
'contexts': [context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
NeutronComputeContext()],
}
}

7
templates/folsom/nova.conf
View File

@ -33,6 +33,13 @@ rabbit_host = {{ rabbitmq_host }}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% if rabbit_ssl_port %}
rabbit_use_ssl=True
rabbit_port={{ rabbit_ssl_port }}
{% if rabbit_ssl_ca %}
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
{% endif %}
{% endif %}
{% endif -%}
{% if glance_api_servers -%}

8
templates/folsom/quantum.conf
View File

@ -21,7 +21,13 @@ rabbit_host = {{ rabbitmq_host }}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% if rabbit_ssl_port %}
rabbit_use_ssl=True
rabbit_port={{ rabbit_ssl_port }}
{% if rabbit_ssl_ca %}
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
{% endif %}
{% endif %}
{% endif -%}

7
templates/grizzly/nova.conf
View File

@ -33,6 +33,13 @@ rabbit_host = {{ rabbitmq_host }}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% if rabbit_ssl_port %}
rabbit_use_ssl=True
rabbit_port={{ rabbit_ssl_port }}
{% if rabbit_ssl_ca %}
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
{% endif %}
{% endif %}
{% endif -%}
{% if glance_api_servers -%}

8
templates/havana/neutron.conf
View File

@ -24,9 +24,15 @@ rabbit_host = {{ rabbitmq_host }}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% if rabbit_ssl_port %}
rabbit_use_ssl=True
rabbit_port={{ rabbit_ssl_port }}
{% if rabbit_ssl_ca %}
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
{% endif %}
{% endif %}
{% endif -%}
[QUOTAS]
[DEFAULT_SERVICETYPE]