Replace nova_metadata_ip by nova_metadata_host

nova_metadata_ip was deprecated in favor of nova_metadata_host some time
ago [1] and after moving ovn driver to main neutron repo, it has been
removed so we need to use the new parameter.

[1] https://github.com/openstack/networking-ovn/blob/stable/train/networking_ovn/conf/agent/metadata/config.py#L53

Change-Id: Iaba8ff454e01cd5c7455da5d0548d8cfeea3f8d8
(cherry picked from commit 62a9487c2d)
This commit is contained in:
Alfredo Moralejo 2020-06-30 09:56:37 +02:00
parent 88f5683a17
commit e51db4189f
2 changed files with 3 additions and 1 deletions

View File

@ -5,7 +5,7 @@ class packstack::neutron::ovn_metadata ()
class { '::neutron::agents::ovn_metadata': class { '::neutron::agents::ovn_metadata':
ovn_sb_connection => $ovn_southd, ovn_sb_connection => $ovn_southd,
shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'), shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'),
metadata_ip => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')), metadata_host => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
metadata_workers => hiera('CONFIG_SERVICE_WORKERS'), metadata_workers => hiera('CONFIG_SERVICE_WORKERS'),
} }

View File

@ -15,6 +15,8 @@
set -e set -e
set -x set -x
rm -rf /etc/yum.repos.d/delorean* rm -rf /etc/yum.repos.d/delorean*
# Remove epel repos
rm -rf /etc/yum.repos.d/epel*
dnf clean all dnf clean all
sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf
dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel