aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-24 21:17:01 +0000
committerGerrit Code Review <review@openstack.org>2015-02-24 21:17:01 +0000
commit99b0323a3436c08d74ae04a5a07ca020e246d10e (patch)
tree989658790607418ffb0cd81b0b2fdc47f4d3c78f /puppet/compute-puppet.yaml
parent7261951737022d794298bea7f561e4efab1e5f66 (diff)
parentb11ac7e6b67c08eb7407872ece519f2675151483 (diff)
Merge "Compute: Exec puppet after all configuration"
Diffstat (limited to 'puppet/compute-puppet.yaml')
-rw-r--r--puppet/compute-puppet.yaml15
1 files changed, 0 insertions, 15 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index ab2d0a32..e6b5a78b 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -260,21 +260,6 @@ resources:
bridge_name: {get_param: NeutronPhysicalBridge}
interface_name: {get_param: NeutronPublicInterface}
- ComputePuppetConfig:
- type: OS::Heat::SoftwareConfig
- properties:
- group: puppet
- outputs:
- - name: result
- config:
- get_file: manifests/overcloud_compute.pp
-
- ComputePuppetDeployment:
- type: OS::Heat::StructuredDeployment
- properties:
- server: {get_resource: NovaCompute}
- config: {get_resource: ComputePuppetConfig}
-
NovaComputeConfig:
type: OS::Heat::StructuredConfig
properties: