openstack/fuel-library
Code Issues Proposed changes

Merge "Use host puppet manifests for containers"

Browse Source
This commit is contained in:
Jenkins 2014-10-13 18:45:39 +00:00 committed by Gerrit Code Review
commit acee804533
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/docker/templates/dockerctl_config.erb
View File

@ -123,9 +123,7 @@ ASTUTE_VOL="--volumes-from ${CONTAINER_NAMES['astute']}"
declare -A REQS
REQS["${HOST_VOL['astuteyaml']}"]="cobbler postgres rabbitmq rsync astute nailgun ostf nginx rsyslog mcollective keystone"
REQS["${HOST_VOL['repo']}"]="cobbler postgres rabbitmq rsync astute nailgun ostf nginx rsyslog keystone mcollective"
#Most containers work from local integrated puppet
REQS["$PUPPET_VOL"]="rsync"
#REQS["$PUPPET_VOL"]="cobbler postgres rabbitmq rsync astute nailgun ostf nginx rsyslog mcollective"
REQS["$PUPPET_VOL"]="cobbler postgres rabbitmq rsync astute nailgun ostf nginx rsyslog mcollective keystone"
REQS["$LOG_VOL"]="cobbler postgres rabbitmq rsync astute nailgun ostf nginx rsyslog mcollective keystone"
REQS["${HOST_VOL['sshkey']}"]="nailgun cobbler astute mcollective ostf"
#REQS["${HOST_VOL['remotelogs']}"]="rsyslog nailgun nginx"