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 "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
keystone.yaml
diff --git
a/docker/services/keystone.yaml
b/docker/services/keystone.yaml
index
c461f97
..
a8ba5bf
100644
(file)
--- a/
docker/services/keystone.yaml
+++ b/
docker/services/keystone.yaml
@@
-81,6
+81,8
@@
outputs:
map_merge:
- get_attr: [KeystoneBase, role_data, config_settings]
- apache::default_vhost: false
map_merge:
- get_attr: [KeystoneBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [KeystoneBase, role_data, logging_source]}
+ logging_groups: {get_attr: [KeystoneBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
step_config: &step_config
list_join:
- "\n"
@@
-103,7
+105,9
@@
outputs:
merge: true
preserve_properties: true
/var/lib/kolla/config_files/keystone_cron.json:
merge: true
preserve_properties: true
/var/lib/kolla/config_files/keystone_cron.json:
- command: /usr/sbin/cron -n
+ # FIXME(dprince): this is unused ATM because Kolla hardcodes the
+ # args for the keystone container to -DFOREGROUND
+ command: /usr/sbin/crond -n
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
@@
-119,9
+123,10
@@
outputs:
keystone_init_log:
image: &keystone_image {get_param: DockerKeystoneImage}
user: root
keystone_init_log:
image: &keystone_image {get_param: DockerKeystoneImage}
user: root
- command: ['/bin/bash', '-c', '
mkdir -p /var/log/httpd;
chown -R keystone:keystone /var/log/keystone']
+ command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
volumes:
- /var/log/containers/keystone:/var/log/keystone
volumes:
- /var/log/containers/keystone:/var/log/keystone
+ - /var/log/containers/httpd/keystone:/var/log/httpd
step_3:
keystone_db_sync:
image: *keystone_image
step_3:
keystone_db_sync:
image: *keystone_image
@@
-136,6
+141,7
@@
outputs:
- /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/keystone:/var/log/keystone
- /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/keystone:/var/log/keystone
+ - /var/log/containers/httpd/keystone:/var/log/httpd
-
if:
- internal_tls_enabled
-
if:
- internal_tls_enabled
@@
-168,9
+174,13
@@
outputs:
keystone_cron:
start_order: 4
image: *keystone_image
keystone_cron:
start_order: 4
image: *keystone_image
+ user: root
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always
+ command: ['/bin/bash', '-c', '/usr/local/bin/kolla_set_configs && /usr/sbin/crond -n']
+ healthcheck:
+ test: /bin/true
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@@
-178,6
+188,7
@@
outputs:
- /var/lib/kolla/config_files/keystone_cron.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/keystone:/var/log/keystone
- /var/lib/kolla/config_files/keystone_cron.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/keystone:/var/log/keystone
+ - /var/log/containers/httpd/keystone:/var/log/httpd
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks:
@@
-190,11
+201,19
@@
outputs:
host_prep_tasks:
- name: create persistent logs directory
file:
host_prep_tasks:
- name: create persistent logs directory
file:
- path:
/var/log/containers/keystone
+ path:
"{{ item }}"
state: directory
state: directory
+ with_items:
+ - /var/log/containers/keystone
+ - /var/log/containers/httpd/keystone
upgrade_tasks:
- name: Stop and disable keystone service (running under httpd)
tags: step2
service: name=httpd state=stopped enabled=no
upgrade_tasks:
- name: Stop and disable keystone service (running under httpd)
tags: step2
service: name=httpd state=stopped enabled=no
+ - name: remove old keystone cron jobs
+ tags: step2
+ file:
+ path: /var/spool/cron/keystone
+ state: absent
metadata_settings:
get_attr: [KeystoneBase, role_data, metadata_settings]
metadata_settings:
get_attr: [KeystoneBase, role_data, metadata_settings]