~openstack-charmers-next/charms/vivid/cinder-ceph/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka

  • Committer: James Page
  • Date: 2016-05-18 13:04:34 UTC
  • Revision ID: james.page@ubuntu.com-20160518130434-wdyqb0c55eapf9oc
Resync charm-helpers

Avoid use of 'service --status-all' which is currently
broken on trusty for upstart managed daemons; the change
moves to detecting how the daemon is managed, and then
using upstart status XXX or the return code of service XXX
status to determine whether a process is running.

Fixes for IPv6 network address detection under Ubuntu
16.04 which changes the output format of the ip commands
slightly.

Update the version map to include 8.1.x as a Neutron
version for Mitaka.

Change-Id: I96f804ddc62826e39b851a142c39f11953c71fee
Closes-Bug: 1581171
Closes-Bug: 1581598
Closes-Bug: 1580674

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
{% if auth_host -%}
 
2
[keystone_authtoken]
 
3
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
 
4
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
 
5
auth_type = password
 
6
project_domain_name = default
 
7
user_domain_name = default
 
8
project_name = {{ admin_tenant_name }}
 
9
username = {{ admin_user }}
 
10
password = {{ admin_password }}
 
11
signing_dir = {{ signing_dir }}
 
12
{% endif -%}