diff --git a/apps/openstacknode/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/openstacknode/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 64e2812..4629980 100644
--- a/apps/openstacknode/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/openstacknode/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -21,9 +21,15 @@
         </command>
         <command>
             <action class="org.onosproject.openstacknode.cli.OpenstackNodeCheckCommand"/>
+            <completers>
+                <ref component-id="hostnameCompleter"/>
+            </completers>
         </command>
         <command>
             <action class="org.onosproject.openstacknode.cli.OpenstackNodeInitCommand"/>
         </command>
     </command-bundle>
+
+    <bean id="hostnameCompleter" class="org.onosproject.openstacknode.cli.OpenstackHostnameCompleter"/>
+
 </blueprint>