Merge "add support for config generation"
diff --git a/glance/map.jinja b/glance/map.jinja
index 7389e69..ec0b8d5 100644
--- a/glance/map.jinja
+++ b/glance/map.jinja
@@ -10,4 +10,4 @@
'services': ['openstack-glance-api', 'openstack-glance-registry'],
'notification': False,
},
-}, merge=salt['pillar.get']('glance:server')) %}
+}, merge=pillar.glance.get('server', {})) %}
\ No newline at end of file
diff --git a/glance/meta/config.yml b/glance/meta/config.yml
new file mode 100644
index 0000000..d71b169
--- /dev/null
+++ b/glance/meta/config.yml
@@ -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 %}
\ No newline at end of file
diff --git a/metadata/service/control/container.yml b/metadata/service/control/container.yml
new file mode 100644
index 0000000..0ea8b07
--- /dev/null
+++ b/metadata/service/control/container.yml
@@ -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
\ No newline at end of file
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 260ce7e..ddcb93e 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -9,3 +9,5 @@
enabled: true
sphinx:
enabled: true
+ config:
+ enabled: true
\ No newline at end of file