From 0e597a36d3315f67c0d1430f4b363c96115d9d18 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Thu, 25 Jun 2020 10:50:59 +0200 Subject: [PATCH] ovn-migration: Remove docker references Docker commands are replaced with podman. References to docker resources is fixed. Some improvements to avoid storing container ids and performing operations is also done in this patch. Change-Id: I2b9661d06b30eeb7752bdb4fad73778d2ed940d7 --- .../infrared/tripleo-ovn-migration/main.yml | 10 ++++----- .../roles/prepare-migration/tasks/main.yml | 22 +++++++++---------- .../playbooks/reduce-dhcp-renewal-time.yml | 9 ++------ .../roles/migration/tasks/sync-dbs.yml | 12 +++++----- .../migration/templates/activate-ovn.sh.j2 | 4 ++-- .../migration/templates/clone-br-int.sh.j2 | 2 +- 6 files changed, 27 insertions(+), 32 deletions(-) diff --git a/tools/ovn_migration/infrared/tripleo-ovn-migration/main.yml b/tools/ovn_migration/infrared/tripleo-ovn-migration/main.yml index bf92c1d1de4..bab92aac282 100644 --- a/tools/ovn_migration/infrared/tripleo-ovn-migration/main.yml +++ b/tools/ovn_migration/infrared/tripleo-ovn-migration/main.yml @@ -35,15 +35,15 @@ state: directory path: "{{ ovn_migration_working_dir }}" - - name: Set the docker registry information + - name: Set the image registry information block: - - name: Get the docker registry info (infrared deployment) + - name: Get the image registry info (infrared deployment) block: - name: Set is_infrard deployment set_fact: is_infrared: True - - name: Save the docker reg + - name: Save the image reg set_fact: container_image_prepare: namespace: "{{ install.get('registry', {}).namespace|default(False)|ternary(install.get('registry', {}).namespace, install.get('registry', {}).mirror + '/' + 'rhosp' + install.version) }}" @@ -54,13 +54,13 @@ when: - install is defined - - name: Get the docker registry info (tripleo deployment) + - name: Get the image registry info (tripleo deployment) block: - name: Set is_infrard deployment set_fact: is_infrared: False - - name: Save the docker reg + - name: Save the image reg set_fact: container_image_prepare: namespace: "{{ registry_namespace }}" diff --git a/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml b/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml index 6174c6b516b..ca4d47e2b19 100644 --- a/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml +++ b/tools/ovn_migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml @@ -31,9 +31,9 @@ set_fact: overcloud_deploy_ovn_script: '~/overcloud-deploy-ovn.sh' -- name: Set docker images environment file +- name: Set container images environment file set_fact: - output_env_file: /home/stack/docker-images-ovn.yaml + output_env_file: /home/stack/container-images-ovn.yaml - name: Get the proper neutron-ovn-ha.yaml path stat: @@ -79,7 +79,7 @@ - name: Set image tag from puddle version set_fact: - docker_image_tag: "{{ core_puddle_version.stdout }}" + container_image_tag: "{{ core_puddle_version.stdout }}" - name: Get registry namespace shell: cat containers-prepare-parameter.yaml | grep -v _namespace | grep namespace | awk '{print $2}' @@ -94,7 +94,7 @@ msg: "{{ core_puddle_version.stdout }}" - debug: - msg: "{{ docker_image_tag }}" + msg: "{{ container_image_tag }}" - debug: msg: "{{ reg_namespace }}" @@ -102,7 +102,7 @@ - name: Set image tag (tripleo deployment) set_fact: - docker_image_tag: "{{ image_tag }}" + container_image_tag: "{{ image_tag }}" when: - not infrared_deployment|bool @@ -116,16 +116,16 @@ - name: Add ovn container images to ovn_container_images.yaml lineinfile: dest: ~/ovn_container_images.yaml - line: "- imagename: {{ reg_namespace }}/{{ image_prefix }}-{{ item }}:{{ docker_image_tag }}" + line: "- imagename: {{ reg_namespace }}/{{ image_prefix }}-{{ item }}:{{ container_image_tag }}" with_items: - "ovn-northd" - "ovn-controller" - "neutron-server-ovn" - "neutron-metadata-agent-ovn" -- name: Generate docker images environment file +- name: Generate container images environment file shell: | - echo "parameter_defaults:" > ~/docker-images-ovn.yaml + echo "parameter_defaults:" > ~/container-images-ovn.yaml changed_when: False - name: Set the local namespace @@ -160,10 +160,10 @@ when: - local_namespace != '' -- name: Add ovn container images to docker images environment file +- name: Add ovn container images to container images environment file lineinfile: - dest: ~/docker-images-ovn.yaml - line: " {{ item.name }}: {{ local_registry }}/{{ image_prefix }}-{{ item.image_name }}:{{ docker_image_tag }}" + dest: ~/container-images-ovn.yaml + line: " {{ item.name }}: {{ local_registry }}/{{ image_prefix }}-{{ item.image_name }}:{{ container_image_tag }}" with_items: - { name: ContainerNeutronApiImage, image_name: neutron-server-ovn} - { name: ContainerNeutronConfigImage, image_name: neutron-server-ovn} diff --git a/tools/ovn_migration/tripleo_environment/playbooks/reduce-dhcp-renewal-time.yml b/tools/ovn_migration/tripleo_environment/playbooks/reduce-dhcp-renewal-time.yml index 1361d8b8699..6174116a793 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/reduce-dhcp-renewal-time.yml +++ b/tools/ovn_migration/tripleo_environment/playbooks/reduce-dhcp-renewal-time.yml @@ -13,12 +13,7 @@ ignore_errors: yes - block: - - name: Get the neutron dhcp agent docker id - shell: - docker ps | grep neutron_dhcp | awk '{print $1}' - register: dhcp_agent_docker_id - ignore_errors: yes - - name: Restart neutron dhcp agent - command: docker restart {{ dhcp_agent_docker_id.stdout }} + shell: + podman restart $(podman ps --filter "name=neutron_dhcp" --format {% raw %}"{{.ID}}"{% endraw %}) ignore_errors: yes diff --git a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/sync-dbs.yml b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/sync-dbs.yml index 70c1b473897..2d858ae74d0 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/sync-dbs.yml +++ b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/sync-dbs.yml @@ -1,20 +1,20 @@ --- -- name: Get the neutron docker ID +- name: Get the neutron container ID shell: - docker ps | grep neutron-server-ovn | awk '{print $1}' - register: neutron_docker_id + podman ps --filter "name=neutron-server-ovn" --format {% raw %}"{{.ID}}"{% endraw %} + register: neutron_id - name: Sync neutron db with OVN db (container) - Run 1 - command: docker exec "{{ neutron_docker_id.stdout }}" + command: podman exec "{{ neutron_id.stdout }}" neutron-ovn-db-sync-util --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --ovn-neutron_sync_mode repair - name: Sync neutron db with OVN db (container) - Run 2 - command: docker exec "{{ neutron_docker_id.stdout }}" + command: podman exec "{{ neutron_id.stdout }}" neutron-ovn-db-sync-util --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --ovn-neutron_sync_mode repair - name: Pause and let ovn-controllers settle before doing the final activation (5 minute) - pause: minutes=5 \ No newline at end of file + pause: minutes=5 diff --git a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2 b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2 index 273fc654d4f..2fa4f4253d4 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2 +++ b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/activate-ovn.sh.j2 @@ -2,7 +2,7 @@ set -x -docker stop ovn_controller +podman stop ovn_controller # restore bridge mappings ovn_orig_bm=$(ovs-vsctl get open . external_ids:ovn-bridge-mappings-back) @@ -28,7 +28,7 @@ ovs-vsctl del-controller {{ ovn_bridge }} # Activate ovn-controller by configuring integration bridge ovs-vsctl set open . external_ids:ovn-bridge={{ ovn_bridge }} -docker start ovn_controller +podman start ovn_controller # Delete ovs bridges - br-tun and br-migration ovs-vsctl --if-exists del-br {{ tunnel_bridge }} diff --git a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/clone-br-int.sh.j2 b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/clone-br-int.sh.j2 index c573e5e95b2..be03ae2e84c 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/clone-br-int.sh.j2 +++ b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/templates/clone-br-int.sh.j2 @@ -73,5 +73,5 @@ function copy_interfaces_to_br_migration() { } recreate_bridge_mappings -docker restart ovn_controller +podman restart ovn_controller copy_interfaces_to_br_migration