diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-12 20:22:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-12 20:22:07 +0000 |
| commit | d639155657bbf9970f9ef3484be7ec016036cd5f (patch) | |
| tree | 22a2930f7f112f4412bbe2f8fe66f8c5f53ce93d | |
| parent | 2ba86289737d8043189ed8347f2043f778c2f4da (diff) | |
| parent | 0247df7a7de611ef5178e494a6cf4cbff4d6fe6b (diff) | |
| download | kolla-d639155657bbf9970f9ef3484be7ec016036cd5f.tar.gz kolla-d639155657bbf9970f9ef3484be7ec016036cd5f.zip | |
Merge "Update glance confs and ports"
| -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 0a11b97e6..96c15cc97 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 }} |