Remove ovn-dbs temporary container
With I918b6c16db6ed70d9ad612aecd7af7d725520f7b we moved the ovn-dbs creation out of the ephemeral ovn_dbs_init_bundle container and on to the host. We left the ovn_dbs_init_bundle container around and kept the tag ovn_dbs_remove_old_cruft for it. This is because with that tag we historically triggered the needed code to make sure to handle the transition from a deployment where ovn-dbs used the internal_api VIP to the (current) deployment where ovn-dbs uses its own VIP. Since ovn-dbs has its own VIP starting with train, we can now safely drop this container. Change-Id: I5d5df3948964c28f53eda0ba5a966c824012bd4c
This commit is contained in:
parent
2e231cf7ab
commit
aca8b5fd6f
@ -231,43 +231,6 @@ outputs:
|
|||||||
network: {get_param: [ServiceNetMap, OvnDbsNetwork]}
|
network: {get_param: [ServiceNetMap, OvnDbsNetwork]}
|
||||||
type: node
|
type: node
|
||||||
- null
|
- null
|
||||||
docker_config:
|
|
||||||
step_3:
|
|
||||||
ovn_dbs_init_bundle:
|
|
||||||
start_order: 0
|
|
||||||
detach: false
|
|
||||||
net: host
|
|
||||||
ipc: host
|
|
||||||
user: root
|
|
||||||
config_volume: 'ovn_dbs_init_bundle'
|
|
||||||
command: # '/container_puppet_apply.sh "STEP" "TAGS" "CONFIG" "DEBUG"'
|
|
||||||
list_concat:
|
|
||||||
- - '/container_puppet_apply.sh'
|
|
||||||
- '3'
|
|
||||||
- 'ovn_dbs_remove_old_cruft'
|
|
||||||
- 'include tripleo::profile::pacemaker::ovn_dbs_bundle'
|
|
||||||
- if:
|
|
||||||
- puppet_debug_enabled
|
|
||||||
- - '--debug'
|
|
||||||
- - ''
|
|
||||||
image: *ovn_dbs_config_image
|
|
||||||
volumes:
|
|
||||||
list_concat:
|
|
||||||
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
|
|
||||||
- if:
|
|
||||||
- docker_enabled
|
|
||||||
- - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
|
|
||||||
- null
|
|
||||||
- if:
|
|
||||||
- internal_tls_enabled
|
|
||||||
-
|
|
||||||
- /etc/pki/tls/certs/ovn_dbs.crt:/etc/pki/tls/certs/ovn_dbs.crt:ro
|
|
||||||
- /etc/pki/tls/private/ovn_dbs.key:/etc/pki/tls/private/ovn_dbs.key:ro
|
|
||||||
- null
|
|
||||||
environment:
|
|
||||||
# NOTE: this should force this container to re-run on each
|
|
||||||
# update (scale-out, etc.)
|
|
||||||
TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
|
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: create persistent directories
|
- name: create persistent directories
|
||||||
file:
|
file:
|
||||||
|
Loading…
Reference in New Issue
Block a user