Implement X.509 auth between Rabbitmq and Glance
Change-Id: Ib496fcb5c1709b884b026b3e92b74d79184fcb7e
Related-Prod: PROD-22759
diff --git a/glance/_ssl/rabbitmq.sls b/glance/_ssl/rabbitmq.sls
new file mode 100644
index 0000000..4c3d066
--- /dev/null
+++ b/glance/_ssl/rabbitmq.sls
@@ -0,0 +1,77 @@
+{%- from "glance/map.jinja" import server with context %}
+
+glance_ssl_rabbitmq:
+ test.show_notification:
+ - text: "Running glance._ssl.rabbitmq"
+
+{%- if server.message_queue.get('x509',{}).get('enabled',False) %}
+
+ {%- set ca_file=server.message_queue.x509.ca_file %}
+ {%- set key_file=server.message_queue.x509.key_file %}
+ {%- set cert_file=server.message_queue.x509.cert_file %}
+
+rabbitmq_glance_ssl_x509_ca:
+ {%- if server.message_queue.x509.cacert is defined %}
+ file.managed:
+ - name: {{ ca_file }}
+ - contents_pillar: glance:server:message_queue:x509:cacert
+ - mode: 444
+ - user: glance
+ - group: glance
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ ca_file }}
+ {%- endif %}
+
+rabbitmq_glance_client_ssl_cert:
+ {%- if server.message_queue.x509.cert is defined %}
+ file.managed:
+ - name: {{ cert_file }}
+ - contents_pillar: glance:server:message_queue:x509:cert
+ - mode: 440
+ - user: glance
+ - group: glance
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ cert_file }}
+ {%- endif %}
+
+rabbitmq_glance_client_ssl_private_key:
+ {%- if server.message_queue.x509.key is defined %}
+ file.managed:
+ - name: {{ key_file }}
+ - contents_pillar: glance:server:message_queue:x509:key
+ - mode: 400
+ - user: glance
+ - group: glance
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ key_file }}
+ {%- endif %}
+
+rabbitmq_glance_ssl_x509_set_user_and_group:
+ file.managed:
+ - names:
+ - {{ ca_file }}
+ - {{ cert_file }}
+ - {{ key_file }}
+ - user: glance
+ - group: glance
+
+{% elif server.message_queue.get('ssl',{}).get('enabled',False) %}
+rabbitmq_ca_glance_client:
+ {%- if server.message_queue.ssl.cacert is defined %}
+ file.managed:
+ - name: {{ server.message_queue.ssl.cacert_file }}
+ - contents_pillar: glance:server:message_queue:ssl:cacert
+ - mode: 0444
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ server.message_queue.ssl.get('cacert_file', server.cacert_file) }}
+ {%- endif %}
+
+{%- endif %}
diff --git a/glance/files/pike/glance-api.conf.Debian b/glance/files/pike/glance-api.conf.Debian
index 8983a7f..248c648 100644
--- a/glance/files/pike/glance-api.conf.Debian
+++ b/glance/files/pike/glance-api.conf.Debian
@@ -3690,6 +3690,13 @@
{%- endif %}
kombu_ssl_ca_certs = {{ server.message_queue.ssl.get('cacert_file', server.cacert_file) }}
+{%- if server.message_queue.get('x509',{}).get('enabled', False) %}
+
+kombu_ssl_keyfile = {{ server.message_queue.x509.key_file}}
+
+kombu_ssl_certfile = {{ server.message_queue.x509.cert_file}}
+{%- endif %}
+
{%- endif %}
# Use durable queues in AMQP. (boolean value)
diff --git a/glance/files/pike/glance-registry.conf.Debian b/glance/files/pike/glance-registry.conf.Debian
index b4ac193..6589a46 100644
--- a/glance/files/pike/glance-registry.conf.Debian
+++ b/glance/files/pike/glance-registry.conf.Debian
@@ -1589,6 +1589,13 @@
{%- endif %}
kombu_ssl_ca_certs = {{ server.message_queue.ssl.get('cacert_file', server.cacert_file) }}
+{%- if server.message_queue.get('x509',{}).get('enabled', False) %}
+
+kombu_ssl_keyfile = {{ server.message_queue.x509.key_file}}
+
+kombu_ssl_certfile = {{ server.message_queue.x509.cert_file}}
+{%- endif %}
+
{%- endif %}
# Use durable queues in AMQP. (boolean value)
diff --git a/glance/server.sls b/glance/server.sls
index b33e922..9c2bff3 100644
--- a/glance/server.sls
+++ b/glance/server.sls
@@ -5,6 +5,7 @@
include:
- glance.db.offline_sync
- glance._ssl.mysql
+ - glance._ssl.rabbitmq
glance_packages:
pkg.installed:
@@ -12,6 +13,7 @@
- require_in:
- sls: glance.db.offline_sync
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
{%- if not salt['user.info']('glance') %}
glance_user:
@@ -57,6 +59,7 @@
- require:
- pkg: glance_packages
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- require_in:
- sls: glance.db.offline_sync
@@ -69,6 +72,7 @@
- require:
- pkg: glance_packages
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- require_in:
- sls: glance.db.offline_sync
@@ -81,6 +85,7 @@
- require:
- pkg: glance_packages
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- require_in:
- sls: glance.db.offline_sync
@@ -93,6 +98,7 @@
- require:
- pkg: glance_packages
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- require_in:
- sls: glance.db.offline_sync
@@ -112,6 +118,7 @@
- pkg: glance_packages
- pkg: glance_glare_package
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- require_in:
- sls: glance.db.offline_sync
@@ -125,6 +132,7 @@
- pkg: glance_packages
- pkg: glance_glare_package
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- require_in:
- sls: glance.db.offline_sync
@@ -137,6 +145,7 @@
- require:
- sls: glance.db.offline_sync
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- watch:
- file: /etc/glance/glance-glare.conf
{%- if server.message_queue.get('ssl',{}).get('enabled',False) %}
@@ -257,6 +266,7 @@
- require:
- sls: glance.db.offline_sync
- sls: glance._ssl.mysql
+ - sls: glance._ssl.rabbitmq
- watch:
- file: /etc/glance/glance-api.conf
- file: /etc/glance/glance-registry.conf