openstack
/
salt-formula-glance
Code Issues Proposed changes

add support for config generation 

Change-Id: I421123af9cb6307390d9de82320bc88a223dbb57
This commit is contained in:
marco 2016-09-27 13:13:25 +02:00
parent 35a78a3bd8
commit 15d97254d8
4 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/map.jinja
View File

@ -10,4 +10,4 @@
'services': ['openstack-glance-api', 'openstack-glance-registry'],
'notification': False,
},
}, merge=salt['pillar.get']('glance:server')) %}
}, merge=pillar.glance.get('server', {})) %}

19
glance/meta/config.yml Normal file
View File

@ -0,0 +1,19 @@
config:
{%- if pillar.glance.server is defined %}
{%- from "glance/map.jinja" import server with context %}
glance-api.conf:
source: "salt://glance/files/{{ server.version }}/glance-api.conf.{{ grains.os_family|default('Debian') }}"
template: jinja
glance-cache.conf:
source: "salt://glance/files/{{ server.version }}/glance-cache.conf.{{ grains.os_family|default('Debian') }}"
template: jinja
glance-registry.conf:
source: "salt://glance/files/{{ server.version }}/glance-registry.conf.{{ grains.os_family|default('Debian') }}"
template: jinja
glance-scrubber.conf:
source: "salt://glance/files/{{ server.version }}/glance-scrubber.conf.{{ grains.os_family|default('Debian') }}"
template: jinja
glance-api-paste.ini:
source: "salt://glance/files/{{ server.version }}/glance-api-paste.ini"
template: jinja
{%- endif %}

44
metadata/service/control/container.yml Normal file
View File

@ -0,0 +1,44 @@
parameters:
kubernetes:
control:
configmap:
glance-server:
grains:
os_family: Debian
pillar:
glance:
server:
enabled: true
version: ${_param:glance_version}
workers: 8
database:
engine: mysql
host: ${_param:mysql_service_host}
port: 3306
name: glance
user: glance
password: ${_param:mysql_glance_password}
registry:
host: 0.0.0.0
port: 9191
bind:
address: 0.0.0.0
port: 9292
identity:
engine: keystone
host: ${_param:keystone_service_host}
port: 35357
user: glance
password: ${_param:keystone_glance_password}
tenant: service
message_queue:
engine: rabbitmq
host: ${_param:rabbitmq_service_host}
port: 5672
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
storage:
engine: file
cache:
engine: memcached

2
metadata/service/support.yml
View File

@ -9,3 +9,5 @@ parameters:
enabled: true
sphinx:
enabled: true
config:
enabled: true