x
/
fuel-ccp-glance
Code Issues Proposed changes

Ports configuration refactoring 

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: Idc5da983a50a56b95217cb31b430f6763ee069b3
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
This commit is contained in:
Andrey Pavlov 2016-10-19 18:25:59 +00:00
parent c332b4ea4a
commit 7feb11dca3
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/files/defaults.yaml
View File

@ -1,7 +1,9 @@
configs:
glance:
api_port: 9292
registry_port: 9191
api_port:
cont: 9292
registry_port:
cont: 9191
db:
username: glance

8
service/files/glance-api.conf.j2
View File

@ -6,7 +6,7 @@ use_stderr = True
use_forwarded_for = True
bind_host = {{ network_topology["private"]["address"] }}
bind_port = {{ glance.api_port }}
bind_port = {{ glance.api_port.cont }}
registry_host = glance-registry
{% if glance.ceph.enable %}
@ -20,15 +20,15 @@ connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = {{ openstack.project_name }}
username = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
[paste_deploy]

8
service/files/glance-registry.conf.j2
View File

@ -6,7 +6,7 @@ use_stderr = True
use_forwarded_for = True
bind_host = {{ network_topology["private"]["address"] }}
bind_port = {{ glance.registry_port }}
bind_port = {{ glance.registry_port.cont }}
registry_host = glance-registry
@ -17,15 +17,15 @@ connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
[paste_deploy]
flavor = keystone

2
service/files/glance-swift-store.conf.j2
View File

@ -1,6 +1,6 @@
[swift]
auth_version = 3
auth_address = http://{{ address('keystone') }}:{{ keystone.public_port }}/v3
auth_address = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
user = {{ openstack.project_name }}:{{ glance.user }}
key = {{ glance.password }}
project_domain_id = default

6
service/glance-api.yaml
View File

@ -45,17 +45,17 @@ service:
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image public http://{{ address('glance-api') }}:{{ glance.api_port }}
command: openstack endpoint create --region RegionOne image public http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
- name: glance-internal-endpoint-create
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance.api_port }}
command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
- name: glance-admin-endpoint-create
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance.api_port }}
command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
daemon:
files:
- glance-api