Merge "Zero Touch Provisioning changes for subcloud configuration"
This commit is contained in:
commit
26d63692ea
|
@ -343,14 +343,54 @@ class openstack::keystone::endpoint::runtime {
|
||||||
include ::dcdbsync::keystone::auth
|
include ::dcdbsync::keystone::auth
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $::platform::params::distributed_cloud_role == 'subcloud' {
|
||||||
|
include ::dcdbsync::keystone::auth
|
||||||
|
}
|
||||||
|
|
||||||
include ::smapi::keystone::auth
|
include ::smapi::keystone::auth
|
||||||
|
|
||||||
Keystone::Resource::Service_identity <||>
|
if ($::platform::params::distributed_cloud_role == 'subcloud' and
|
||||||
-> file { '/etc/platform/.service_endpoint_reconfigured':
|
$::platform::params::region_2_name != 'RegionOne') {
|
||||||
ensure => present,
|
$interfaces = [ 'public', 'internal', 'admin' ]
|
||||||
owner => 'root',
|
include ::platform::client
|
||||||
group => 'root',
|
# Cleanup the endpoints created at bootstrap if they are not in
|
||||||
mode => '0644',
|
# the subcloud region.
|
||||||
|
Keystone::Resource::Service_identity <||>
|
||||||
|
-> Class['::platform::client']
|
||||||
|
-> delete_endpoints { 'Delete keystone endpoints':
|
||||||
|
region => 'RegionOne',
|
||||||
|
service => 'keystone',
|
||||||
|
interfaces => $interfaces,
|
||||||
|
}
|
||||||
|
-> delete_endpoints { 'Delete sysinv endpoints':
|
||||||
|
region => 'RegionOne',
|
||||||
|
service => 'sysinv',
|
||||||
|
interfaces => $interfaces,
|
||||||
|
}
|
||||||
|
-> delete_endpoints { 'Delete barbican endpoints':
|
||||||
|
region => 'RegionOne',
|
||||||
|
service => 'barbican',
|
||||||
|
interfaces => $interfaces,
|
||||||
|
}
|
||||||
|
-> delete_endpoints { 'Delete fm endpoints':
|
||||||
|
region => 'RegionOne',
|
||||||
|
service => 'fm',
|
||||||
|
interfaces => $interfaces,
|
||||||
|
}
|
||||||
|
-> file { '/etc/platform/.service_endpoint_reconfigured':
|
||||||
|
ensure => present,
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
mode => '0644',
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Keystone::Resource::Service_identity <||>
|
||||||
|
-> file { '/etc/platform/.service_endpoint_reconfigured':
|
||||||
|
ensure => present,
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
mode => '0644',
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue