From 9a214d2f6bdb958c49cc1fa91617a65864205b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Thu, 31 Oct 2019 10:18:52 +0100 Subject: [PATCH] Remove comment about Amphora building being broken TrivialFix Change-Id: Iafa873e9363a0a5388aa3162fbf8456b7184f583 --- devstack/local.conf.pod-in-vm.undercloud.df.sample | 9 ++++----- devstack/local.conf.pod-in-vm.undercloud.ovn.sample | 9 ++++----- devstack/local.conf.pod-in-vm.undercloud.sample | 9 ++++----- devstack/local.conf.sample | 9 ++++----- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/devstack/local.conf.pod-in-vm.undercloud.df.sample b/devstack/local.conf.pod-in-vm.undercloud.df.sample index f1edc522f..c9a1ad6a7 100644 --- a/devstack/local.conf.pod-in-vm.undercloud.df.sample +++ b/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 -# You can fetch a precreated qcow image from here [1] and set up octavia to -# use it by uncommenting the following lines. -# [1] https://tarballs.openstack.org/octavia/test-images/ -# test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 +# In order to skip building the Octavia Amphora image you can fetch a +# precreated qcow image from here [1] and set up octavia to use it by +# uncommenting the following lines. +# [1] https://tarballs.openstack.org/octavia/test-images/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 diff --git a/devstack/local.conf.pod-in-vm.undercloud.ovn.sample b/devstack/local.conf.pod-in-vm.undercloud.ovn.sample index 961643efd..591611122 100644 --- a/devstack/local.conf.pod-in-vm.undercloud.ovn.sample +++ b/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 -# You can fetch a precreated qcow image from here [1] and set up octavia to -# use it by uncommenting the following lines. -# [1] https://tarballs.openstack.org/octavia/test-images/ -# test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 +# In order to skip building the Octavia Amphora image you can fetch a +# precreated qcow image from here [1] and set up octavia to use it by +# uncommenting the following lines. +# [1] https://tarballs.openstack.org/octavia/test-images/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 diff --git a/devstack/local.conf.pod-in-vm.undercloud.sample b/devstack/local.conf.pod-in-vm.undercloud.sample index 038a5b894..a3e12052f 100644 --- a/devstack/local.conf.pod-in-vm.undercloud.sample +++ b/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 -# You can fetch a precreated qcow image from here [1] and set up octavia to -# use it by uncommenting the following lines. -# [1] https://tarballs.openstack.org/octavia/test-images/ -# test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 +# In order to skip building the Octavia Amphora image you can fetch a +# precreated qcow image from here [1] and set up octavia to use it by +# uncommenting the following lines. +# [1] https://tarballs.openstack.org/octavia/test-images/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 diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index d864c037a..e52fce793 100644 --- a/devstack/local.conf.sample +++ b/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 -# You can fetch a precreated qcow image from here [1] and set up octavia to -# use it by uncommenting the following lines. -# [1] https://tarballs.openstack.org/octavia/test-images/ -# test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 +# In order to skip building the Octavia Amphora image you can fetch a +# precreated qcow image from here [1] and set up octavia to use it by +# uncommenting the following lines. +# [1] https://tarballs.openstack.org/octavia/test-images/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