Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216135
Change subject: Move the glance image datadir into a puppet var.
......................................................................
Move the glance image datadir into a puppet var.
Change-Id: I93f2d9310b34be9c586e44a2391cb95c36a8340c
---
M modules/openstack/manifests/glance/service.pp
M modules/openstack/templates/icehouse/glance/glance-api.conf.erb
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/216135/1
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 21d3cd6..4c628ed 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -3,6 +3,8 @@
$glanceconfig) {
include openstack::repo
+ $image_datadir = '/a/glance/images/'
+
package { [ "glance" ]:
ensure => present,
require => Class["openstack::repo"];
diff --git a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
index 3199376..f31b4ae 100644
--- a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
@@ -170,7 +170,7 @@
# Directory that the Filesystem backend store
# writes image data to
-filesystem_store_datadir = /a/glance/images/
+filesystem_store_datadir = <%= @image_datadir %>
# ============ Swift Store Options =============================
--
To view, visit https://gerrit.wikimedia.org/r/216135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93f2d9310b34be9c586e44a2391cb95c36a8340c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
