From a277ebd2cf918676a8318dd5ec893ab734699e53 Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Wed, 20 Apr 2016 12:59:07 +0100 Subject: [PATCH] Update os_neutron to handle newton migrations Performing initial neutron migrations currently works, but applying subsequent migrations will fail due to the role attempting to apply mitaka migrations. This update moves tasks/neutron_db_setup.yml over to newton and updates library/neutron_migrations_facts to be aware of newton migrations. Change-Id: I56416f21144f0cdb9e096576922fd441bc7f9cb3 --- library/neutron_migrations_facts | 4 ++-- tasks/neutron_db_setup.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/neutron_migrations_facts b/library/neutron_migrations_facts index 71e01060..e0179a52 100644 --- a/library/neutron_migrations_facts +++ b/library/neutron_migrations_facts @@ -55,7 +55,7 @@ author: Rcbops EXAMPLES = """ - name: Gather neutron migration facts neutron_migrations_facts: - release: mitaka + release: newton """ @@ -118,7 +118,7 @@ MIGRATIONS = { 'run_expand': True } -RELEASES = ['mitaka', 'liberty'] +RELEASES = ['newton', 'mitaka', 'liberty'] def get_branch(release, revision, library_path, project): diff --git a/tasks/neutron_db_setup.yml b/tasks/neutron_db_setup.yml index 4a42683d..06ccf3b9 100644 --- a/tasks/neutron_db_setup.yml +++ b/tasks/neutron_db_setup.yml @@ -41,7 +41,7 @@ - name: Get neutron migrations facts neutron_migrations_facts: - release: mitaka + release: newton library_path: "{{ neutron_lib_dir }}" bin_path: "{{ neutron_bin }}" when: neutron_plugin_type == 'ml2'