diff --git a/launch/launch-node.py b/launch/launch-node.py
index 87ab7cd2ac..080fd5709d 100755
--- a/launch/launch-node.py
+++ b/launch/launch-node.py
@@ -162,7 +162,7 @@ def bootstrap_server(server, key, name, volume_device, keep,
         # Regenerate inventory cache, throwing an error if there is an issue
         # so that we don't generate a bogus groups file
         try:
-            run(['/etc/ansible/hosts/openstack', '--list'],
+            run(['/etc/ansible/hosts/openstack_inventory', '--list'],
                 env=expand_env)
         except subprocess.CalledProcessError as e:
             print "Inventory regeneration failed"
diff --git a/modules/openstack_project/files/puppetmaster/expand-groups.sh b/modules/openstack_project/files/puppetmaster/expand-groups.sh
index 626568728f..50af74c79c 100644
--- a/modules/openstack_project/files/puppetmaster/expand-groups.sh
+++ b/modules/openstack_project/files/puppetmaster/expand-groups.sh
@@ -26,9 +26,9 @@ unset OS_REGION_NAME
 
 # Because we are generating "generated-groups", we need to work on an
 # inventory without out it ... otherwise entries that have actually
-# disappeared (according to /etc/ansible/hosts/openstack's live list)
-# will keep coming back as "ansible --list" finds them in the
-# generated-groups file.  Later versions of ansible have a
+# disappeared (according to /etc/ansible/hosts/openstack_inventory's
+# live list) will keep coming back as "ansible --list" finds them in
+# the generated-groups file.  Later versions of ansible have a
 # "inventory_ignore_patterns" that might help, we just copy & remove
 # in a separate inventory
 inv=${outdir}/hosts