starlingx/stx-puppet
Code Issues Proposed changes

Fix vim endpoint issue after an upgrade

Browse Source 
Fixed a issue for Distributed Cloud where a new endpoint was being
created for vim instead of updated, mantaining the old http openstack
keystone endpoint in SystemController.

Test Plan:
PASS: On a DC environment, list endpoints for OpenStack. Enable https.
      Wait for puppet to apply the changes (might take a few minutes).
      Observe that vim's public endpoint for SystemController
      successfully changes from http to https, and no other public
      http endpoint for vim is mantained for SystemController region.
PASS: After running above test, disable https. Wait for puppet to
      apply the changes. Observe that vim's public endpoint for
      SystemController successfully changes from https to http, and
      no other public https endpoint for vim is
      mantained for SystemController region.
PASS: On a DC environment, list endpoints for OpenStack. Obtain
      keystone token from Identity API. Use it to make requests for vim
      newly created endpoints (admin and internal). The behavior should
      be consistent with StarlingX API reference for NFV VIM.

Closes-Bug: 1995951
Change-Id: I56f0c196c884ed40dbf2128598dd600fc413fed3
Signed-off-by: Marcelo de Castro Loebens <Marcelo.DeCastroLoebens@windriver.com>
This commit is contained in:
Marcelo de Castro Loebens
2022-12-05 08:25:05 -04:00
parent 919616a17d
commit 35d1a181ad
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/puppet-dcorch/src/dcorch/manifests/keystone/auth.pp
View File

@@ -49,6 +49,8 @@ class dcorch::keystone::auth (
$patching_proxy_admin_url = 'http://127.0.0.1:25491',
$nfv_proxy_public_url = 'http://127.0.0.1:4545',
$nfv_proxy_admin_url = 'http://127.0.0.1:4545',
$nfv_proxy_internal_url = 'http://127.0.0.1:4545',
) {
if $::platform::params::distributed_cloud_role =='systemcontroller' {
keystone::resource::service_identity { 'dcorch':
@@ -98,11 +100,13 @@ class dcorch::keystone::auth (
}
keystone_endpoint { "${region}/vim::nfv" :
ensure => 'present',
name => 'vim',
type => 'nfv',
region => $region,
public_url => $nfv_proxy_public_url
ensure => 'present',
name => 'vim',
type => 'nfv',
region => $region,
public_url => $nfv_proxy_public_url,
internal_url => $nfv_proxy_internal_url,
admin_url => $nfv_proxy_admin_url
}
}
}