From e51db4189f80a7a5efa2ec3b5c1b8ed9dc1c9dc7 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Tue, 30 Jun 2020 09:56:37 +0200 Subject: [PATCH] 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 62a9487c2d2000ef049ac368fd9828bfa706efcb) --- .../puppet/modules/packstack/manifests/neutron/ovn_metadata.pp | 2 +- playbooks/packstack-centos8-pre.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp index 55c70bb92..14b1b69d8 100644 --- a/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp +++ b/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp @@ -5,7 +5,7 @@ class packstack::neutron::ovn_metadata () class { '::neutron::agents::ovn_metadata': ovn_sb_connection => $ovn_southd, 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'), metadata_workers => hiera('CONFIG_SERVICE_WORKERS'), } diff --git a/playbooks/packstack-centos8-pre.yaml b/playbooks/packstack-centos8-pre.yaml index 11645891a..fa717c2a4 100644 --- a/playbooks/packstack-centos8-pre.yaml +++ b/playbooks/packstack-centos8-pre.yaml @@ -15,6 +15,8 @@ set -e set -x rm -rf /etc/yum.repos.d/delorean* + # Remove epel repos + rm -rf /etc/yum.repos.d/epel* dnf clean all sudo sed -i '/^exclude.*/d' /etc/dnf/dnf.conf dnf -y install libxml2-devel libxslt-devel ruby-devel zlib-devel