3 files changed, 2 insertions, 52 deletions

diff --git a/meta-openstack/Documentation/README.ceph-openstack b/meta-openstack/Documentation/README.ceph-openstack
index 8f11f2d..0fecc0f 100644
--- a/meta-openstack/Documentation/README.ceph-openstack
+++ b/meta-openstack/Documentation/README.ceph-openstack
@@ -226,27 +226,6 @@ However, these 2 replications are stored into the same machine (which
 is Controller node).
 
 
-Build Configuration Options
-===========================
-
-* Controller build config options:
-
-    --enable-board=intel-xeon-core \
-    --enable-rootfs=ovp-openstack-controller \
-    --enable-kernel=preempt-rt \
-    --enable-addons=wr-ovp-openstack,wr-ovp \
-    --with-template=feature/openstack-tests \
-    --enable-unsupported-config=yes
-
-* Compute build config options:
-
-    --enable-board=intel-xeon-core \
-    --enable-rootfs=ovp-openstack-compute \
-    --enable-kernel=preempt-rt \
-    --enable-addons=wr-ovp-openstack,wr-ovp \
-    --enable-unsupported-config=yes
-
-
 Testing Commands and Expected Results
 =====================================
 
diff --git a/meta-openstack/Documentation/README.heat b/meta-openstack/Documentation/README.heat
index 276ad23..95d2e08 100644
--- a/meta-openstack/Documentation/README.heat
+++ b/meta-openstack/Documentation/README.heat
@@ -20,23 +20,6 @@ then Heat can add or remove resources into or out of that stack to handle
 the changing demands.
 
 
-Build Configuration Options
-===========================
-
-* Controller build config options:
-
-    --enable-board=intel-xeon-core \
-    --enable-rootfs=ovp-openstack-controller \
-    --enable-addons=wr-ovp-openstack,wr-ovp \
-    --with-template=feature/openstack-tests
-
-* Compute build config options:
-
-    --enable-board=intel-xeon-core \
-    --enable-rootfs=ovp-openstack-compute \
-    --enable-addons=wr-ovp-openstack,wr-ovp
-
-
 Test Steps
 ==========
 
diff --git a/meta-openstack/Documentation/README.swift b/meta-openstack/Documentation/README.swift
index 8429a2e..88ca095 100644
--- a/meta-openstack/Documentation/README.swift
+++ b/meta-openstack/Documentation/README.swift
@@ -135,20 +135,8 @@ in which the volume backups will be saved into.
 Build Configuration Options
 ===========================
 
-* Controller build config options:
-
-    --enable-board=intel-xeon-core \
-    --enable-rootfs=ovp-openstack-controller \
-    --enable-addons=wr-ovp-openstack,wr-ovp \
-    --with-template=feature/openstack-tests \
-    --with-layer=meta-cloud-services/meta-openstack-swift-deploy
-
-* Compute build config options:
-
-    --enable-board=intel-xeon-core \
-    --enable-rootfs=ovp-openstack-compute \
-    --enable-addons=wr-ovp-openstack,wr-ovp
-
+To add/deploy swift as part of a controller build, add the following layer
+to your configuration: meta-cloud-services/meta-openstack-swift-deploy
 
 Test Steps
 ==========