From 34f976506ea40c17253c6a90e1f7d8e1cfc1f033 Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Fri, 8 Jul 2016 14:50:24 -0400 Subject: [PATCH] Cleanup unneccessary files Change-Id: I154e9401a53bf3499e4f496622d01a0c218f2932 --- .../lib/facter/cinder_tenant.rb | 7 ------- .../lib/facter/cinder_user.rb | 7 ------- deployment_tasks.yaml | 11 +---------- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_tenant.rb delete mode 100644 deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_user.rb diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_tenant.rb b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_tenant.rb deleted file mode 100644 index 9d54d53..0000000 --- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_tenant.rb +++ /dev/null @@ -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 diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_user.rb b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_user.rb deleted file mode 100644 index 2ad0cc2..0000000 --- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/facter/cinder_user.rb +++ /dev/null @@ -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 diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 34aa964..5fccce2 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -1,17 +1,8 @@ # 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 role: ['primary-controller', 'controller'] required_for: [post_deployment_end] - requires: [configure_internal_tenant] + requires: [post_deployment_start] type: puppet parameters: puppet_manifest: puppet/manifests/controller.pp