Update and enable upstream puppet modules packaged in our a plugin
Change-Id: I380c9566577293f20865f89abbd3d4bb93adc3a8
This commit is contained in:
parent
6872aa1927
commit
13e306e40c
22
Puppetfile
22
Puppetfile
|
@ -9,32 +9,30 @@
|
|||
|
||||
# Pull in puppetlabs-stdlib
|
||||
mod 'stdlib',
|
||||
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppetlabs-stdlib.git',
|
||||
:git => 'https://github.com/fuel-infra/puppetlabs-stdlib.git',
|
||||
:ref => '4.9.0'
|
||||
|
||||
# Pull in puppetlabs-inifile
|
||||
mod 'inifile',
|
||||
:git => 'https://github.com/fuel-infra/puppetlabs-inifile.git',
|
||||
:ref => '1.4.2'
|
||||
|
||||
# Pull in puppet-neutron
|
||||
mod 'neutron',
|
||||
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppet-neutron.git',
|
||||
:git => 'https://github.com/fuel-infra/puppet-neutron.git',
|
||||
:ref => 'stable/mitaka'
|
||||
|
||||
# Pull in puppet-nova
|
||||
mod 'nova',
|
||||
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppet-nova.git',
|
||||
:git => 'https://github.com/fuel-infra/puppet-nova.git',
|
||||
:ref => 'stable/mitaka'
|
||||
|
||||
# Pull in puppetlabs-inifile
|
||||
mod 'inifile',
|
||||
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppetlabs-inifile.git',
|
||||
:ref => '1.4.2'
|
||||
|
||||
# Pull in puppet-openstacklib
|
||||
mod 'openstacklib',
|
||||
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppet-openstacklib.git',
|
||||
:git => 'https://github.com/fuel-infra/puppet-openstacklib.git',
|
||||
:ref => 'stable/mitaka'
|
||||
|
||||
# Pull in puppet-keystone
|
||||
mod 'keystone',
|
||||
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppet-keystone.git',
|
||||
:git => 'https://github.com/fuel-infra/puppet-keystone.git',
|
||||
:ref => 'stable/mitaka'
|
||||
|
||||
# TODO: need l23network(use cidr_to_netmask function)
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
requires: [globals]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/hiera-override.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 120
|
||||
- id: gem-install
|
||||
version: 2.0.0
|
||||
|
@ -16,7 +16,7 @@
|
|||
requires: [globals]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/gem-install.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 300
|
||||
- id: compute-vmware-nova-config
|
||||
version: 2.0.0
|
||||
|
@ -27,7 +27,7 @@
|
|||
requires: [top-role-compute]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/compute-vmware-nova-config.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 300
|
||||
- id: openstack-haproxy-nova-nsxv
|
||||
version: 2.0.0
|
||||
|
@ -37,7 +37,7 @@
|
|||
requires: [openstack-haproxy-nova]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/haproxy-nova-metadata-config.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 120
|
||||
- id: openstack-haproxy-neutron-nsxv
|
||||
version: 2.0.0
|
||||
|
@ -47,7 +47,7 @@
|
|||
requires: [openstack-haproxy-neutron]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/haproxy-neutron-config.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 120
|
||||
- id: nsxv-install
|
||||
version: 2.0.0
|
||||
|
@ -58,7 +58,7 @@
|
|||
requires: [openstack-network-server-nova]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/nsxv-config.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 300
|
||||
- id: openstack-network-neutron-policy
|
||||
version: 2.0.0
|
||||
|
@ -68,7 +68,7 @@
|
|||
requires: [openstack-network-server-config]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/neutron-server-policy.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 300
|
||||
- id: openstack-network-neutron-start
|
||||
version: 2.0.0
|
||||
|
@ -81,7 +81,7 @@
|
|||
- name: primary-openstack-network-neutron-start
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/neutron-server-start.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 1800
|
||||
- id: primary-openstack-network-neutron-start
|
||||
version: 2.0.0
|
||||
|
@ -92,7 +92,7 @@
|
|||
requires: [openstack-network-neutron-policy,nsxv-install]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/neutron-server-start.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 1800
|
||||
- id: openstack-network-networks-nsxv
|
||||
version: 2.0.0
|
||||
|
@ -102,7 +102,7 @@
|
|||
requires: [primary-openstack-network-neutron-start]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/neutron-network-create.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 600
|
||||
- id: horizon-enable-lbaas
|
||||
version: 2.0.0
|
||||
|
@ -112,7 +112,7 @@
|
|||
requires: [horizon]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/horizon-enable-lbaas.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
puppet_modules: puppet/modules
|
||||
timeout: 120
|
||||
|
||||
# skipped tasks
|
||||
|
|
|
@ -5,15 +5,26 @@
|
|||
|
||||
set -eux
|
||||
|
||||
ROOT="$(dirname `readlink -f $0`)"
|
||||
ROOT="$(dirname $(readlink -f $0))"
|
||||
PLUGIN_MOD_DIR="$ROOT/deployment_scripts/puppet/modules/upstream"
|
||||
|
||||
## Download upstream puppet modules that are not in fuel-library/
|
||||
#$ROOT/remove_modules.sh
|
||||
#$ROOT/update_modules.sh -d $PLUGIN_MOD_DIR
|
||||
#
|
||||
## Remove .git directory
|
||||
#rm -fr $(find $PLUGIN_MOD_DIR -name '.git' )
|
||||
#
|
||||
#mv $PLUGIN_MOD_DIR/* $(dirname $PLUGIN_MOD_DIR)
|
||||
#rmdir $PLUGIN_MOD_DIR
|
||||
# Download upstream puppet modules that are not in fuel-library/
|
||||
"$ROOT"/remove_modules.sh
|
||||
"$ROOT"/update_modules.sh -d "$PLUGIN_MOD_DIR"
|
||||
|
||||
# Remove .git directory
|
||||
rm -fr $(find "${PLUGIN_MOD_DIR:?}" -name '.git' )
|
||||
|
||||
mv "$PLUGIN_MOD_DIR"/* "$(dirname $PLUGIN_MOD_DIR)"
|
||||
|
||||
# Download puppet modules that are in fuel-library/
|
||||
TARBALL_VERSION='f166afc'
|
||||
REPO_PATH="https://github.com/openstack/fuel-library/tarball/${TARBALL_VERSION}"
|
||||
|
||||
wget -qO- "$REPO_PATH" | tar -C "$PLUGIN_MOD_DIR" --strip-components=3 -zxvf - "openstack-fuel-library-${TARBALL_VERSION}/deployment/puppet/"
|
||||
mv "$PLUGIN_MOD_DIR"/osnailyfacter/lib/puppet/parser/functions/get_ssl_property.rb "$(dirname $PLUGIN_MOD_DIR)"/nsxv/lib/puppet/parser/functions
|
||||
mv "$PLUGIN_MOD_DIR"/l23network "$(dirname $PLUGIN_MOD_DIR)"
|
||||
mv "$PLUGIN_MOD_DIR"/openstack "$(dirname $PLUGIN_MOD_DIR)"
|
||||
|
||||
# clean
|
||||
rm -fr "$PLUGIN_MOD_DIR"
|
||||
|
|
|
@ -112,7 +112,7 @@ shift "$((OPTIND-1))"
|
|||
DEPLOYMENT_DIR=$(cd $(dirname $0) && pwd -P)
|
||||
# Timeout in seconds for running puppet librarian
|
||||
TIMEOUT=600
|
||||
export PUPPET_GEM_VERSION=${PUPPET_GEM_VERSION:-'3.4.3'}
|
||||
export PUPPET_GEM_VERSION=${PUPPET_GEM_VERSION:-'~>3.8'}
|
||||
export BUNDLE_DIR=${BUNDLE_DIR:-'/var/tmp/.bundle_home'}
|
||||
export GEM_HOME=${GEM_HOME:-'/var/tmp/.gem_home'}
|
||||
|
||||
|
|
Loading…
Reference in New Issue