openstack
/
salt-formula-cinder
Code Issues Proposed changes

Merge "add support for config generation"

This commit is contained in:
Jenkins 2016-10-19 16:14:43 +00:00 committed by Gerrit Code Review
parent 80e1002ba8 19b3f34911
commit c8ae95b074
4 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/map.jinja
View File

@ -12,7 +12,7 @@
'wipe_method': 'none',
'notification': False,
},
}, merge=salt['pillar.get']('cinder:controller')) %}
}, merge=pillar.cinder.get('controller', {})) %}
{% set volume = salt['grains.filter_by']({
'Debian': {
@ -27,4 +27,4 @@
'wipe_method': 'none',
'notification': False,
},
}, merge=salt['pillar.get']('cinder:volume')) %}
}, merge=pillar.cinder.get('volume', {})) %}

10
cinder/meta/config.yml Normal file
View File

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

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

@ -0,0 +1,41 @@
parameters:
kubernetes:
control:
configmap:
cinder-control:
grains:
os_family: Debian
pillar:
cinder:
controller:
enabled: true
version: ${_param:cinder_version}
default_volume_type: ""
backend: {}
osapi:
host: 0.0.0.0
database:
engine: mysql
host: ${_param:mysql_service_host}
port: 3306
name: cinder
user: cinder
password: ${_param:mysql_cinder_password}
identity:
engine: keystone
region: RegionOne
host: ${_param:keystone_service_host}
port: 35357
tenant: service
user: cinder
password: ${_param:keystone_cinder_password}
glance:
host: ${_param:glance_service_host}
port: 9292
message_queue:
engine: rabbitmq
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
cache:
engine: memcached

2
metadata/service/support.yml
View File

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