--- a/components/openstack/neutron/Makefile	Thu Jul 09 18:19:03 2015 -0700
+++ b/components/openstack/neutron/Makefile	Fri Jul 10 20:29:35 2015 +0000
@@ -48,7 +48,7 @@
 
 # Since this is an app, and doesn't provide any public library interfaces, we
 # only need to deliver one version.  The manifest is parameterized, though.
-PYTHON_VERSIONS=	2.6
+PYTHON_VERSIONS=	2.7
 
 PKG_MACROS +=		COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
 PKG_MACROS +=		PYVER=$(PYTHON_VERSIONS)
@@ -77,13 +77,13 @@
 	     files/agent/solaris/ipfilters_manager.py \
 	     files/agent/solaris/net_lib.py \
 	     files/agent/solaris/ra.py \
-	     $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/agent/solaris; \
-	 $(MKDIR) $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/plugins/evs; \
-	 $(TOUCH) $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/plugins/evs/__init__.py; \
-	 $(CP) files/evs/plugin.py $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/plugins/evs; \
-         $(MKDIR) $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/plugins/evs/migrate; \
-         $(CP) files/evs/migrate/__init__.py $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/plugins/evs/migrate; \
-         $(CP) files/evs/migrate/havana_api.py $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/neutron/plugins/evs/migrate)
+	     $(PROTO_DIR)$(PYTHON_LIB)/neutron/agent/solaris; \
+	 $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/neutron/plugins/evs; \
+	 $(TOUCH) $(PROTO_DIR)$(PYTHON_LIB)/neutron/plugins/evs/__init__.py; \
+	 $(CP) files/evs/plugin.py $(PROTO_DIR)$(PYTHON_LIB)/neutron/plugins/evs; \
+         $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/neutron/plugins/evs/migrate; \
+         $(CP) files/evs/migrate/__init__.py $(PROTO_DIR)$(PYTHON_LIB)/neutron/plugins/evs/migrate; \
+         $(CP) files/evs/migrate/havana_api.py $(PROTO_DIR)$(PYTHON_LIB)/neutron/plugins/evs/migrate)
 
 COMPONENT_POST_INSTALL_ACTION += \
 	$(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
@@ -97,15 +97,15 @@
 
 
 REQUIRED_PACKAGES += cloud/openstack/openstack-common
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/netaddr-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/oslo.db-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/simplejson-26
-REQUIRED_PACKAGES += library/python/six-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
+REQUIRED_PACKAGES += library/python/eventlet-27
+REQUIRED_PACKAGES += library/python/iniparse-27
+REQUIRED_PACKAGES += library/python/netaddr-27
+REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/oslo.db-27
+REQUIRED_PACKAGES += library/python/python-mysql-27
+REQUIRED_PACKAGES += library/python/simplejson-27
+REQUIRED_PACKAGES += library/python/six-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-27
 REQUIRED_PACKAGES += network/ipfilter
 REQUIRED_PACKAGES += service/network/dnsmasq
 REQUIRED_PACKAGES += service/network/evs