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 "Remove package if service stopped and disabled" into stable/pike
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
etcd.yaml
diff --git
a/docker/services/etcd.yaml
b/docker/services/etcd.yaml
index
818bddd
..
019b8c1
100644
(file)
--- a/
docker/services/etcd.yaml
+++ b/
docker/services/etcd.yaml
@@
-4,19
+4,21
@@
description: >
OpenStack containerized etcd services
parameters:
OpenStack containerized etcd services
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerEtcdImage:
description: image
DockerEtcdImage:
description: image
- default: 'centos-binary-etcd:latest'
+ type: string
+ DockerEtcdConfigImage:
+ description: The container image to use for the etcd config_volume
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-45,6
+47,7
@@
resources:
type: ../../puppet/services/etcd.yaml
properties:
EndpointMap: {get_param: EndpointMap}
type: ../../puppet/services/etcd.yaml
properties:
EndpointMap: {get_param: EndpointMap}
+ ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EtcdInitialClusterToken: {get_param: EtcdInitialClusterToken}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EtcdInitialClusterToken: {get_param: EtcdInitialClusterToken}
@@
-54,6
+57,8
@@
outputs:
description: Role data for the etcd role.
value:
service_name: {get_attr: [EtcdPuppetBase, role_data, service_name]}
description: Role data for the etcd role.
value:
service_name: {get_attr: [EtcdPuppetBase, role_data, service_name]}
+ logging_source: {get_attr: [EtcdPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [EtcdPuppetBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
step_config: &step_config
list_join:
- "\n"
@@
-67,13
+72,15
@@
outputs:
puppet_config:
config_volume: etcd
step_config: *step_config
puppet_config:
config_volume: etcd
step_config: *step_config
- config_image: &etcd_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerEtcdImage} ]
+ config_image: &etcd_config_image {get_param: DockerEtcdConfigImage}
kolla_config:
/var/lib/kolla/config_files/etcd.json:
command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
kolla_config:
/var/lib/kolla/config_files/etcd.json:
command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/lib/etcd
owner: etcd:etcd
permissions:
- path: /var/lib/etcd
owner: etcd:etcd
@@
-81,7
+88,7
@@
outputs:
docker_config:
step_2:
etcd:
docker_config:
step_2:
etcd:
- image:
*etcd_image
+ image:
{get_param: DockerEtcdImage}
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always
@@
-89,7
+96,7
@@
outputs:
- /var/lib/etcd:/var/lib/etcd
- /etc/localtime:/etc/localtime:ro
- /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/etcd:/var/lib/etcd
- /etc/localtime:/etc/localtime:ro
- /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/
etcd/etc/etcd/etcd.yml:/etc/etcd/etcd.yml
:ro
+ - /var/lib/config-data/
puppet-generated/etcd/:/var/lib/kolla/config_files/src
:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks:
@@
-98,7
+105,7
@@
outputs:
config_volume: 'etcd_init_tasks'
puppet_tags: 'etcd_key'
step_config: 'include ::tripleo::profile::base::etcd'
config_volume: 'etcd_init_tasks'
puppet_tags: 'etcd_key'
step_config: 'include ::tripleo::profile::base::etcd'
- config_image: *etcd_image
+ config_image: *etcd_
config_
image
volumes:
- /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro
- /var/lib/etcd:/var/lib/etcd:ro
volumes:
- /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro
- /var/lib/etcd:/var/lib/etcd:ro