Andrew Bogott has submitted this change and it was merged.
Change subject: Make OpenStack Juno the new default, except for Horizon.
......................................................................
Make OpenStack Juno the new default, except for Horizon.
Bug: T110886
Change-Id: Ib84959bf91783ed4708147da97324cd189f80dee
---
M hieradata/common/openstack.yaml
M hieradata/hosts/holmium.yaml
M hieradata/hosts/labcontrol1001.yaml
M hieradata/hosts/labnet1001.yaml
M hieradata/hosts/labnet1002.yaml
M hieradata/hosts/labvirt1001.yaml
M hieradata/hosts/labvirt1002.yaml
M hieradata/hosts/labvirt1003.yaml
M hieradata/hosts/labvirt1004.yaml
M hieradata/hosts/labvirt1005.yaml
M hieradata/hosts/labvirt1006.yaml
M modules/openstack/manifests/init.pp
12 files changed, 2 insertions(+), 13 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/openstack.yaml b/hieradata/common/openstack.yaml
index 6e7b868..c283885 100644
--- a/hieradata/common/openstack.yaml
+++ b/hieradata/common/openstack.yaml
@@ -1,2 +1 @@
-# This is redundant but will be useful when we start setting up codfw
-version: 'icehouse'
+version: 'juno'
diff --git a/hieradata/hosts/holmium.yaml b/hieradata/hosts/holmium.yaml
index 3231f05..4559a8a 100644
--- a/hieradata/hosts/holmium.yaml
+++ b/hieradata/hosts/holmium.yaml
@@ -1,2 +1 @@
cluster: virt
-openstack::version: juno
diff --git a/hieradata/hosts/labcontrol1001.yaml
b/hieradata/hosts/labcontrol1001.yaml
index eec8bb7..8a2b9ee 100644
--- a/hieradata/hosts/labcontrol1001.yaml
+++ b/hieradata/hosts/labcontrol1001.yaml
@@ -1,3 +1,2 @@
labs_ldap_dns_ip_override: 208.80.154.94
cluster: virt
-openstack::version: juno
diff --git a/hieradata/hosts/labnet1001.yaml b/hieradata/hosts/labnet1001.yaml
index 3231f05..4559a8a 100644
--- a/hieradata/hosts/labnet1001.yaml
+++ b/hieradata/hosts/labnet1001.yaml
@@ -1,2 +1 @@
cluster: virt
-openstack::version: juno
diff --git a/hieradata/hosts/labnet1002.yaml b/hieradata/hosts/labnet1002.yaml
index 3231f05..4559a8a 100644
--- a/hieradata/hosts/labnet1002.yaml
+++ b/hieradata/hosts/labnet1002.yaml
@@ -1,2 +1 @@
cluster: virt
-openstack::version: juno
diff --git a/hieradata/hosts/labvirt1001.yaml b/hieradata/hosts/labvirt1001.yaml
index 506b93a..0f97ce9 100644
--- a/hieradata/hosts/labvirt1001.yaml
+++ b/hieradata/hosts/labvirt1001.yaml
@@ -1,2 +1 @@
role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: juno
diff --git a/hieradata/hosts/labvirt1002.yaml b/hieradata/hosts/labvirt1002.yaml
index 506b93a..0f97ce9 100644
--- a/hieradata/hosts/labvirt1002.yaml
+++ b/hieradata/hosts/labvirt1002.yaml
@@ -1,2 +1 @@
role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: juno
diff --git a/hieradata/hosts/labvirt1003.yaml b/hieradata/hosts/labvirt1003.yaml
index 506b93a..0f97ce9 100644
--- a/hieradata/hosts/labvirt1003.yaml
+++ b/hieradata/hosts/labvirt1003.yaml
@@ -1,2 +1 @@
role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: juno
diff --git a/hieradata/hosts/labvirt1004.yaml b/hieradata/hosts/labvirt1004.yaml
index 506b93a..0f97ce9 100644
--- a/hieradata/hosts/labvirt1004.yaml
+++ b/hieradata/hosts/labvirt1004.yaml
@@ -1,2 +1 @@
role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: juno
diff --git a/hieradata/hosts/labvirt1005.yaml b/hieradata/hosts/labvirt1005.yaml
index 506b93a..0f97ce9 100644
--- a/hieradata/hosts/labvirt1005.yaml
+++ b/hieradata/hosts/labvirt1005.yaml
@@ -1,2 +1 @@
role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: juno
diff --git a/hieradata/hosts/labvirt1006.yaml b/hieradata/hosts/labvirt1006.yaml
index 506b93a..0f97ce9 100644
--- a/hieradata/hosts/labvirt1006.yaml
+++ b/hieradata/hosts/labvirt1006.yaml
@@ -1,2 +1 @@
role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: juno
diff --git a/modules/openstack/manifests/init.pp
b/modules/openstack/manifests/init.pp
index d71ebb0..ab714cc 100644
--- a/modules/openstack/manifests/init.pp
+++ b/modules/openstack/manifests/init.pp
@@ -1,4 +1,4 @@
# Simple config class for openstack
-class openstack ($version = 'icehouse'){
+class openstack ($version = 'juno'){
}
--
To view, visit https://gerrit.wikimedia.org/r/234998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib84959bf91783ed4708147da97324cd189f80dee
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
