Merge "Remove docker_config step 3 for ovn already cover by kolla script" into stable/train
This commit is contained in:
commit
8cce6c77c8
|
@ -120,43 +120,10 @@ outputs:
|
||||||
owner: root:root
|
owner: root:root
|
||||||
recurse: true
|
recurse: true
|
||||||
docker_config:
|
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:
|
step_4:
|
||||||
ovn_north_db_server:
|
ovn_north_db_server:
|
||||||
start_order: 0
|
start_order: 0
|
||||||
image: *northd_db_image
|
image: {get_param: ContainerOvnNbDbImage}
|
||||||
net: host
|
net: host
|
||||||
privileged: false
|
privileged: false
|
||||||
restart: always
|
restart: always
|
||||||
|
@ -178,7 +145,7 @@ outputs:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
ovn_south_db_server:
|
ovn_south_db_server:
|
||||||
start_order: 0
|
start_order: 0
|
||||||
image: *south_db_image
|
image: {get_param: ContainerOvnSbDbImage}
|
||||||
net: host
|
net: host
|
||||||
privileged: false
|
privileged: false
|
||||||
restart: always
|
restart: always
|
||||||
|
|
Loading…
Reference in New Issue