Add parameters for Barbican keystone listener

Change-Id: Ic958010c3236089cb1b0c4820ac2241acb88a012
This commit is contained in:
Ade Lee 2017-12-05 15:00:22 -05:00
parent 410027d64f
commit 1e77eab7e4

@ -10,6 +10,9 @@ parameters:
DockerBarbicanConfigImage:
description: The container image to use for the barbican config_volume
type: string
DockerBarbicanKeystoneListenerImage:
description: image
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -101,6 +104,13 @@ outputs:
dest: "/"
merge: true
preserve_properties: true
/var/lib/kolla/config_files/barbican_keystone_listener.json:
command: /usr/bin/barbican-keystone-listener
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
merge: true
preserve_properties: true
docker_config:
# db sync runs before permissions set by kolla_config
step_2:
@ -152,8 +162,22 @@ outputs:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
environment:
environment: &kolla_env
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
barbican_keystone_listener:
image: {get_param: DockerBarbicanKeystoneListenerImage}
net: host
privileged: false
restart: always
user: barbican
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- {get_attr: [BarbicanApiLogging, volumes]}
-
- /var/lib/kolla/config_files/barbican_keystone_listener.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro
environment: *kolla_env
host_prep_tasks: {get_attr: [BarbicanApiLogging, host_prep_tasks]}
upgrade_tasks:
- name: Check if openstack-barbican-api is deployed