Reviewed:  https://review.opendev.org/c/openstack/tripleo-ansible/+/845595
Committed: https://opendev.org/openstack/tripleo-ansible/commit/5b6ee92531c8ffb4ced1b1bed8bdf3f67971d9a1
Submitter: "Zuul (22348)"
Branch:    stable/wallaby

commit 5b6ee92531c8ffb4ced1b1bed8bdf3f67971d9a1
Author: John Fulton <email address hidden>
Date:   Wed Dec 22 16:43:08 2021 +0000

    Squash standalone deployed_ceph for tripleo-ansible to Wallaby
    
    This squash backports the standalone deployed_ceph feature to
    Wallaby without introducing related bugs. It has 6 commits.
    
    1. Make deployed ceph baremetal file optional
    
    Only require deployed_ceph_tht_path and
    baremetal_deployed_path if a dynamic spec
    needs to be generated. If a spec is passed
    then the playbook works fine without them.
    
    Change-Id: I9a6bd27f825d226b508053e4b7d2670a14f6f773
    (cherry picked from commit b18e0e7e21b11c5a9b821195f793bb415201045c)
    
    2. Add tripleo_cephadm_standalone boolean
    
    If tripleo_cephadm_standalone is true, then a standalone
    deployment is being run, which requires the THT variable
    CephSpecFqdn to be true. The python-tripleoclient patch
    which depends on this one passes this parameter and always
    creates Ceph specs with the FQDN set if --standalone is
    used.
    
    Change-Id: Idfe4f334f59a3a40363b7127f33ed4996f09362f
    (cherry picked from commit 18f4ce78ba6c2547c0a162b23c5b50584b80d82c)
    
    3. Support standalone in ceph_spec_bootstrap module
    
    Add features from Icd18de08ebc818441e45ff7ce9f348fbc5813253
    to tripleo-ansible's ceph_spec_bootstrap module so that the
    ceph_spec library does not need to be in tripleo-common and
    the related bug can be avoided.
    
    Related-Bug: 1961325
    Change-Id: I90f9e16476f5a986a87c9e678e455846b1d02bf9
    (cherry picked from commit 3951c074e91c628d4b4325623fe1ff5b8592f1a7)
    
    4. Support both inventory and metal file in ceph_spec_bootstrap
    
    The deployed metal file comes from the output of 'openstack
    overcloud node provision'. If this file's DeployedSeverPortMap
    is empty, we cannot map hostnames to their provisioning IPs.
    This information is in the inventory however so, if we have
    an inventory, then use it to complete the mapping. We do this
    by adding an option to ceph_spec_bootstrap to use both the
    inventory and the metal file as a source to build the spec.
    
    The cli-deployed-ceph.yaml playbook was designed to work with
    an inventory containing only the undercloud and a populated
    DeployedSeverPortMap. The ceph_spec_bootstrap module still
    supports this behavior though the playbook now passes the
    "both" option and thus requires an inventory with all hosts.
    Such an inventory is genereated by 'openstack overcloud node
    provision'. When the "both" case is used, it is assumed the
    inventory does not have the ceph_mon group so the playbook
    still dynamically expands its inventory to add it.
    
    Closes-Bug: 1962226
    Change-Id: I17f4303636b08d2be2d0f6e248242ad53c5fddf1
    (cherry picked from commit 1cf374b63bd4d2639f677f9a8591b3bf41bb458f)
    
    5. Pass method to ceph_spec_bootstrap in molecule
    
    Folow up to I17f4303636b08d2be2d0f6e248242ad53c5fddf1
    which missed a molecule update.
    
    Closes-Bug: #1964524
    Change-Id: I27883c6c37e82f0cd60eb22e00f15b7b3fcba35a
    (cherry picked from commit 3b86a609a701b9b9474a10ed69f12ddd25732eae)
    
    6. ceph_spec_bootstrap should not always require a method
    
    Method from I17f4303636b08d2be2d0f6e248242ad53c5fddf1
    should not be required input. It was meant only to
    disambiguate if >1 methods were used. If only one
    method is passed, then ceph_spec_bootstrap should
    be able to figure out which method to use.
    
    Related-Bug: 1964524
    Closes-Bug: 1964530
    Change-Id: I7d9ae9328566c792d57c7ad95215a0aaabed4f6b
    (cherry picked from commit 377fc18565c600bc0d72b0285b13443de565fefa)