openstack/kolla-ansible
Code Issues Proposed changes

Remove docker version pinning for vagrant envs

Browse Source 
Kolla now has its own docker ansible module which doesn't require
specific docker version.

Also, add requirement for ansible <2, and stop using NL mirror for
epel.

Change-Id: I743c51c2d6b7f6af0aa4038e1081066b36e36fa1
Partially-Implements: blueprint kolla-docker-module
This commit is contained in:
Martin André 2016-01-04 11:52:46 +09:00
parent bef9c081b5
commit f7c196281c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev/vagrant/bootstrap.sh
View File

@ -29,8 +29,10 @@ function prep_work {
# resolve to the public IP instead of localhost. # resolve to the public IP instead of localhost.
sed -i -r "s/^(127\.0\.0\.1\s+)(.*) `hostname` (.+)/\1 \3/" /etc/hosts sed -i -r "s/^(127\.0\.0\.1\s+)(.*) `hostname` (.+)/\1 \3/" /etc/hosts
yum install -y http://mirror.nl.leaseweb.net/epel/7/x86_64/e/epel-release-7-5.noarch.rpm yum install -y epel-release
yum install -y MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel && yum clean all rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
yum install -y MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel
yum clean all
pip install --upgrade docker-py pip install --upgrade docker-py
} }
@ -49,11 +51,6 @@ enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
EOF EOF
# Pin Docker version to 1.8.2 before including this change
# https://github.com/ansible/ansible-modules-core/pull/2258
# in some tagged version of Ansible.
yum install -y yum-plugin-versionlock
yum versionlock add docker-engine-1.8.2-1.el7.centos.*
# Also upgrade device-mapper here because of: # Also upgrade device-mapper here because of:
# https://github.com/docker/docker/issues/12108 # https://github.com/docker/docker/issues/12108
yum install -y docker-engine device-mapper yum install -y docker-engine device-mapper
@ -85,7 +82,7 @@ function configure_kolla {
# Configure the operator node and install some additional packages. # Configure the operator node and install some additional packages.
function configure_operator { function configure_operator {
yum install -y git mariadb && yum clean all yum install -y git mariadb && yum clean all
pip install --upgrade ansible python-openstackclient tox pip install --upgrade "ansible<2" python-openstackclient tox
pip install ~vagrant/kolla pip install ~vagrant/kolla

2
dev/vagrant/ubuntu-bootstrap.sh
View File

@ -27,7 +27,7 @@ install_docker() {
apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
echo "deb https://apt.dockerproject.org/repo ubuntu-vivid main" > /etc/apt/sources.list.d/docker.list echo "deb https://apt.dockerproject.org/repo ubuntu-vivid main" > /etc/apt/sources.list.d/docker.list
apt-get update apt-get update
apt-get install -y docker-engine=1.8.2* apt-get install -y docker-engine
sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon -H fd:// -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --insecure-registry ${REGISTRY}:${REGISTRY_PORT}," /lib/systemd/system/docker.service sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon -H fd:// -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --insecure-registry ${REGISTRY}:${REGISTRY_PORT}," /lib/systemd/system/docker.service
systemctl daemon-reload systemctl daemon-reload
systemctl enable docker systemctl enable docker