Remove murano references
Murano is now managed by a separate plugin and cannot be configured directly. Change-Id: Icf225265f659eef4cd0314fa9bc690084bd62522 Closes-Bug: #1547809
This commit is contained in:
parent
4dc2277164
commit
335f11b416
|
@ -42,20 +42,12 @@ $internal_url = "${internal_protocol}://${internal_address}:${internal_port}"
|
||||||
$auth_suffix = pick($keystone_hash['auth_suffix'], '/v2.0')
|
$auth_suffix = pick($keystone_hash['auth_suffix'], '/v2.0')
|
||||||
$auth_url = "${internal_url}${auth_suffix}"
|
$auth_url = "${internal_url}${auth_suffix}"
|
||||||
|
|
||||||
$murano_settings_hash = hiera('murano_settings', {})
|
|
||||||
if has_key($murano_settings_hash, 'murano_repo_url') {
|
|
||||||
$murano_repo_url = $murano_settings_hash['murano_repo_url']
|
|
||||||
} else {
|
|
||||||
$murano_repo_url = 'http://storage.apps.openstack.org'
|
|
||||||
}
|
|
||||||
|
|
||||||
class { 'openstack::auth_file':
|
class { 'openstack::auth_file':
|
||||||
admin_user => $admin_user,
|
admin_user => $admin_user,
|
||||||
admin_password => $admin_password,
|
admin_password => $admin_password,
|
||||||
admin_tenant => $admin_tenant,
|
admin_tenant => $admin_tenant,
|
||||||
region_name => $region,
|
region_name => $region,
|
||||||
auth_url => $auth_url,
|
auth_url => $auth_url,
|
||||||
murano_repo_url => $murano_repo_url,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Enable keystone HAProxy on controller so public VIP can be used
|
# Enable keystone HAProxy on controller so public VIP can be used
|
||||||
|
|
|
@ -108,8 +108,7 @@
|
||||||
groups: [primary-controller, controller]
|
groups: [primary-controller, controller]
|
||||||
requires: [deploy_start, keystone]
|
requires: [deploy_start, keystone]
|
||||||
required_for: [cinder-keystone, sahara-keystone, swift-keystone, neutron-keystone,
|
required_for: [cinder-keystone, sahara-keystone, swift-keystone, neutron-keystone,
|
||||||
glance-keystone, heat-keystone, ceilometer-keystone, murano-keystone,
|
glance-keystone, heat-keystone, ceilometer-keystone, nova-keystone]
|
||||||
nova-keystone]
|
|
||||||
parameters:
|
parameters:
|
||||||
puppet_manifest: 'keystone-controller.pp'
|
puppet_manifest: 'keystone-controller.pp'
|
||||||
puppet_modules: '/etc/puppet/modules'
|
puppet_modules: '/etc/puppet/modules'
|
||||||
|
|
Loading…
Reference in New Issue