From 61fa29a3865321988d55186b11d6295e3759ba24 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Thu, 29 Jan 2015 15:43:59 +1100 Subject: [PATCH] Fix module order Sort module order by name to make maintenance easier going forward. Change-Id: I05bf475541c8d0b0a2bd72679c3f94e877a4e871 --- modules.env | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/modules.env b/modules.env index 3c7f032d93..f126990eee 100644 --- a/modules.env +++ b/modules.env @@ -21,8 +21,6 @@ # This allows for testing environments that are configured with alternate # module configuration. -MODULES["puppetlabs-ntp"]="3.1.2" - # freenode #puppet 2012-09-25: # 18:25 < jeblair> i would like to use some code that someone wrote, # but it's important that i understand how the author wants me to use @@ -37,18 +35,19 @@ MODULES["openstackci-vcsrepo"]="0.0.8" MODULES["puppetlabs-apache"]="0.0.4" MODULES["puppetlabs-apt"]="1.4.2" +MODULES["puppetlabs-firewall"]="0.0.4" MODULES["puppetlabs-haproxy"]="0.4.1" +MODULES["puppetlabs-inifile"]="1.0.0" MODULES["puppetlabs-mysql"]="0.6.1" +MODULES["puppetlabs-ntp"]="3.1.2" MODULES["puppetlabs-postgresql"]="4.0.0" +MODULES["puppetlabs-puppetdb"]="3.0.1" +MODULES["puppetlabs-rabbitmq"]="5.0.0" MODULES["puppetlabs-stdlib"]="4.3.2" +MODULES["rafaelfc-pear"]="1.0.3" MODULES["saz-memcached"]="2.0.2" MODULES["spiette-selinux"]="0.5.1" -MODULES["rafaelfc-pear"]="1.0.3" -MODULES["puppetlabs-inifile"]="1.0.0" -MODULES["puppetlabs-firewall"]="0.0.4" -MODULES["puppetlabs-puppetdb"]="3.0.1" MODULES["stankevich-python"]="1.6.6" -MODULES["puppetlabs-rabbitmq"]="5.0.0" # Source modules should use tags, explicit refs or remote branches because # we do not update local branches in this script. @@ -59,56 +58,57 @@ SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]= INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-accessbot"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ansible"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-asterisk"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-bup"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-bugdaystats"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-bup"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-cgit"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-drupal"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elastic_recheck"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elasticsearch"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-etherpad_lite"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elastic_recheck"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-exim"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-gerrit"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-gerritbot"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-github"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-graphite"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jeepyb"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-packagekit"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-snmpd"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ssl_cert_check"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-statusbot"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-subunit2sql"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-haveged"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-httpd"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-iptables"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-zuul"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jeepyb"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kerberos"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kibana"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-lodgeit"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-log_processor"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-logrotate"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-logstash"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mailman"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mediawiki"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-meetbot"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mysql_backup"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-nodepool"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openafs"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kerberos"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-pip"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-project_config"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-tmpreaper"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-github"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-haveged"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-httpd"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openstackid"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-packagekit"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-pip"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-planet"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-project_config"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-redis"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ssh"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-releasestatus"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-reviewday"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-simpleproxy"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-snmpd"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ssh"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ssl_cert_check"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-statusbot"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-subunit2sql"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-sudoers"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-drupal"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mediawiki"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-tmpreaper"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ulimit"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-unattended_upgrades"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-unbound"]="origin/master" -INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ulimit"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-user"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-zuul"]="origin/master" if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then # If puppet integration tests are not being run, merge SOURCE and INTEGRATION modules