x
/
fuel-ccp-ceph
Code Issues Proposed changes

Adjust urls with new 'address' functionality 

* explisit scheme replaced with with_scheme flag
* ports provided to address function

Change-Id: I7dea957b75ef58413c11dea36d796318dcd91151
This commit is contained in:
Anonymous 2016-11-16 10:22:41 +00:00 committed by Andrey Pavlov
parent 2a3f47e1aa
commit 4982b32bc6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/files/ceph.conf.j2
View File

@ -16,7 +16,7 @@ rgw frontends = civetweb port={{ radosgw.port.cont }} num_threads=50
rgw keystone api version = 3
rgw keystone admin domain = default
rgw keystone admin project = admin
rgw keystone url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
rgw keystone url = {{ address('keystone', keystone.admin_port, with_scheme=True }}
rgw keystone accepted roles = Member, _member_, admin
rgw keystone revocation interval = 900
rgw s3 auth use keystone = true

6
service/radosgw.yaml
View File

@ -19,19 +19,19 @@ service:
- name: radosgw-create-swift-public-endpoint
type: single
command: openstack endpoint create --region RegionOne swift public
"http://{{ address('radosgw') }}:{{ radosgw.port.cont }}/swift/v1"
"{{ address('radosgw', radosgw.port, external=True, with_scheme=True) }}/swift/v1"
dependencies:
- radosgw-create-swift-service
- name: radosgw-create-swift-admin-endpoint
type: single
command: openstack endpoint create --region RegionOne swift admin
"http://{{ address('radosgw') }}:{{ radosgw.port.cont }}/swift/v1"
"{{ address('radosgw', radosgw.port, with_scheme=True) }}/swift/v1"
dependencies:
- radosgw-create-swift-service
- name: radosgw-create-swift-internal-endpoint
type: single
command: openstack endpoint create --region RegionOne swift internal
"http://{{ address('radosgw') }}:{{ radosgw.port.cont }}/swift/v1"
"{{ address('radosgw', radosgw.port, with_scheme=True) }}/swift/v1"
dependencies:
- radosgw-create-swift-service
daemon: