Merge "Remove discover_nodes workflows"

setup.cfg

@@ -73,12 +73,9 @@ mistral.actions =
     tripleo.baremetal.configure_root_device = tripleo_common.actions.baremetal:ConfigureRootDeviceAction
     tripleo.baremetal.get_node_hint = tripleo_common.actions.baremetal:GetNodeHintAction
     tripleo.baremetal.get_profile = tripleo_common.actions.baremetal:GetProfileAction
-    tripleo.baremetal.register_or_update_nodes = tripleo_common.actions.baremetal:RegisterOrUpdateNodes
     tripleo.baremetal.update_node_capability = tripleo_common.actions.baremetal:UpdateNodeCapability
     tripleo.baremetal.cell_v2_discover_hosts = tripleo_common.actions.baremetal:CellV2DiscoverHostsAction
     tripleo.baremetal.validate_nodes = tripleo_common.actions.baremetal:ValidateNodes
-    tripleo.baremetal.get_candidate_nodes = tripleo_common.actions.baremetal:GetCandidateNodes
-    tripleo.baremetal.probe_node = tripleo_common.actions.baremetal:ProbeNode
     tripleo.baremetal_deploy.check_existing_instances = tripleo_common.actions.baremetal_deploy:CheckExistingInstancesAction
     tripleo.baremetal_deploy.deploy_node = tripleo_common.actions.baremetal_deploy:DeployNodeAction
     tripleo.baremetal_deploy.expand_roles = tripleo_common.actions.baremetal_deploy:ExpandRolesAction

workbooks/baremetal.yaml

@@ -1092,149 +1092,6 @@ workflows:
         with-items: node_uuid in <% $.node_uuids %>
         action: nova.hypervisors_find hypervisor_hostname=<% $.node_uuid %>
 
-  discover_nodes:
-    description: Run nodes discovery over the given IP range
-
-    input:
-      - ip_addresses
-      - credentials
-      - ports: [623]
-      - queue_name: tripleo
-
-    tags:
-      - tripleo-common-managed
-
-    tasks:
-
-      get_all_nodes:
-        action: ironic.node_list
-        input:
-          fields: ["uuid", "driver", "driver_info"]
-          limit: 0
-        on-success: get_candidate_nodes
-        on-error: get_all_nodes_failed
-        publish:
-          existing_nodes: <% task().result %>
-
-      get_all_nodes_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(get_all_nodes).result %>
-
-      get_candidate_nodes:
-        action: tripleo.baremetal.get_candidate_nodes
-        input:
-          ip_addresses: <% $.ip_addresses %>
-          credentials: <% $.credentials %>
-          ports: <% $.ports %>
-          existing_nodes: <% $.existing_nodes %>
-        on-success: probe_nodes
-        on-error: get_candidate_nodes_failed
-        publish:
-          candidates: <% task().result %>
-
-      get_candidate_nodes_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(get_candidate_nodes).result %>
-
-      probe_nodes:
-        action: tripleo.baremetal.probe_node
-        on-success: send_message
-        on-error: probe_nodes_failed
-        input:
-          ip: <% $.node.ip %>
-          port: <% $.node.port %>
-          username: <% $.node.username %>
-          password: <% $.node.password %>
-        with-items:
-          - node in <% $.candidates %>
-        publish:
-          nodes_json: <% task().result.where($ != null) %>
-
-      probe_nodes_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(probe_nodes).result %>
-
-      send_message:
-        workflow: tripleo.messaging.v1.send
-        input:
-          queue_name: <% $.queue_name %>
-          type: <% execution().name %>
-          status: <% $.get('status', 'SUCCESS') %>
-          message: <% $.get('message', '') %>
-          execution: <% execution() %>
-          payload: <% { nodes_json => $.get('nodes_json', []) } %>
-
-  discover_and_enroll_nodes:
-    description: Run nodes discovery over the given IP range and enroll nodes
-
-    input:
-      - ip_addresses
-      - credentials
-      - ports: [623]
-      - kernel_name: null
-      - ramdisk_name: null
-      - instance_boot_option: null
-      - initial_state: manageable
-      - queue_name: tripleo
-
-    tags:
-      - tripleo-common-managed
-
-    tasks:
-
-      discover_nodes:
-        workflow: tripleo.baremetal.v1.discover_nodes
-        input:
-          ip_addresses: <% $.ip_addresses %>
-          ports: <% $.ports %>
-          credentials: <% $.credentials %>
-          queue_name: <% $.queue_name %>
-        on-success: enroll_nodes
-        on-error: discover_nodes_failed
-        publish:
-          nodes_json: <% task().result.nodes_json %>
-
-      discover_nodes_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(discover_nodes).result %>
-
-      enroll_nodes:
-        workflow: tripleo.baremetal.v1.register_or_update
-        input:
-          nodes_json: <% $.nodes_json %>
-          kernel_name: <% $.kernel_name %>
-          ramdisk_name: <% $.ramdisk_name %>
-          instance_boot_option: <% $.instance_boot_option %>
-          initial_state: <% $.initial_state %>
-        on-success: send_message
-        on-error: enroll_nodes_failed
-        publish:
-          registered_nodes: <% task().result.registered_nodes %>
-
-      enroll_nodes_failed:
-        on-success: send_message
-        publish:
-          status: FAILED
-          message: <% task(enroll_nodes).result %>
-
-      send_message:
-        workflow: tripleo.messaging.v1.send
-        input:
-          queue_name: <% $.queue_name %>
-          type: <% execution().name %>
-          status: <% $.get('status', 'SUCCESS') %>
-          message: <% $.get('message', '') %>
-          execution: <% execution() %>
-          payload: <% { registered_nodes => $.get('registered_nodes', []) } %>
-
   clean_nodes:
     description: Wipe partition tables on all disks of given nodes