Cleanup unneccessary files
Change-Id: I154e9401a53bf3499e4f496622d01a0c218f2932
This commit is contained in:
parent
922547e57c
commit
34f976506e
|
@ -1,7 +0,0 @@
|
||||||
require 'facter/util/resolution'
|
|
||||||
|
|
||||||
Facter.add("cinder_tenant") do
|
|
||||||
setcode do
|
|
||||||
tenant = Facter::Util::Resolution.exec("/usr/bin/openstack project show cinder_internal_tenant | grep id | awk \'{print $4}\'")
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,7 +0,0 @@
|
||||||
require 'facter/util/resolution'
|
|
||||||
|
|
||||||
Facter.add("cinder_user") do
|
|
||||||
setcode do
|
|
||||||
user = Facter::Util::Resolution.exec("/usr/bin/openstack user show cinder_internal_user | grep id | awk \'{print $4}\'")
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,17 +1,8 @@
|
||||||
# Deployment tasks
|
# Deployment tasks
|
||||||
- id: configure_internal_tenant
|
|
||||||
role: ['primary-controller', 'controller']
|
|
||||||
required_for: [configure_purestorage_controller]
|
|
||||||
requires: [post_deployment_start]
|
|
||||||
type: puppet
|
|
||||||
parameters:
|
|
||||||
puppet_manifest: puppet/manifests/tenant.pp
|
|
||||||
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
|
|
||||||
timeout: 360
|
|
||||||
- id: configure_purestorage_controller
|
- id: configure_purestorage_controller
|
||||||
role: ['primary-controller', 'controller']
|
role: ['primary-controller', 'controller']
|
||||||
required_for: [post_deployment_end]
|
required_for: [post_deployment_end]
|
||||||
requires: [configure_internal_tenant]
|
requires: [post_deployment_start]
|
||||||
type: puppet
|
type: puppet
|
||||||
parameters:
|
parameters:
|
||||||
puppet_manifest: puppet/manifests/controller.pp
|
puppet_manifest: puppet/manifests/controller.pp
|
||||||
|
|
Loading…
Reference in New Issue