diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-02 17:34:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-02 17:34:36 +0000 |
| commit | 1e55bfae6a656cce2ff3768521d2654c8078327c (patch) | |
| tree | 269565fb4ce417bcd02180dbb9e968510f65d6e1 | |
| parent | 0ba790762b5b441ae02181fe6ba0a177ce271d6e (diff) | |
| parent | 069d1a2bfb5b5f3a8a69a660067cc813c856e1d4 (diff) | |
| download | kolla-1e55bfae6a656cce2ff3768521d2654c8078327c.tar.gz kolla-1e55bfae6a656cce2ff3768521d2654c8078327c.zip | |
Merge "Run docker registry in gate"
| -rwxr-xr-x | tools/setup_Debian.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_RedHat.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 264868451..2ea203969 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -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 diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index cffe176bb..e6e949a52 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -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 diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index a22044f0b..dffcb69f9 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -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 |