Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Containerize Redis for HA"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
glance-api.yaml
diff --git
a/docker/services/glance-api.yaml
b/docker/services/glance-api.yaml
index
c474131
..
df8186d
100644
(file)
--- a/
docker/services/glance-api.yaml
+++ b/
docker/services/glance-api.yaml
@@
-33,6
+33,7
@@
parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EnableInternalTLS:
type: boolean
default: false
EnableInternalTLS:
type: boolean
default: false
@@
-99,6
+100,7
@@
outputs:
net: host
privileged: false
detach: false
net: host
privileged: false
detach: false
+ user: root
volumes: &glance_volumes
list_concat:
- {get_attr: [ContainersCommon, volumes]}
volumes: &glance_volumes
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@@
-109,6
+111,7
@@
outputs:
environment:
- KOLLA_BOOTSTRAP=True
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
environment:
- KOLLA_BOOTSTRAP=True
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+ command: "/usr/bin/bootstrap_host_exec glance_api su glance -s /bin/bash -c '/usr/local/bin/kolla_start'"
step_4:
map_merge:
- glance_api:
step_4:
map_merge:
- glance_api:
@@
-148,3
+151,5
@@
outputs:
- name: Stop and disable glance_api service
tags: step2
service: name=openstack-glance-api state=stopped enabled=no
- name: Stop and disable glance_api service
tags: step2
service: name=openstack-glance-api state=stopped enabled=no
+ metadata_settings:
+ get_attr: [GlanceApiPuppetBase, role_data, metadata_settings]