tripleo-heat-templates/puppet
Carlos Camacho 258c6ce52d Merge pre|post puppet resources into pre|post config.
The [Pre|Post]Puppet resources were renamed in
https://review.openstack.org/#/c/365763.
This was intended for having a pre/post deployment
steps using an agnostic name instead of
being attached to a technology.

The renaming was unintentionally reverted in
https://review.openstack.org/#/c/393644/ and
https://review.openstack.org/#/c/434451.

This submission merge both resources into one,
and remove the old pre|post hooks.

Closes-bug: #1669756
Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064
2017-04-24 12:56:49 +02:00
..
extraconfig Merge "Add composable role support for NetApp Cinder back end" 2017-04-12 15:28:00 +00:00
manifests Remove old ControllerConfig override from puppet-pacemaker.yaml 2017-01-03 19:45:43 +01:00
services Merge "Allow configuring enabled hardware types for Ironic" 2017-04-24 09:30:30 +00:00
all-nodes-config.yaml Don't assume default network names in net_ip*map 2017-02-17 13:38:31 +00:00
blockstorage-role.yaml Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
cephstorage-role.yaml Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
compute-role.yaml Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
config.role.j2.yaml Allow to configure policy.json for OpenStack projects 2017-03-28 22:21:28 +00:00
controller-role.yaml Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
deploy-artifacts.sh Fix bug when using multiple DeployArtifactURLs 2016-12-02 16:10:52 +00:00
deploy-artifacts.yaml Bump template version for all templates to "ocata" 2016-12-23 11:43:39 +00:00
major_upgrade_steps.j2.yaml N->O upgrade, fix wrong parameters to nova placement. 2017-04-19 14:30:43 +02:00
objectstorage-role.yaml Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
post-upgrade.j2.yaml Disable puppet on upgrade for roles not upgrading 2017-02-03 11:43:47 +00:00
post.j2.yaml Delivers upgrade scripts where upgrade steps are disabled 2017-02-10 10:26:43 +00:00
puppet-steps.j2 Merge pre|post puppet resources into pre|post config. 2017-04-24 12:56:49 +02:00
role.role.j2.yaml Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
upgrade_config.yaml Add nova service support for composable upgrades 2017-02-14 23:23:33 +00:00