openstack
/
fuel-library
Code Issues Proposed changes

Merge "Remove hardcoded version from dockerctl config"

This commit is contained in:
Jenkins 2015-10-15 16:32:55 +00:00 committed by Gerrit Code Review
parent 04cc833a89 570759c663
commit d4b67bca61
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,12 +9,16 @@ SOURCE_DIR="${DOCKER_ROOT}/sources"
#SUPERVISOR_CONF_DIR="${docker_root}/supervisor"
#SUPERVISOR_CONF_DIR="<%= @config_dir %>/supervisor/"
ASTUTE_YAML="<%= @astute_settings_file %>"
VERSION="<%= @fuel_version %>"
DOCKER_ENGINE="<%= @container_engine %>"
ADMIN_IP="<%= @admin_ipaddress %>"
LOCAL_IP="127.0.0.1"
#Version of Fuel to deploy
VERSION=$(awk '/^[[:space:]]+release/{gsub(/"/, "");print $2}' /etc/fuel/version.yaml || echo <%= @release %>)
if [ -z "$VERSION" ]; then
VERSION="_VERSION_"
fi
IMAGE_PREFIX="fuel"
# busybox image for storage containers
BUSYBOX_IMAGE="busybox.tar.gz"

9
files/fuel-docker-utils/dockerctl_config
View File

@ -9,12 +9,17 @@ SOURCE_DIR="${DOCKER_ROOT}/sources"
#SUPERVISOR_CONF_DIR="${docker_root}/supervisor"
#SUPERVISOR_CONF_DIR="<%= @config_dir %>/supervisor/"
ASTUTE_YAML="/etc/fuel/astute.yaml"
FUEL_VERSION_FILE="/etc/fuel_release"
DOCKER_ENGINE="native"
ADMIN_IP="10.20.0.2"
LOCAL_IP="127.0.0.1"
#Version of Fuel to deploy
VERSION=$(awk '/release/{gsub(/"/, "");print $2}' /etc/fuel/version.yaml || echo 6.1)
# Version of Fuel to deploy
VERSION=$(cat $FUEL_VERSION_FILE)
if [ -z "$VERSION" ]; then
VERSION="_VERSION_"
fi
IMAGE_PREFIX="fuel"
# busybox image for storage containers
BUSYBOX_IMAGE="busybox.tar.gz"

7
specs/fuel-library8.0.spec
View File

@ -1,5 +1,6 @@
%define name fuel-library8.0
%{!?version: %define version 8.0.0}
%{!?fuel_release: %define fuel_release 8.0}
%{!?release: %define release 1}
Summary: Fuel-Library: a set of deployment manifests of Fuel for OpenStack
@ -34,6 +35,8 @@ This package contains deployment manifests and code to execute provisioning of m
%prep
%setup -cq
sed -i %{dockerctl_source}/dockerctl_config -e 's:_VERSION_:%{fuel_release}:'
sed -i deployment/puppet/docker/templates/dockerctl_config.erb -e 's:_VERSION_:%{fuel_release}:'
%build
if test -s %{predefined_upstream_modules}; then
@ -44,6 +47,10 @@ else
fi
fi
%check
grep -qv "_VERSION_" %{dockerctl_source}/dockerctl_config
grep -qv "_VERSION_" deployment/puppet/docker/templates/dockerctl_config.erb
%install
mkdir -p %{buildroot}/etc/puppet/%{openstack_version}/modules/
mkdir -p %{buildroot}/etc/puppet/%{openstack_version}/manifests/