openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Ovn upgrade - test if db already exist" into stable/train

This commit is contained in:
Zuul 2020-01-18 03:35:06 +00:00 committed by Gerrit Code Review
parent 370c8f0c7b 7f9b6c40f3
commit 9d053519de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@ outputs:
- /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: "ovsdb-tool create /var/lib/openvswitch/ovnnb.db /usr/share/openvswitch/ovn-nb.ovsschema"
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
@ -152,7 +152,7 @@ outputs:
- /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: "ovsdb-tool create /var/lib/openvswitch/ovnsb.db /usr/share/openvswitch/ovn-sb.ovsschema"
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