openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Provide a toggle to disable repository management by puppet"

Browse Source
This commit is contained in:
Jenkins 2016-01-12 03:17:37 +00:00 committed by Gerrit Code Review
commit 2c940011e2
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fixtures/scenario001.pp
View File

@ -15,7 +15,6 @@
# #
include ::openstack_integration include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql include ::openstack_integration::mysql
include ::openstack_integration::keystone include ::openstack_integration::keystone

1
fixtures/scenario002.pp
View File

@ -15,7 +15,6 @@
# #
include ::openstack_integration include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql include ::openstack_integration::mysql
include ::openstack_integration::keystone include ::openstack_integration::keystone

1
fixtures/scenario003.pp
View File

@ -15,7 +15,6 @@
# #
include ::openstack_integration include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql include ::openstack_integration::mysql
include ::openstack_integration::keystone include ::openstack_integration::keystone

5
manifests/init.pp
View File

@ -2,4 +2,9 @@ class openstack_integration {
Exec { logoutput => 'on_failure' } Exec { logoutput => 'on_failure' }
if $::osfamily == 'RedHat' {
package { 'openstack-selinux':
ensure => 'latest'
}
}
} }

3
manifests/repos.pp
View File

@ -7,14 +7,11 @@ class openstack_integration::repos {
release => 'liberty', release => 'liberty',
package_require => true, package_require => true,
} }
$package_provider = 'apt'
} }
'RedHat': { 'RedHat': {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':
release => 'liberty', release => 'liberty',
} }
package { 'openstack-selinux': ensure => 'latest' }
$package_provider = 'yum'
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")

5
run_tests.sh
View File

@ -14,6 +14,7 @@
# under the License. # under the License.
export SCENARIO=${SCENARIO:-scenario001} export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_REPOS=${MANAGE_REPOS:-true}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source $SCRIPT_DIR/functions source $SCRIPT_DIR/functions
@ -43,7 +44,6 @@ PUPPET_ARGS="--detailed-exitcodes --verbose --color=false --debug"
function run_puppet() { function run_puppet() {
local manifest=$1 local manifest=$1
$SUDO puppet apply $PUPPET_ARGS fixtures/${manifest}.pp $SUDO puppet apply $PUPPET_ARGS fixtures/${manifest}.pp
local res=$? local res=$?
@ -70,6 +70,9 @@ fi
# Run puppet and assert something changes. # Run puppet and assert something changes.
set +e set +e
if [ "${MANAGE_REPOS}" = true ]; then
$SUDO puppet apply $PUPPET_ARGS -e "include ::openstack_integration::repos"
fi
run_puppet $SCENARIO run_puppet $SCENARIO
RESULT=$? RESULT=$?
set -e set -e