diff --git a/deployment_scripts/keystone-controller.pp b/deployment_scripts/keystone-controller.pp index ceafe5d..3c09c9c 100644 --- a/deployment_scripts/keystone-controller.pp +++ b/deployment_scripts/keystone-controller.pp @@ -42,20 +42,12 @@ $internal_url = "${internal_protocol}://${internal_address}:${internal_port}" $auth_suffix = pick($keystone_hash['auth_suffix'], '/v2.0') $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': admin_user => $admin_user, admin_password => $admin_password, admin_tenant => $admin_tenant, region_name => $region, auth_url => $auth_url, - murano_repo_url => $murano_repo_url, } # Enable keystone HAProxy on controller so public VIP can be used diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 319269a..51d608f 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -108,8 +108,7 @@ groups: [primary-controller, controller] requires: [deploy_start, keystone] required_for: [cinder-keystone, sahara-keystone, swift-keystone, neutron-keystone, - glance-keystone, heat-keystone, ceilometer-keystone, murano-keystone, - nova-keystone] + glance-keystone, heat-keystone, ceilometer-keystone, nova-keystone] parameters: puppet_manifest: 'keystone-controller.pp' puppet_modules: '/etc/puppet/modules'