aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-storage-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-24 21:17:23 +0000
committerGerrit Code Review <review@openstack.org>2015-02-24 21:17:23 +0000
commit44c8ef87a6cf05d998859453b1545ac62a7568e0 (patch)
treee0738a9927d2e4920db6e87fd851e11e179db13d /puppet/swift-storage-puppet.yaml
parent99b0323a3436c08d74ae04a5a07ca020e246d10e (diff)
parent66aaf72d35fc7c9be5d4fc7605f8ad6d7b5c520e (diff)
Merge "ObjectStore: Exec puppet after all configuration"
Diffstat (limited to 'puppet/swift-storage-puppet.yaml')
-rw-r--r--puppet/swift-storage-puppet.yaml32
1 files changed, 0 insertions, 32 deletions
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
index 7a831a58..9caa8485 100644
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@ -64,38 +64,6 @@ resources:
networks:
- network: ctlplane
- StoragePuppetConfig:
- type: OS::Heat::SoftwareConfig
- properties:
- group: puppet
- outputs:
- - name: result
- config:
- get_file: manifests/overcloud_object.pp
-
- StoragePuppetDeployment:
- type: OS::Heat::StructuredDeployment
- properties:
- name: puppet_1
- server: {get_resource: SwiftStorage}
- config: {get_resource: StoragePuppetConfig}
-
- StorageRingbuilderPuppetConfig:
- type: OS::Heat::SoftwareConfig
- properties:
- group: puppet
- outputs:
- - name: result
- config:
- get_file: manifests/ringbuilder.pp
-
- StorageRingbuilderPuppetDeployment:
- type: OS::Heat::StructuredDeployment
- properties:
- name: puppet_2
- server: {get_resource: SwiftStorage}
- config: {get_resource: StorageRingbuilderPuppetConfig}
-
SwiftStorageHieraConfig:
type: OS::Heat::StructuredConfig
properties: