diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-02 14:40:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-02 14:40:11 +0000 |
| commit | 7d490a73d9e4a304f871e052b93ae05de513863d (patch) | |
| tree | cc89b21a87e7e38d466b1ec69f7f103b75974a0d | |
| parent | bc1a468981288897c7a8d1cf60306230788d9fa2 (diff) | |
| parent | a912b7909a9e62f200b289ac3789d96959464f4e (diff) | |
| download | kolla-7d490a73d9e4a304f871e052b93ae05de513863d.tar.gz kolla-7d490a73d9e4a304f871e052b93ae05de513863d.zip | |
Merge "Use a local docker image namespace in gate"
| -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 |