Merge lp:~hopem/charms/trusty/keystone/fix-kilo-bind-host into lp:~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 153
Proposed branch: lp:~hopem/charms/trusty/keystone/fix-kilo-bind-host
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 13 lines (+2/-1)
1 file modified
templates/kilo/keystone.conf (+2/-1)
To merge this branch: bzr merge lp:~hopem/charms/trusty/keystone/fix-kilo-bind-host
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+261474@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #4849 keystone-next for hopem mp261474
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4849/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5170 keystone-next for hopem mp261474
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5170/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4532 keystone-next for hopem mp261474
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4532/

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/kilo/keystone.conf'
2--- templates/kilo/keystone.conf 2015-04-01 07:09:43 +0000
3+++ templates/kilo/keystone.conf 2015-06-09 08:30:04 +0000
4@@ -13,7 +13,8 @@
5 admin_endpoint = {{ admin_endpoint }}
6
7 [eventlet_server]
8-bind_host = {{ bind_host }}
9+admin_bind_host = {{ bind_host }}
10+public_bind_host = {{ bind_host }}
11 public_workers = {{ workers }}
12 admin_workers = {{ workers }}
13 admin_port = {{ admin_port }}

Subscribers

People subscribed via source and target branches