diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
index e637ad85ae..b6c1bc77df 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
+++ b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json
@@ -3,10 +3,6 @@
         {
             "flavor_id": "10",
             "tenant_id": "fake_tenant"
-        },
-        {
-            "flavor_id": "10",
-            "tenant_id": "openstack"
         }
     ]
 }
\ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
index cc102aeed1..1e55ad2f95 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
+++ b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor_access>
   <access tenant_id="fake_tenant" flavor_id="10"/>
-  <access tenant_id="openstack" flavor_id="10"/>
 </flavor_access>
\ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-list-resp.json b/doc/api_samples/os-flavor-access/flavor-access-list-resp.json
index e637ad85ae..b6c1bc77df 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-list-resp.json
+++ b/doc/api_samples/os-flavor-access/flavor-access-list-resp.json
@@ -3,10 +3,6 @@
         {
             "flavor_id": "10",
             "tenant_id": "fake_tenant"
-        },
-        {
-            "flavor_id": "10",
-            "tenant_id": "openstack"
         }
     ]
 }
\ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
index cc102aeed1..1e55ad2f95 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
+++ b/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor_access>
   <access tenant_id="fake_tenant" flavor_id="10"/>
-  <access tenant_id="openstack" flavor_id="10"/>
 </flavor_access>
\ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
index ebe0423e82..5cab03334d 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
+++ b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json
@@ -1,6 +1,3 @@
 {
-    "flavor_access": [{
-        "flavor_id": "10",
-        "tenant_id": "openstack"
-    }]
+    "flavor_access": []
 }
\ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
index 3c5ef1c5cc..80d1ecc48c 100644
--- a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
+++ b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
@@ -1,4 +1,2 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor_access>
-    <access tenant_id="openstack" flavor_id="10"/>
-</flavor_access>
+<flavor_access/>
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py
index b6eac7a616..069396169c 100644
--- a/nova/api/openstack/compute/contrib/flavormanage.py
+++ b/nova/api/openstack/compute/contrib/flavormanage.py
@@ -71,9 +71,6 @@ class FlavorManageController(wsgi.Controller):
                                     flavorid=flavorid, swap=swap,
                                     rxtx_factor=rxtx_factor,
                                     is_public=is_public)
-            if not flavor['is_public']:
-                flavors.add_flavor_access(flavor['flavorid'],
-                                          context.project_id, context)
             req.cache_db_flavor(flavor)
         except (exception.FlavorExists,
                 exception.FlavorIdExists) as err:
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
index 2f5d362284..c9b378fe80 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
@@ -464,7 +464,7 @@ class PrivateFlavorManageTest(test.TestCase):
         self.flavor_access_controller = flavor_access.FlavorAccessController()
         self.app = fakes.wsgi_app(init_only=('flavors',))
 
-    def test_create_private_flavor_should_create_flavor_access(self):
+    def test_create_private_flavor_should_not_grant_flavor_access(self):
         expected = {
             "flavor": {
                 "name": "test",
@@ -497,8 +497,8 @@ class PrivateFlavorManageTest(test.TestCase):
             "tenant_id": "%s" % ctxt.project_id,
             "flavor_id": "%s" % body["flavor"]["id"]
         }
-        self.assertTrue(expected_flavor_access_body in
-                        flavor_access_body["flavor_access"])
+        self.assertNotIn(expected_flavor_access_body,
+                         flavor_access_body["flavor_access"])
 
     def test_create_public_flavor_should_not_create_flavor_access(self):
         expected = {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl
index 5266ae0840..d797155795 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json.tpl
@@ -1,9 +1,5 @@
 {
     "flavor_access": [
-        {
-            "flavor_id": "%(flavor_id)s",
-            "tenant_id": "openstack"
-        },
         {
             "flavor_id": "%(flavor_id)s",
             "tenant_id": "%(tenant_id)s"
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl
index 9c0b4ec1ce..2223052aae 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml.tpl
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor_access>
   <access tenant_id="%(tenant_id)s" flavor_id="%(flavor_id)s"/>
-  <access tenant_id="openstack" flavor_id="%(flavor_id)s"/>
 </flavor_access>
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl
index 87e337e39c..a6b6dbdcda 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.json.tpl
@@ -3,10 +3,6 @@
         {
             "flavor_id": "%(flavor_id)s",
             "tenant_id": "fake_tenant"
-        },
-        {
-            "flavor_id": "%(flavor_id)s",
-            "tenant_id": "openstack"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl
index cc102aeed1..1e55ad2f95 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-list-resp.xml.tpl
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavor_access>
   <access tenant_id="fake_tenant" flavor_id="10"/>
-  <access tenant_id="openstack" flavor_id="10"/>
 </flavor_access>
\ No newline at end of file
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl
index 4fb4296a30..5cab03334d 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json.tpl
@@ -1,6 +1,3 @@
 {
-    "flavor_access": [{
-        "tenant_id": "openstack",
-        "flavor_id": "%(flavor_id)s"
-    }]
+    "flavor_access": []
 }
\ No newline at end of file
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl
index 480191c726..80d1ecc48c 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml.tpl
@@ -1,4 +1,2 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor_access>
-    <access tenant_id="openstack" flavor_id="%(flavor_id)s"/>
-</flavor_access>
+<flavor_access/>