diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-10 04:42:31 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-10 04:42:31 +0000 |
| commit | 0247df7a7de611ef5178e494a6cf4cbff4d6fe6b (patch) | |
| tree | 2e8dd8687e8048a0a2ade4d90bce946dd02278df | |
| parent | 96b8d86ca51c8c2c0576e827b548bf0f50c8a097 (diff) | |
| download | kolla-0247df7a7de611ef5178e494a6cf4cbff4d6fe6b.tar.gz kolla-0247df7a7de611ef5178e494a6cf4cbff4d6fe6b.zip | |
Update glance confs and ports
Cleanup all options in the minimal glance confs. Remove options where
the default value was specified explicitly. Updated ports and bindings
to be configurable.
For rabbitmq, those options will only be needed once ceilometer is
implemented. At that point they will exist in an 'if' block.
Change-Id: Idcf0ebc625a5ef3a83181bce10281596a5f1d684
Partially-Implements: blueprint update-configs
| -rw-r--r-- | ansible/roles/glance/templates/glance-api.conf.j2 | 8 | ||||
| -rw-r--r-- | ansible/roles/glance/templates/glance-registry.conf.j2 | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index ed1a98127..abba3913a 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -3,13 +3,9 @@ verbose = true debug = true bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} +bind_port = {{ glance_api_port }} -rabbit_host = {{ kolla_internal_address }} -rabbit_userid = {{ rabbitmq_user }} -rabbit_password = {{ rabbitmq_password }} -rabbit_ha_queues = true - -notification_driver = nova.openstack.common.notifier.rpc_notifier +notification_driver = noop registry_host = {{ kolla_internal_address }} diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2 index b494e0903..b9031eb11 100644 --- a/ansible/roles/glance/templates/glance-registry.conf.j2 +++ b/ansible/roles/glance/templates/glance-registry.conf.j2 @@ -3,6 +3,9 @@ verbose = true debug = true bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} +bind_port = {{ glance_registry_port }} + +notification_driver = noop [database] connection = mysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} |