Merge "Improve nova-ironic cellv2 discovery"

docker/services/nova-api.yaml

@@ -185,7 +185,8 @@ outputs:
               fi
             done
             echo "(cellv2) Running host discovery..."
-            su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 discover_hosts --verbose"
+            su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 discover_hosts --by-service --verbose"
+
         nova_api_ensure_default_cell.sh:
           mode: "0700"
           content: |

docker/services/nova-ironic.yaml

@@ -60,6 +60,7 @@ outputs:
     description: Role data for the Nova Compute service.
     value:
       service_name: {get_attr: [NovaIronicBase, role_data, service_name]}
+      cellv2_discovery: true
       config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
       logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaIronicBase, role_data, logging_groups]}

environments/services/ironic.yaml

@@ -4,5 +4,3 @@ resource_registry:
   OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
   OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml
   OS::TripleO::Services::IronicNeutronAgent: ../../docker/services/ironic-neutron-agent.yaml
-parameter_defaults:
-  NovaSchedulerDiscoverHostsInCellsInterval: 15