aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-07 12:50:45 +0000
committerGerrit Code Review <review@openstack.org>2016-11-07 12:50:45 +0000
commitcc67cc7be4d4187fa9227813fddc251574b560b6 (patch)
treeda69a6341e076e284f17e2f5b564a206d759e63d
parent8d513449193be9a25ee6aad94fc7cf6a257a2457 (diff)
parent9bb00f28b91558903ec9a86dfb2e116aca1a8ae2 (diff)
Merge "Ensure we update ceph and composable nodes"
-rw-r--r--puppet/cephstorage-role.yaml1
-rw-r--r--puppet/role.role.j2.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index 55b26336..f7e29b70 100644
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -253,6 +253,7 @@ resources:
- extraconfig
- service_names
- service_configs
+ - ceph
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index e4307001..5b419f80 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -259,6 +259,7 @@ resources:
- extraconfig
- service_names
- service_configs
+ - {{role.lower()}}
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig