openstack
/
ansible-role-k8s-glance
Code Issues Proposed changes

Now glance works

This commit is contained in:
Flavio Percoco 2017-08-23 15:45:43 +02:00
parent ad43e0f825
commit 433e30db2f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/hiera.yml
View File

@ -5,7 +5,9 @@
hieradata: '{{hiera_data}}' hieradata: '{{hiera_data}}'
hieradata_file: '{{hiera_data_file}}' hieradata_file: '{{hiera_data_file}}'
schema: schema:
glance::database_connection: database.connection # NOTE(flaper87): We should be able to use the connection
# str coming from hiera. Let's use k8s' DNS for now.
# glance::database_connection: database.connection
glance_log_file: DEFAULT.log_file glance_log_file: DEFAULT.log_file
glance::api::debug: DEFAULT.debug glance::api::debug: DEFAULT.debug
@ -42,6 +44,7 @@
glance::notification_driver: oslo_messaging_notifications.driver glance::notification_driver: oslo_messaging_notifications.driver
glance::notification_topics: oslo_messaging_notifications.topics glance::notification_topics: oslo_messaging_notifications.topics
default: '{{glance_config}}'
fact_variable: 'glance_config' fact_variable: 'glance_config'
# glance::policy::policies: {get_param: GlanceApiPolicies} # glance::policy::policies: {get_param: GlanceApiPolicies}

4
tasks/provision.yml
View File

@ -56,7 +56,7 @@
data: data:
config.json: | config.json: |
{ {
"command": "/usr/sbin/httpd -DFOREGROUND", "command": "glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf",
"config_files": [ "config_files": [
{ {
"dest": "/etc/httpd/conf/httpd.conf", "dest": "/etc/httpd/conf/httpd.conf",
@ -75,7 +75,7 @@
"owner": "root", "owner": "root",
"perm": "0644", "perm": "0644",
"source": "/var/lib/kolla/config_files/httpd-glance-main.conf" "source": "/var/lib/kolla/config_files/httpd-glance-main.conf"
}, }
] ]
} }
glance-api.conf: | glance-api.conf: |