openstack
/
kolla
Code Issues Proposed changes

Merge "Run docker registry in gate"

This commit is contained in:
Jenkins 2016-12-02 17:34:36 +00:00 committed by Gerrit Code Review
parent 0ba790762b 069d1a2bfb
commit 1e55bfae6a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/setup_Debian.sh
View File

@ -70,7 +70,7 @@ else
sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd --storage-driver btrfs
ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=127.0.0.1:4000
MountFlags=shared
EOF
sudo systemctl daemon-reload

2
tools/setup_RedHat.sh
View File

@ -53,7 +53,7 @@ sudo mkdir /etc/systemd/system/docker.service.d
sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd --storage-driver btrfs
ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=127.0.0.1:4000
MountFlags=shared
EOF

7
tools/setup_gate.sh
View File

@ -148,10 +148,17 @@ function setup_logging {
mkdir -p /tmp/logs/{ansible,build,kolla,kolla_configs,system_logs}
}
function setup_registry {
sudo mkdir /tmp/kolla_registry
sudo chmod -R 644 /tmp/kolla_registry
docker run -d -p 4000:5000 --restart=always -v /tmp/kolla_registry/:/var/lib/registry --name registry registry:2
}
setup_logging
tools/dump_info.sh
setup_workaround_broken_nodepool
setup_ssh
setup_ansible
setup_node
setup_registry
setup_config