diff --git a/multi-node-aio/bootstrap.sh b/multi-node-aio/bootstrap.sh
index 2c85d809..e7b0aecb 100755
--- a/multi-node-aio/bootstrap.sh
+++ b/multi-node-aio/bootstrap.sh
@@ -83,5 +83,14 @@ if [[ ${#BINDEP_PKGS} > 0 ]]; then
     esac
 fi
 
-# install latest OSA supported Ansible version
+# Install latest OSA supported Ansible version
 sudo pip install -r https://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
+
+# Get the latest OSA plugins
+# This is used to allow access from the MNAIO host to
+# the entire OSA inventory directly, rather than having
+# do execute things from infra1.
+mkdir -p ~/.ansible
+if [[ ! -d ~/.ansible/plugins ]]; then
+    git clone https://git.openstack.org/openstack/openstack-ansible-plugins ~/.ansible/plugins
+fi
diff --git a/multi-node-aio/playbooks/inventory/openstack-ansible b/multi-node-aio/playbooks/inventory/openstack-ansible
new file mode 100755
index 00000000..a284bf29
--- /dev/null
+++ b/multi-node-aio/playbooks/inventory/openstack-ansible
@@ -0,0 +1,2 @@
+#!/bin/bash
+ssh -q -ttt -o ConnectTimeout=1 -o StrictHostKeyChecking=no root@infra1 'OSA_INVENTORY_FILE="/etc/openstack_deploy/openstack_inventory.json"; if [[ -e ${OSA_INVENTORY_FILE} ]]; then cat ${OSA_INVENTORY_FILE}; else echo "{}"; fi' || echo "{}"