summaryrefslogtreecommitdiffstats
path: root/docker/services/sahara-api.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/sahara-api.yaml')
-rw-r--r--docker/services/sahara-api.yaml16
1 files changed, 12 insertions, 4 deletions
diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index 10670796..32d64583 100644
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@@ -12,6 +12,10 @@ parameters:
description: image
default: 'centos-binary-sahara-api:latest'
type: string
+ DockerSaharaConfigImage:
+ description: The container image to use for the sahara config_volume
+ default: 'centos-binary-sahara-api:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -64,10 +68,10 @@ outputs:
config_volume: sahara
puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
step_config: *step_config
- config_image: &sahara_image
+ config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/sahara-api.json:
command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf
@@ -81,10 +85,14 @@ outputs:
docker_config:
step_3:
sahara_db_sync:
- image: *sahara_image
+ image: &sahara_api_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ]
net: host
privileged: false
detach: false
+ user: root
volumes: &sahara_volumes
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@@ -97,7 +105,7 @@ outputs:
command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'"
step_4:
sahara_api:
- image: *sahara_image
+ image: *sahara_api_image
net: host
privileged: false
restart: always