diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-01 21:27:05 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-01 22:17:57 +0800 |
| commit | a912b7909a9e62f200b289ac3789d96959464f4e (patch) | |
| tree | 000d417221cb328cc2050cdabcbd03eac69c116c | |
| parent | ac0ba62bdf5eb00d887ceacc20ff18215c5d34ea (diff) | |
| download | kolla-a912b7909a9e62f200b289ac3789d96959464f4e.tar.gz kolla-a912b7909a9e62f200b289ac3789d96959464f4e.zip | |
Use a local docker image namespace in gate
use different a docker namespace name in case it pull image from
hub.docker.io when deplying in gate
TrivialFix
Change-Id: I643000e5d9e597a254a4f12c0c10186d4eb20429
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
| -rwxr-xr-x | tools/deploy_aio.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh index 8266bb187..60052e37f 100755 --- a/tools/deploy_aio.sh +++ b/tools/deploy_aio.sh @@ -68,6 +68,8 @@ kolla_install_type: "${KOLLA_TYPE}" kolla_internal_vip_address: "169.254.169.10" keepalived_virtual_router_id: "${KEEPALIVED_VIRTUAL_ROUTER_ID}" docker_restart_policy: "never" +# NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying +docker_namespace: "lokolla" network_interface: "${PRIVATE_INTERFACE}" neutron_external_interface: "fake_interface" enable_horizon: "no" diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 671181747..daf3c7692 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -38,6 +38,9 @@ EOF rm ${PIP_CONF} sed -i 's|^#include_header.*|include_header = /etc/kolla/header|' /etc/kolla/kolla-build.conf + # NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying + sed -i 's|^#namespace.*|namespace = lokolla|' /etc/kolla/kolla-build.conf + if [[ "${DISTRO}" == "Debian" ]]; then # Infra does not sign thier mirrors so we ignore gpg signing in the gate echo "RUN echo 'APT::Get::AllowUnauthenticated \"true\";' > /etc/apt/apt.conf" | sudo tee -a /etc/kolla/header |