Revert "Add option to install the Octavia client"
Other OpenStack services clients are being installed as dependencies of
Heat. Octavia support in Heat was included during Queens development
cycle [1]. TripleO deployments will include python-octaviaclient as
requirement of Heat. This means the Octavia client will be installed in
the undercloud and overcloud regardless.
This reverts commit fef5be332e
.
[1] https://review.openstack.org/#/q/topic:bug/1737567+(status:open+OR+status:merged)
Change-Id: I727503b6c1acf1953a0ad864ae6288021a745193
This commit is contained in:
parent
a903c10542
commit
720fc49010
|
@ -651,10 +651,6 @@ if str2bool(hiera('enable_cinder', true)) {
|
|||
}
|
||||
}
|
||||
|
||||
if str2bool(hiera('enable_octavia', false)) {
|
||||
include ::octavia::client
|
||||
}
|
||||
|
||||
# firewalld is a dependency of some anaconda packages, so we need to use purge
|
||||
# to ensure all the things that it might be a dependency for are also
|
||||
# removed. See LP#1669915
|
||||
|
|
|
@ -849,7 +849,6 @@ enable_telemetry: {{ENABLE_TELEMETRY}}
|
|||
enable_ui: {{ENABLE_UI}}
|
||||
enable_cinder: {{ENABLE_CINDER}}
|
||||
enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}}
|
||||
enable_octavia: {{ENABLE_OCTAVIA}}
|
||||
|
||||
# Path to install configuration files
|
||||
tripleo_install_user: {{TRIPLEO_INSTALL_USER}}
|
||||
|
|
|
@ -358,11 +358,6 @@ _opts = [
|
|||
help=('Whether to enable docker container images to be build '
|
||||
'on the undercloud.')
|
||||
),
|
||||
cfg.BoolOpt('enable_octavia',
|
||||
default=False,
|
||||
help=('Whether to install the Octavia client in the '
|
||||
'Undercloud.')
|
||||
),
|
||||
cfg.StrOpt('ipa_otp',
|
||||
default='',
|
||||
help=('One Time Password to register Undercloud node with '
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
Allow installation of the Octavia client in the Undercloud by setting new
|
||||
option ``enable_octavia=True`` in the ``undercloud.conf``. Default is not
|
||||
to enable.
|
|
@ -192,10 +192,6 @@
|
|||
# undercloud. (boolean value)
|
||||
#enable_container_images_build = true
|
||||
|
||||
# Whether to install the Octavia client in the Undercloud. (boolean
|
||||
# value)
|
||||
#enable_octavia = false
|
||||
|
||||
# One Time Password to register Undercloud node with an IPA server.
|
||||
# Required when enable_novajoin = True. (string value)
|
||||
#ipa_otp =
|
||||
|
|
Loading…
Reference in New Issue