N->O undercloud upgrade creates a duplicate cell_v2 cell

[Oliver Walsh]

Upgrading the undercloud from newton to ocata creates a duplicate default cell_v2 cell:

[root@undercloud-0 stack]# mysql nova_api -e 'select * from cell_mappings; select * from host_mappings; select * from instance_mappings;'
    +---------------------+------------+----+--------------------------------------+---------+-----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
    | created_at | updated_at | id | uuid | name | transport_url | database_connection |
    +---------------------+------------+----+--------------------------------------+---------+-----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
    | 2018-05-24 15:39:07 | NULL | 1 | 00000000-0000-0000-0000-000000000000 | cell0 | none:/// | mysql+pymysql://nova:37bd10b94201c8ba24723b7caa0bb385010fe970@192.168.24.1/nova_cell0 |
    | 2018-05-24 15:39:16 | NULL | 2 | 65170299-3926-4326-8cc2-e0c2555a8594 | default | rabbit://066b764f582bb677c2e163cdac0f80e75baeffd0:79c41617a4e92443f4a17d09baa5be72504a1575@192.168.24.1// | mysql+pymysql://nova:37bd10b94201c8ba24723b7caa0bb385010fe970@192.168.24.1/nova |
    | 2018-05-24 15:39:36 | NULL | 3 | c87f607d-db97-4455-91f3-cf908962815a | NULL | rabbit://066b764f582bb677c2e163cdac0f80e75baeffd0:79c41617a4e92443f4a17d09baa5be72504a1575@192.168.24.1// | mysql+pymysql://nova:37bd10b94201c8ba24723b7caa0bb385010fe970@192.168.24.1/nova |
    +---------------------+------------+----+--------------------------------------+---------+-----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
    +---------------------+------------+----+---------+---------------------------+
    | created_at | updated_at | id | cell_id | host |
    +---------------------+------------+----+---------+---------------------------+
    | 2018-05-24 15:39:36 | NULL | 1 | 3 | undercloud-0.redhat.local |
    +---------------------+------------+----+---------+---------------------------+
    +---------------------+------------+----+--------------------------------------+---------+----------------------------------+
    | created_at | updated_at | id | instance_uuid | cell_id | project_id |
    +---------------------+------------+----+--------------------------------------+---------+----------------------------------+
    | 2018-05-24 15:39:45 | NULL | 1 | a08b73a1-3670-40f7-963a-96d5938c014c | 2 | 021012f0f02740e7b5497c6a12e3904c |
    | 2018-05-24 15:39:45 | NULL | 2 | c4d7e66b-c8a6-44b3-850a-a6354f69ba01 | 2 | 021012f0f02740e7b5497c6a12e3904c |
    +---------------------+------------+----+--------------------------------------+---------+----------------------------------+

Instances that exist before upgrade reference the correct cell_id (2), any added after that will reference the incorrect cell_id (3).

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/570081
Committed: https://git.openstack.org/cgit/openstack/instack-undercloud/commit/?id=9c00a1f9914ca25cc0af497fa1f7f15b49a18982
Submitter: Zuul
Branch: stable/ocata

commit 9c00a1f9914ca25cc0af497fa1f7f15b49a18982
Author: Oliver Walsh <email address hidden>
Date: Wed May 23 00:47:24 2018 +0100

    Stop creating duplicate cell_v2 cells in N->O upgrade

    map_cell_and_hosts creates a default cell_v2 cell if one does not exist with
    host mappings. To avoid duplicate cells this change removes map_call_and_hosts
    and reorders the deps to instead run discover_hosts followed by map_instances.

    This also adds execs to clean up any exising duplicate cell_v2 cells in an
    existing deployment.

    Closes-bug: 1773398
    Change-Id: I67c50fd5a5d2f4841ab26bce796a33efce0510b2

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/instack-undercloud 6.1.8 release.