Skip to content

Commit

Permalink
[tls] Make a cert SLS IDs globally unique
Browse files Browse the repository at this point in the history
At the moment most of openstack formulas have
the same ids of certs at state files, e.g.:

 nova/server.sls   - rabbitmq_ca : file_managed
 glance/server.sls - rabbitmq_ca : file_managed

So, any attempt to use the:

   salt-call state.apply

fails with:

  Detected conflicting IDs, SLS IDs need to be
  globally unique.

Change-Id: I5d1da7bc0e06359db9cbb186f42fa2dee3deb20a
  • Loading branch information
kbespalov committed Nov 14, 2017
1 parent be1e584 commit 83fc763
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions glance/server.sls
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ glance_glare_service:
- watch:
- file: /etc/glance/glance-glare.conf
{%- if server.message_queue.get('ssl',{}).get('enabled',False) %}
- file: rabbitmq_ca
- file: rabbitmq_ca_glance_server
{% endif %}
{%- if server.database.get('ssl',{}).get('enabled',False) %}
- file: mysql_ca
- file: mysql_ca_glance_server
{% endif %}
{%- endif %}
Expand Down Expand Up @@ -129,10 +129,10 @@ glance_services:
- file: /etc/glance/glance-registry.conf
- file: /etc/glance/glance-api-paste.ini
{%- if server.message_queue.get('ssl',{}).get('enabled',False) %}
- file: rabbitmq_ca
- file: rabbitmq_ca_glance_server
{% endif %}
{%- if server.database.get('ssl',{}).get('enabled',False) %}
- file: mysql_ca
- file: mysql_ca_glance_server
{% endif %}
glance_install_database:
Expand Down Expand Up @@ -271,7 +271,7 @@ rule_{{ name }}_absent:
{%- endfor %}
{%- if server.message_queue.get('ssl',{}).get('enabled', False) %}
rabbitmq_ca:
rabbitmq_ca_glance_server:
{%- if server.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ server.message_queue.ssl.cacert_file }}
Expand All @@ -285,7 +285,7 @@ rabbitmq_ca:
{% endif %}
{%- if server.database.get('ssl',{}).get('enabled',False) %}
mysql_ca:
mysql_ca_glance_server:
{%- if server.database.ssl.cacert is defined %}
file.managed:
- name: {{ server.database.ssl.cacert_file }}
Expand Down

0 comments on commit 83fc763

Please sign in to comment.