[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: Fix optional parameter listed before required par...

2016-09-05 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged.

Change subject: openstack: Fix optional parameter listed before required 
parameter
..


openstack: Fix optional parameter listed before required parameter

Bug: T93645
Change-Id: I6d3a11e5ca311c8525d5a9c48a3cd58827972c05
---
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/service.pp
6 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Alex Monk: Looks good to me, but someone else must approve
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/openstack/manifests/ceilometer/compute.pp 
b/modules/openstack/manifests/ceilometer/compute.pp
index e4a0b98..7a39e93 100644
--- a/modules/openstack/manifests/ceilometer/compute.pp
+++ b/modules/openstack/manifests/ceilometer/compute.pp
@@ -1,6 +1,6 @@
 # Telemetry for OpenStack - the agent
 # https://wiki.openstack.org/wiki/Ceilometer
-class openstack::ceilometer::compute 
($openstack_version=$::openstack::version, $novaconfig) {
+class openstack::ceilometer::compute ($novaconfig, 
$openstack_version=$::openstack::version) {
 
 include openstack::repo
 
diff --git a/modules/openstack/manifests/ceilometer/controller.pp 
b/modules/openstack/manifests/ceilometer/controller.pp
index a72b70b..17d645b 100644
--- a/modules/openstack/manifests/ceilometer/controller.pp
+++ b/modules/openstack/manifests/ceilometer/controller.pp
@@ -1,6 +1,6 @@
 # Telemetry for OpenStack - the controller
 # https://wiki.openstack.org/wiki/Ceilometer
-class openstack::ceilometer::controller 
($openstack_version=$::openstack::version, $novaconfig) {
+class openstack::ceilometer::controller ($novaconfig, 
$openstack_version=$::openstack::version) {
 
 include openstack::repo
 
diff --git a/modules/openstack/manifests/designate/service.pp 
b/modules/openstack/manifests/designate/service.pp
index 201c2da..f9489e0 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -2,7 +2,6 @@
 # https://wiki.openstack.org/wiki/Designate
 
 class openstack::designate::service (
-$openstack_version=$::openstack::version,
 $active_server,
 $nova_controller,
 $keystone_host,
@@ -10,6 +9,7 @@
 $designateconfig,
 $primary_pdns_ip,
 $secondary_pdns_ip,
+$openstack_version=$::openstack::version,
 )
 {
 
diff --git a/modules/openstack/manifests/glance/service.pp 
b/modules/openstack/manifests/glance/service.pp
index 21dd4c8..491e325 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -1,11 +1,11 @@
 class openstack::glance::service(
-$openstack_version=$::openstack::version,
-$glance_data = '/srv/glance/',
 $active_server,
 $standby_server,
 $keystone_host,
 $glanceconfig,
 $keystoneconfig,
+$openstack_version=$::openstack::version,
+$glance_data = '/srv/glance/',
 ) {
 include openstack::repo
 
diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index 6f96e0e..4750a31 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -1,11 +1,11 @@
 # The OpenStack Dashboard Project
 # http://docs.openstack.org/developer/horizon/
 class openstack::horizon::service(
-$openstack_version  = $::openstack::version,
-$webserver_hostname = 'horizon.wikimedia.org',
 $novaconfig,
-$designateconfig)
-{
+$designateconfig,
+$openstack_version  = $::openstack::version,
+$webserver_hostname = 'horizon.wikimedia.org'
+) {
 # basic horizon packages and config
 include openstack::repo
 
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index f487f8e..58a6841 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -1,6 +1,6 @@
 # keystone is the identity service of openstack
 # http://docs.openstack.org/developer/keystone/
-class openstack::keystone::service($openstack_version=$::openstack::version, 
$keystoneconfig) {
+class openstack::keystone::service($keystoneconfig, 
$openstack_version=$::openstack::version) {
 include openstack::repo
 
 package { 'keystone':

-- 
To view, visit https://gerrit.wikimedia.org/r/308345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d3a11e5ca311c8525d5a9c48a3cd58827972c05
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: Fix optional parameter listed before required par...

2016-09-03 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/308345

Change subject: openstack: Fix optional parameter listed before required 
parameter
..

openstack: Fix optional parameter listed before required parameter

Bug: T93645
Change-Id: I6d3a11e5ca311c8525d5a9c48a3cd58827972c05
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/308345/1


-- 
To view, visit https://gerrit.wikimedia.org/r/308345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d3a11e5ca311c8525d5a9c48a3cd58827972c05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits