From 304f8ff08bdf402f5af773ec7609b851b8a02962 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Thu, 14 Jan 2016 15:43:45 -0800 Subject: [PATCH] Upgrade infra-cloud to liberty Update modules.env to use the stable/liberty branch of the OpenStack modules. This partially implements options 1 or 3 of the upgrade proposals listed in the related puppet-infracloud patch. Please discuss. Change-Id: Ic052a75e35f3035c9c844d8675a98ec991aa7ea5 Depends-On: I5f6979fdfcdd46d4e761a03d951054c25f8720f9 --- modules.env | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules.env b/modules.env index 1336ac0f7e..218da5f90b 100644 --- a/modules.env +++ b/modules.env @@ -38,14 +38,14 @@ OPENSTACK_GIT_ROOT=https://git.openstack.org # InfraCloud modules -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-cinder"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-glance"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-ironic"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-keystone"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-neutron"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-nova"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstack_extras"]="origin/stable/kilo" -SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstacklib"]="origin/stable/kilo" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-cinder"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-glance"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-ironic"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-keystone"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-neutron"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-nova"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstack_extras"]="origin/stable/liberty" +SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstacklib"]="origin/stable/liberty" SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8" # NOTE(yolanda): please note that grafana depends on camptocamp-archive. This is a