summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-21 11:56:24 +0000
committerGerrit Code Review <review@openstack.org>2018-11-21 11:56:24 +0000
commitfbee841a847bfb581e06dfac50e324f361a41c75 (patch)
tree293d01d8ec4663ac148d233519b18b252f4a9b3f
parent0a6a14de3cc7c0ebc283dbdb98940e59415aaef3 (diff)
parent4ea65133984caec42906c0566dd751f593ca8711 (diff)
Merge "Fix neutron resource cleanup after ml2/ovs migration"
-rw-r--r--migration/tripleo_environment/playbooks/ovn-migration.yml1
-rw-r--r--migration/tripleo_environment/playbooks/roles/delete-neutron-resources/defaults/main.yml3
-rw-r--r--migration/tripleo_environment/playbooks/roles/delete-neutron-resources/tasks/main.yml (renamed from migration/tripleo_environment/playbooks/roles/migration/tasks/delete-neutron-resources.yml)0
-rw-r--r--migration/tripleo_environment/playbooks/roles/delete-neutron-resources/templates/delete-neutron-resources.sh.j2 (renamed from migration/tripleo_environment/playbooks/roles/migration/templates/delete-neutron-resources.sh.j2)0
-rw-r--r--migration/tripleo_environment/playbooks/roles/migration/defaults/main.yml2
-rw-r--r--migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml6
6 files changed, 5 insertions, 7 deletions
diff --git a/migration/tripleo_environment/playbooks/ovn-migration.yml b/migration/tripleo_environment/playbooks/ovn-migration.yml
index 1aa01bf..1b0c41a 100644
--- a/migration/tripleo_environment/playbooks/ovn-migration.yml
+++ b/migration/tripleo_environment/playbooks/ovn-migration.yml
@@ -65,6 +65,7 @@
65- name: Post migration 65- name: Post migration
66 hosts: localhost 66 hosts: localhost
67 roles: 67 roles:
68 - delete-neutron-resources
68 - post-migration 69 - post-migration
69 tags: 70 tags:
70 - post-migration 71 - post-migration
diff --git a/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/defaults/main.yml b/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/defaults/main.yml
new file mode 100644
index 0000000..4098766
--- /dev/null
+++ b/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/defaults/main.yml
@@ -0,0 +1,3 @@
1---
2
3ovn_migration_temp_dir_del: "{{ working_dir }}/delete_neutron_resources" \ No newline at end of file
diff --git a/migration/tripleo_environment/playbooks/roles/migration/tasks/delete-neutron-resources.yml b/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/tasks/main.yml
index 869b62e..869b62e 100644
--- a/migration/tripleo_environment/playbooks/roles/migration/tasks/delete-neutron-resources.yml
+++ b/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/tasks/main.yml
diff --git a/migration/tripleo_environment/playbooks/roles/migration/templates/delete-neutron-resources.sh.j2 b/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/templates/delete-neutron-resources.sh.j2
index 775c91a..775c91a 100644
--- a/migration/tripleo_environment/playbooks/roles/migration/templates/delete-neutron-resources.sh.j2
+++ b/migration/tripleo_environment/playbooks/roles/delete-neutron-resources/templates/delete-neutron-resources.sh.j2
diff --git a/migration/tripleo_environment/playbooks/roles/migration/defaults/main.yml b/migration/tripleo_environment/playbooks/roles/migration/defaults/main.yml
index 34ee36c..94af8d4 100644
--- a/migration/tripleo_environment/playbooks/roles/migration/defaults/main.yml
+++ b/migration/tripleo_environment/playbooks/roles/migration/defaults/main.yml
@@ -10,6 +10,6 @@ agent_cleanups:
10 config: --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent --log-file=/var/log/neutron/netns-cleanup-dhcp.log 10 config: --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent --log-file=/var/log/neutron/netns-cleanup-dhcp.log
11 cleanup_type: dhcp 11 cleanup_type: dhcp
12 netns_regex: "qdhcp-" 12 netns_regex: "qdhcp-"
13ovn_migration_temp_dir_del: "{{ working_dir }}/delete_neutron_resources" 13
14tunnel_bridge: "br-tun" 14tunnel_bridge: "br-tun"
15ovn_bridge: "br-int" 15ovn_bridge: "br-int"
diff --git a/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml b/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml
index 9d5d467..f05fad7 100644
--- a/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml
+++ b/migration/tripleo_environment/playbooks/roles/migration/tasks/main.yml
@@ -10,9 +10,3 @@
10 when: ovn_controller is defined 10 when: ovn_controller is defined
11 tags: 11 tags:
12 - cleanup-dataplane 12 - cleanup-dataplane
13
14- include_tasks: delete-neutron-resources.yml
15 delegate_to: localhost
16 when: ovn_central is defined
17 tags:
18 - cleanup-neutron-resources