diff --git a/copy_logs.sh b/copy_logs.sh index 3d67f7705..dca2992b2 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -331,8 +331,6 @@ fi # system status & informations sudo cp /etc/passwd $LOG_DIR/etc sudo cp /etc/group $LOG_DIR/etc -sudo cp /root/openrc $LOG_DIR/openrc.txt -sudo chmod 777 $LOG_DIR/openrc.txt sudo cp -r /etc/openstack $LOG_DIR/etc sudo chmod 777 $LOG_DIR/etc/openstack/puppet/admin-clouds.yaml df -h > $LOG_DIR/df.txt diff --git a/manifests/keystone.pp b/manifests/keystone.pp index a2ab90432..a81d2b7fc 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -131,13 +131,6 @@ class openstack_integration::keystone ( roles => ['member'], } - class { 'openstack_extras::auth_file': - password => 'a_big_secret', - project_domain_name => 'Default', - user_domain_name => 'Default', - auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3/", - } - # We need tempest users to have the creator role to be able to store # secrets in barbican. We do this by adding the creator role to the # tempest_roles list in tempest.conf. diff --git a/manifests/sahara.pp b/manifests/sahara.pp index 8256f0939..4028dad65 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -113,6 +113,5 @@ class openstack_integration::sahara ( Nova_flavor<||> -> Sahara_node_group_template<||> Class['sahara::keystone::auth'] -> Sahara_node_group_template<||> - Class['openstack_extras::auth_file'] -> Sahara_node_group_template<||> } }