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 "Create NIC templates for Neutron Networker composable role"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
neutron-api.yaml
diff --git
a/docker/services/neutron-api.yaml
b/docker/services/neutron-api.yaml
index
7ce47a1
..
2890dec
100644
(file)
--- a/
docker/services/neutron-api.yaml
+++ b/
docker/services/neutron-api.yaml
@@
-12,9
+12,8
@@
parameters:
description: image
default: 'centos-binary-neutron-server:latest'
type: string
description: image
default: 'centos-binary-neutron-server:latest'
type: string
- # we configure all neutron services in the same neutron
DockerNeutronConfigImage:
DockerNeutronConfigImage:
- description:
imag
e
+ description:
The container image to use for the neutron config_volum
e
default: 'centos-binary-neutron-server:latest'
type: string
EndpointMap:
default: 'centos-binary-neutron-server:latest'
type: string
EndpointMap:
@@
-83,7
+82,7
@@
outputs:
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/neutron_api.json:
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/neutron_api.json:
- command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini
+ command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini
--config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server
permissions:
- path: /var/log/neutron
owner: neutron:neutron
permissions:
- path: /var/log/neutron
owner: neutron:neutron
@@
-92,9
+91,8
@@
outputs:
command: /usr/sbin/httpd -DFOREGROUND
docker_config:
# db sync runs before permissions set by kolla_config
command: /usr/sbin/httpd -DFOREGROUND
docker_config:
# db sync runs before permissions set by kolla_config
- step_
3
:
+ step_
2
:
neutron_init_logs:
neutron_init_logs:
- start_order: 0
image: &neutron_api_image
list_join:
- '/'
image: &neutron_api_image
list_join:
- '/'
@@
-104,8
+102,8
@@
outputs:
volumes:
- /var/log/containers/neutron:/var/log/neutron
command: ['/bin/bash', '-c', 'chown -R neutron:neutron /var/log/neutron']
volumes:
- /var/log/containers/neutron:/var/log/neutron
command: ['/bin/bash', '-c', 'chown -R neutron:neutron /var/log/neutron']
+ step_3:
neutron_db_sync:
neutron_db_sync:
- start_order: 1
image: *neutron_api_image
net: host
privileged: false
image: *neutron_api_image
net: host
privileged: false
@@
-150,7
+148,9
@@
outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/neutron_server_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/neutron_server_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/neutron/etc/httpd/:/etc/httpd/:ro
+ - /var/lib/config-data/neutron/etc/httpd/conf/:/etc/httpd/conf/:ro
+ - /var/lib/config-data/neutron/etc/httpd/conf.d/:/etc/httpd/conf.d/:ro
+ - /var/lib/config-data/neutron/etc/httpd/conf.modules.d/:/etc/httpd/conf.modules.d/:ro
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
environment:
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
environment: