Deploy OpenStack puppet modules from stable/rocky when testing rocky

Currently, it points to master which is incorrect for CI jobs on
stable/rocky.

Also updating pins for puppet-redis and stdlib to match the versions we
have in RDO Trunk Rocky.

Change-Id: Ica13295b5464ed6477c9be8f33ee03181132df3e
This commit is contained in:
Alfredo Moralejo 2019-03-12 16:27:38 +01:00
parent 9c074efdd5
commit 81ea698ebc
1 changed files with 26 additions and 26 deletions

View File

@ -4,95 +4,95 @@ moduledir '/usr/share/openstack-puppet/modules'
mod 'aodh', mod 'aodh',
:git => 'https://github.com/openstack/puppet-aodh', :git => 'https://github.com/openstack/puppet-aodh',
:ref => 'master' :ref => 'stable/rocky'
mod 'ceilometer', mod 'ceilometer',
:git => 'https://github.com/openstack/puppet-ceilometer', :git => 'https://github.com/openstack/puppet-ceilometer',
:ref => 'master' :ref => 'stable/rocky'
mod 'cinder', mod 'cinder',
:git => 'https://github.com/openstack/puppet-cinder', :git => 'https://github.com/openstack/puppet-cinder',
:ref => 'master' :ref => 'stable/rocky'
mod 'glance', mod 'glance',
:git => 'https://github.com/openstack/puppet-glance', :git => 'https://github.com/openstack/puppet-glance',
:ref => 'master' :ref => 'stable/rocky'
mod 'gnocchi', mod 'gnocchi',
:git => 'https://github.com/openstack/puppet-gnocchi', :git => 'https://github.com/openstack/puppet-gnocchi',
:ref => 'master' :ref => 'stable/rocky'
mod 'heat', mod 'heat',
:git => 'https://github.com/openstack/puppet-heat', :git => 'https://github.com/openstack/puppet-heat',
:ref => 'master' :ref => 'stable/rocky'
mod 'magnum', mod 'magnum',
:git => 'https://github.com/openstack/puppet-magnum', :git => 'https://github.com/openstack/puppet-magnum',
:ref => 'master' :ref => 'stable/rocky'
mod 'horizon', mod 'horizon',
:git => 'https://github.com/openstack/puppet-horizon', :git => 'https://github.com/openstack/puppet-horizon',
:ref => 'master' :ref => 'stable/rocky'
mod 'ironic', mod 'ironic',
:git => 'https://github.com/openstack/puppet-ironic', :git => 'https://github.com/openstack/puppet-ironic',
:ref => 'master' :ref => 'stable/rocky'
mod 'keystone', mod 'keystone',
:git => 'https://github.com/openstack/puppet-keystone', :git => 'https://github.com/openstack/puppet-keystone',
:ref => 'master' :ref => 'stable/rocky'
mod 'manila', mod 'manila',
:git => 'https://github.com/openstack/puppet-manila', :git => 'https://github.com/openstack/puppet-manila',
:ref => 'master' :ref => 'stable/rocky'
mod 'neutron', mod 'neutron',
:git => 'https://github.com/openstack/puppet-neutron', :git => 'https://github.com/openstack/puppet-neutron',
:ref => 'master' :ref => 'stable/rocky'
mod 'nova', mod 'nova',
:git => 'https://github.com/openstack/puppet-nova', :git => 'https://github.com/openstack/puppet-nova',
:ref => 'master' :ref => 'stable/rocky'
mod 'openstack_extras', mod 'openstack_extras',
:git => 'https://github.com/openstack/puppet-openstack_extras', :git => 'https://github.com/openstack/puppet-openstack_extras',
:ref => 'master' :ref => 'stable/rocky'
mod 'openstacklib', mod 'openstacklib',
:git => 'https://github.com/openstack/puppet-openstacklib', :git => 'https://github.com/openstack/puppet-openstacklib',
:ref => 'master' :ref => 'stable/rocky'
mod 'oslo', mod 'oslo',
:git => 'https://github.com/openstack/puppet-oslo', :git => 'https://github.com/openstack/puppet-oslo',
:ref => 'master' :ref => 'stable/rocky'
mod 'ovn', mod 'ovn',
:git => 'https://github.com/openstack/puppet-ovn', :git => 'https://github.com/openstack/puppet-ovn',
:ref => 'master' :ref => 'stable/rocky'
mod 'panko', mod 'panko',
:git => 'https://github.com/openstack/puppet-panko', :git => 'https://github.com/openstack/puppet-panko',
:ref => 'master' :ref => 'stable/rocky'
mod 'sahara', mod 'sahara',
:git => 'https://github.com/openstack/puppet-sahara', :git => 'https://github.com/openstack/puppet-sahara',
:ref => 'master' :ref => 'stable/rocky'
mod 'swift', mod 'swift',
:git => 'https://github.com/openstack/puppet-swift', :git => 'https://github.com/openstack/puppet-swift',
:ref => 'master' :ref => 'stable/rocky'
mod 'tempest', mod 'tempest',
:git => 'https://github.com/openstack/puppet-tempest', :git => 'https://github.com/openstack/puppet-tempest',
:ref => 'master' :ref => 'stable/rocky'
mod 'trove', mod 'trove',
:git => 'https://github.com/openstack/puppet-trove', :git => 'https://github.com/openstack/puppet-trove',
:ref => 'master' :ref => 'stable/rocky'
mod 'vswitch', mod 'vswitch',
:git => 'https://github.com/openstack/puppet-vswitch', :git => 'https://github.com/openstack/puppet-vswitch',
:ref => 'master' :ref => 'stable/rocky'
## Non-OpenStack modules ## Non-OpenStack modules
@ -133,8 +133,8 @@ mod 'rabbitmq',
:ref => 'master' :ref => 'master'
mod 'redis', mod 'redis',
:git => 'https://github.com/arioch/puppet-redis', :git => 'https://github.com/voxpupuli/puppet-redis',
:ref => 'master' :ref => 'v3.3.0'
mod 'remote', mod 'remote',
:git => 'https://github.com/paramite/puppet-remote', :git => 'https://github.com/paramite/puppet-remote',
@ -150,7 +150,7 @@ mod 'ssh',
mod 'stdlib', mod 'stdlib',
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib', :git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
:ref => '4.18.0' :ref => '4.25.1'
mod 'sysctl', mod 'sysctl',
:git => 'https://github.com/duritong/puppet-sysctl', :git => 'https://github.com/duritong/puppet-sysctl',