openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove docker_config step 3 for ovn already cover by kolla script 

The kolla script should take care of the ovn database creation,
we dont need anymore the docker_config step3

Partial backport from:
I1fbfaf43af17b558497fd2b46fc4278b4703ec74

Closes-Bug: #1853012
Change-Id: I505368feafc42d308ba5d52c894abb45e3ea878f
This commit is contained in:
Mathieu Bultel 2020-01-10 15:06:44 +01:00
parent 077627f125
commit eb245497ef
1 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
deployment/ovn/ovn-dbs-container-puppet.yaml
View File

@ -120,43 +120,10 @@ outputs:
owner: root:root
recurse: true
docker_config:
step_3:
ovn_north_db_init:
image: &northd_db_image {get_param: ContainerOvnNbDbImage}
net: host
privileged: false
detach: false
user: root
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/ovn_north_db_server.json:/var/lib/kolla/config_files/config.json:ro
- /lib/modules:/lib/modules:ro
- /var/lib/openvswitch/ovn:/var/lib/openvswitch:shared,z
- /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
- /var/log/containers/openvswitch:/var/log/openvswitch:z
command: bash -c $* -- eval if [ ! -z $(ovsdb-tool db-name) ]; then exec ovsdb-tool create "/var/lib/openvswitch/ovnnb.db" "/usr/share/openvswitch/ovn-nb.ovsschema"; fi
ovn_south_db_init:
image: &south_db_image {get_param: ContainerOvnSbDbImage}
net: host
privileged: false
detach: false
user: root
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/ovn_north_db_server.json:/var/lib/kolla/config_files/config.json:ro
- /lib/modules:/lib/modules:ro
- /var/lib/openvswitch/ovn:/var/lib/openvswitch:shared,z
- /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
- /var/log/containers/openvswitch:/var/log/openvswitch:z
command: bash -c $* -- eval if [ ! -z $(ovsdb-tool db-name) ]; then exec ovsdb-tool create "/var/lib/openvswitch/ovnsb.db" "/usr/share/openvswitch/ovn-sb.ovsschema"; fi
step_4:
ovn_north_db_server:
start_order: 0
image: *northd_db_image
image: {get_param: ContainerOvnNbDbImage}
net: host
privileged: false
restart: always
@ -178,7 +145,7 @@ outputs:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
ovn_south_db_server:
start_order: 0
image: *south_db_image
image: {get_param: ContainerOvnSbDbImage}
net: host
privileged: false
restart: always