From 13f66c0ecf4571f7440f564ada77312ba0801422 Mon Sep 17 00:00:00 2001
From: Kanzhe Jiang <kanzhe@gmail.com>
Date: Thu, 7 Jan 2016 09:57:11 -0800
Subject: [PATCH] name consistency change

Change-Id: I6a858fc9248a76bf3a31907e8bcc0a4c1a1f61c3
---
 .../puppet/manifests/{purge-os.pp => openstack-cleanup.pp}    | 2 +-
 deployment_tasks.yaml                                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename deployment_scripts/puppet/manifests/{purge-os.pp => openstack-cleanup.pp} (95%)

diff --git a/deployment_scripts/puppet/manifests/purge-os.pp b/deployment_scripts/puppet/manifests/openstack-cleanup.pp
similarity index 95%
rename from deployment_scripts/puppet/manifests/purge-os.pp
rename to deployment_scripts/puppet/manifests/openstack-cleanup.pp
index f3d97df..714d5e4 100644
--- a/deployment_scripts/puppet/manifests/purge-os.pp
+++ b/deployment_scripts/puppet/manifests/openstack-cleanup.pp
@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-notice('MODULAR: bigswitch purge-os.pp')
+notice('MODULAR: bigswitch openstack-cleanup')
 
 file { '/etc/bigswitch':
     ensure => 'directory',
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 2c54fb1..5030e0d 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -10,13 +10,13 @@
     puppet_manifest: puppet/manifests/network-config.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
-- id: controller-cleanup
+- id: openstack-cleanup
   type: puppet
   role: [primary-controller]
   required_for: [post_deployment_end]
   requires: [post_deployment_start]
   parameters:
-    puppet_manifest: puppet/manifests/purge-os.pp
+    puppet_manifest: puppet/manifests/openstack-cleanup.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
 - id: reconfigure-keystone