Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for labvirt/nova compute ......................................................................
Assign salt grains for labvirt/nova compute Change-Id: Ic2e3dd7895cd48c1d81d303bb711a86f4a28706f --- M hieradata/hosts/labvirt1005.yaml M hieradata/role/common/nova/compute.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved diff --git a/hieradata/hosts/labvirt1005.yaml b/hieradata/hosts/labvirt1005.yaml index 0f97ce9..04ee89b 100644 --- a/hieradata/hosts/labvirt1005.yaml +++ b/hieradata/hosts/labvirt1005.yaml @@ -1 +1,4 @@ role::nova::compute::instance_dev: "/dev/sdb1" +debdeploy::grains: + debdeploy-nova-compute: + value: canary diff --git a/hieradata/role/common/nova/compute.yaml b/hieradata/role/common/nova/compute.yaml index 4559a8a..981749b 100644 --- a/hieradata/role/common/nova/compute.yaml +++ b/hieradata/role/common/nova/compute.yaml @@ -1 +1,4 @@ cluster: virt +debdeploy::grains: + debdeploy-nova-compute: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 45790a2..12e0575 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -81,3 +81,5 @@ maps-master = debdeploy-maps-master:standard maps-slave = debdeploy-maps-slave:standard maps = debdeploy-maps-master:standard, debdeploy-maps-slave:standard +labvirt = debdeploy-nova-compute:standard +labvirt-canary = debdeploy-nova-compute:canary -- To view, visit https://gerrit.wikimedia.org/r/248331 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2e3dd7895cd48c1d81d303bb711a86f4a28706f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <[email protected]> Gerrit-Reviewer: Muehlenhoff <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
