Remove comment about Amphora building being broken

TrivialFix

Change-Id: Iafa873e9363a0a5388aa3162fbf8456b7184f583

devstack/local.conf.pod-in-vm.undercloud.df.sample

@@ -39,11 +39,10 @@ enable_service o-cw
 enable_service o-hm
 enable_service o-hk
 ## Octavia Deps
-# Current Octavia image generation using diskimage-builder is broken ATM
+# In order to skip building the Octavia Amphora image you can fetch a
-# You can fetch a precreated qcow image from here [1] and set up octavia to
+# precreated qcow image from here [1] and set up octavia to use it by
-# use it by uncommenting the following lines.
+# uncommenting the following lines.
-# [1] https://tarballs.openstack.org/octavia/test-images/
+# [1] https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
-#             test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_SIZE=3
 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial

devstack/local.conf.pod-in-vm.undercloud.ovn.sample

@@ -48,11 +48,10 @@ enable_service o-cw
 enable_service o-hm
 enable_service o-hk
 ## Octavia Deps
-# Current Octavia image generation using diskimage-builder is broken ATM
+# In order to skip building the Octavia Amphora image you can fetch a
-# You can fetch a precreated qcow image from here [1] and set up octavia to
+# precreated qcow image from here [1] and set up octavia to use it by
-# use it by uncommenting the following lines.
+# uncommenting the following lines.
-# [1] https://tarballs.openstack.org/octavia/test-images/
+# [1] https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
-#             test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_SIZE=3
 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial

devstack/local.conf.pod-in-vm.undercloud.sample

@@ -30,11 +30,10 @@ enable_service o-cw
 enable_service o-hm
 enable_service o-hk
 ## Octavia Deps
-# Current Octavia image generation using diskimage-builder is broken ATM
+# In order to skip building the Octavia Amphora image you can fetch a
-# You can fetch a precreated qcow image from here [1] and set up octavia to
+# precreated qcow image from here [1] and set up octavia to use it by
-# use it by uncommenting the following lines.
+# uncommenting the following lines.
-# [1] https://tarballs.openstack.org/octavia/test-images/
+# [1] https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
-#             test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_SIZE=3
 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial

devstack/local.conf.sample

@@ -50,11 +50,10 @@ enable_service o-cw
 enable_service o-hm
 enable_service o-hk
 ## Octavia Deps
-# Current Octavia image generation using diskimage-builder is broken ATM
+# In order to skip building the Octavia Amphora image you can fetch a
-# You can fetch a precreated qcow image from here [1] and set up octavia to
+# precreated qcow image from here [1] and set up octavia to use it by
-# use it by uncommenting the following lines.
+# uncommenting the following lines.
-# [1] https://tarballs.openstack.org/octavia/test-images/
+# [1] https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
-#             test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
 # OCTAVIA_AMP_IMAGE_SIZE=3
 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial