From 086ace64e90e234c915aa19a63a1dc365cc2a590 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Wed, 24 Apr 2019 16:44:58 +0200 Subject: [PATCH] Move to opendev Change-Id: I6706ee3f611b21a4d470c68fec4bf090dc6a4cc0 --- Dockerfile | 2 +- README.md | 14 +++++++------- playbooks/files/apache.conf | 2 +- playbooks/vars.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7d86934..5157172 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM ${FROM} ENV PATH=/var/lib/openstack/bin:$PATH ARG PROJECT ARG WHEELS=loci/requirements:master-ubuntu -ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT} +ARG PROJECT_REPO=https://opendev.org/openstack/${PROJECT} ARG PROJECT_REF=master ARG DISTRO ARG PROFILES diff --git a/README.md b/README.md index 21a602d..06b5a83 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,14 @@ Note: To build locally, you will need a version of docker >= 17.05.0. It's really easy to build images locally: ``` bash -$ docker build https://git.openstack.org/openstack/loci.git --build-arg PROJECT=keystone \ +$ docker build https://opendev.org/openstack/loci.git --build-arg PROJECT=keystone \ --tag keystone:ubuntu ``` The default base distro is Ubuntu, however, you can use the following form to build from a distro of your choice, in this case, CentOS: ``` bash -$ docker build https://git.openstack.org/openstack/loci.git \ +$ docker build https://opendev.org/openstack/loci.git \ --build-arg PROJECT=keystone \ --build-arg WHEELS="loci/requirements:master-centos" \ --build-arg FROM=centos:7 \ @@ -57,7 +57,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \ If building behind a proxy, remember to use build arguments to pass these through to the build: ``` bash -$ docker build https://git.openstack.org/openstack/loci.git \ +$ docker build https://opendev.org/openstack/loci.git \ --build-arg http_proxy=$http_proxy \ --build-arg https_proxy=$https_proxy \ --build-arg no_proxy=$no_proxy \ @@ -109,9 +109,9 @@ For more advanced building you can use docker build arguments to define: This makes it really easy to integrate LOCI images into your development or CI/CD workflow, for example, if you wanted to build an image from [this -PS](https://review.openstack.org/#/c/418167/) you could run: +PS](https://review.opendev.org/#/c/418167/) you could run: ``` bash -$ docker build https://git.openstack.org/openstack/loci.git \ +$ docker build https://opendev.org/openstack/loci.git \ --build-arg PROJECT=keystone \ --tag mydockernamespace/keystone-testing:418167-1 \ --build-arg PROJECT_REF=refs/changes/67/418167/1 @@ -119,14 +119,14 @@ $ docker build https://git.openstack.org/openstack/loci.git \ To build with the wheels from a private Docker registry rather than Docker Hub run: ``` bash -$ docker build https://git.openstack.org/openstack/loci.git \ +$ docker build https://opendev.org/openstack/loci.git \ --build-arg PROJECT=keystone \ --build-arg WHEELS=172.17.0.1:5000/mydockernamespace/keystone:ubuntu ``` To build cinder with lvm and ceph support you would run: ``` bash -$ docker build https://git.openstack.org/openstack/loci.git \ +$ docker build https://opendev.org/openstack/loci.git \ --build-arg PROJECT=cinder \ --build-arg PROFILES="lvm ceph" ``` diff --git a/playbooks/files/apache.conf b/playbooks/files/apache.conf index 4a91a46..7ec7ed1 100644 --- a/playbooks/files/apache.conf +++ b/playbooks/files/apache.conf @@ -14,7 +14,7 @@ LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so # the same subnet as the internal addesses in the build containers Listen 172.17.0.1:80 - SetEnv GIT_PROJECT_ROOT /home/zuul/src/git.openstack.org/ + SetEnv GIT_PROJECT_ROOT /home/zuul/src/opendev.org/ SetEnv GIT_HTTP_EXPORT_ALL ScriptAlias /git/ /usr/lib/git-core/git-http-backend/ DocumentRoot /webroot diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml index 2bbe3c7..a2b7b92 100644 --- a/playbooks/vars.yaml +++ b/playbooks/vars.yaml @@ -16,7 +16,7 @@ reuse_requirements: False # Override Zuul inference of source directory from project name to always # use "loci". -loci_src_dir: "src/git.openstack.org/openstack/loci" +loci_src_dir: "src/opendev.org/openstack/loci" # Branch name used for image building and publishing # If running in an environment with zuul and under a branched project # (like openstack/cinder, openstack/nova, ... but not openstack/loci)