Merge "Use tripleo-operator-ansible for undercloud install"

roles/nodepool-setup/defaults/main.yml

@@ -14,6 +14,7 @@ repos:
   - https://opendev.org/openstack/openstack-ansible-os_tempest
   - https://opendev.org/openstack/ansible-config_template
   - https://opendev.org/openstack/ansible-role-python_venv_build
+  - https://opendev.org/openstack/tripleo-operator-ansible
 zuul_changes: "{{ lookup('env', 'ZUUL_CHANGES') }}"
 subnode_swap_size: 8388608  # 8GB
 update_subnodes: true

roles/nodepool-setup/tasks/clone-ci-repos.yml

@@ -42,6 +42,7 @@
     - "ansible-role-python_venv_build"
     - "openstack-ansible-os_tempest"
     - "tripleo-ha-utils"
+    - "tripleo-operator-ansible"
 
 - name: Create /opt/cache/files directory
   file:

roles/undercloud-deploy/tasks/main.yml

@@ -29,13 +29,39 @@
   tags:
     - undercloud-install
 
+# NOTE(aschultz): this creates all the magical config related items, will
+# want to extract the script part from configs
 - include: create-scripts.yml
   tags:
     - undercloud-scripts
 
-- include: install-undercloud.yml
+- name: Run install via tripleo-operator-ansible
+  when:
+    - release in ['master']
+    - step_install_undercloud|bool
   tags:
     - undercloud-install
+  block:
+    - name: Run dstat on the undercloud prior to undercloud install
+      include_role:
+        name: validate-perf
+
+    - name: Install undercloud
+      collections:
+        - tripleo.operator
+      import_role:
+        name: tripleo-undercloud-install
+      vars:
+        tripleo_undercloud_install_debug: "{{ undercloud_undercloud_debug }}"
+
+# TODO(mwhahaha): remove this after backwards compatibility support
+- name: Run legacy install
+  when: release not in ['master']
+  tags:
+    - undercloud-install
+  block:
+    - include: install-undercloud.yml
+
 
 # Ironic defaults to using `qemu:///system`.  When running libvirtd
 # unprivileged we need to use `qemu:///session`.  This allows us to pass