diff --git a/common/Makedefs b/common/Makedefs
index 0911ee8..c4fe0ee 100644
--- a/common/Makedefs
+++ b/common/Makedefs
@@ -39,3 +39,6 @@
 
 HYPERCACHE_BRANCH ?= $(DEFAULT_BRANCH)
 HYPERCACHE_GIT_URL ?= $(CORD_BASE_GIT_URL)/hypercache.git
+
+OPENSTACK_BRANCH ?= $(DEFAULT_BRANCH)
+OPENSTACK_GIT_URL ?= $(CORD_BASE_GIT_URL)/openstack.git
diff --git a/common/Makefile.services b/common/Makefile.services
index d34313c..2d5c693 100644
--- a/common/Makefile.services
+++ b/common/Makefile.services
@@ -11,7 +11,8 @@
           $(SERVICE_DIR)/vtr \
           $(SERVICE_DIR)/onos-service \
           $(SERVICE_DIR)/fabric \
-          $(SERVICE_DIR)/hypercache
+          $(SERVICE_DIR)/hypercache \
+          $(SERVICE_DIR)/openstack
 
 monitoring_services: $(SERVICE_DIR)/monitoring
 
@@ -56,6 +57,9 @@
 $(SERVICE_DIR)/hypercache:
 	git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(HYPERCACHE_BRANCH) $(HYPERCACHE_GIT_URL)
 
+$(SERVICE_DIR)/openstack:
+	git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(OPENSTACK_BRANCH) $(OPENSTACK_GIT_URL)
+
 cleanup:
 	rm -rf $(SERVICE_DIR)/*
 
@@ -69,4 +73,4 @@
 	git -C $(SERVICE_DIR)/onos-service pull
 	git -C $(SERVICE_DIR)/fabric pull
 	git -C $(SERVICE_DIR)/hypercache pull
-
+	git -C $(SERVICE_DIR)/openstack pull