From 55ce138a0030aa7f9136f5c74f8853744e549d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Thu, 27 Jun 2019 09:29:01 +0200 Subject: [PATCH] Replace repository links so they point directly to opendev.org Change-Id: I3da45390c923e00058428207dca26f2f75cd8714 --- README.md | 4 +- Vagrantfile | 2 +- .../v1.0demo/software/config/versions.yaml | 156 +++++++++--------- .../v1.0dev/software/config/versions.yaml | 108 ++++++------ doc/source/code-conventions.rst | 2 +- manifests/common/deploy-airship.sh | 6 +- manifests/dev_minimal/README.txt | 2 +- manifests/dev_minimal/set-env.sh | 6 +- 8 files changed, 143 insertions(+), 143 deletions(-) diff --git a/README.md b/README.md index 40a4c54a..117de095 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To get started, run the following in a fresh Ubuntu 16.04 VM ``` sudo -i mkdir -p /root/deploy && cd "$_" -git clone https://git.openstack.org/openstack/airship-in-a-bottle +git clone https://opendev.org/airship/airship-in-a-bottle cd /root/deploy/airship-in-a-bottle/manifests/dev_single_node ./airship-in-a-bottle.sh ``` @@ -25,7 +25,7 @@ Or, alternatively, if you have Vagrant installed, just run the following (only libvirt/kvm hypervisor is tested, but vagrant box supports VMware Desktop/Workstation/Fusion, Parallels, and Hyper-V): ``` -curl -O https://git.airshipit.org/cgit/airship-in-a-bottle/plain/Vagrantfile +curl -O https://opendev.org/airship/airship-in-a-bottle/raw/branch/master/Vagrantfile vagrant up ``` diff --git a/Vagrantfile b/Vagrantfile index c6bb1bce..22011e22 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -79,7 +79,7 @@ Vagrant.configure("2") do |config| node.vm.hostname = "n0" node.vm.provision :shell, inline: <<-SHELL mkdir /root/deploy - git clone https://git.airshipit.org/airship-in-a-bottle /root/deploy/airship-in-a-bottle + git clone https://opendev.org/airship/airship-in-a-bottle /root/deploy/airship-in-a-bottle cd /root/deploy/airship-in-a-bottle/manifests/dev_single_node ./airship-in-a-bottle.sh -y SHELL diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 6685a1e6..61e1bedd 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -13,397 +13,397 @@ data: charts: kubernetes: apiserver: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 subpath: charts/apiserver type: git apiserver-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git calico: calico: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: calico type: git calico-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git etcd: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/etcd type: git etcd-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git controller-manager: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/controller_manager type: git controller-manager-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git coredns: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/coredns type: git coredns-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git etcd: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/etcd type: git etcd-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git haproxy: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/haproxy type: git haproxy-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git ingress: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: ingress type: git ingress-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git proxy: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/proxy type: git proxy-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git scheduler: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 subpath: charts/scheduler type: git scheduler-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git ucp: nfs_provisioner: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: nfs-provisioner reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 nfs_htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 armada: - location: https://git.openstack.org/openstack/airship-armada + location: https://opendev.org/airship/armada reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 subpath: charts/armada type: git armada-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git barbican: - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70 subpath: barbican type: git barbican-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git #TODO Update to split ceph charts ceph: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: ceph reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 ceph-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: helm-toolkit reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 deckhand: - location: https://git.openstack.org/openstack/airship-deckhand + location: https://opendev.org/airship/deckhand reference: 464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd subpath: charts/deckhand type: git deckhand-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git divingbell: - location: https://git.openstack.org/openstack/airship-divingbell + location: https://opendev.org/airship/divingbell reference: 87dbc54044fd679f56123ffb1db9fefd35a77801 subpath: divingbell type: git divingbell-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git drydock: - location: https://git.openstack.org/openstack/airship-drydock + location: https://opendev.org/airship/drydock reference: d93d6d5a0a370ced536180612d1ade708e29cd47 subpath: charts/drydock type: git drydock-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: 4ad893eb1a5ebd7c7660c70d44d1316862268cf1 subpath: helm-toolkit type: git ingress: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: ingress type: git ingress-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git keystone: - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70 subpath: keystone type: git keystone-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git maas: - location: https://git.openstack.org/openstack/airship-maas + location: https://opendev.org/airship/maas reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582 subpath: charts/maas type: git maas-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: 4ad893eb1a5ebd7c7660c70d44d1316862268cf1 subpath: helm-toolkit type: git mariadb: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: mariadb type: git mariadb-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git memcached: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: memcached type: git memcached-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git postgresql: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: postgresql type: git postgresql-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git promenade: - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 subpath: charts/promenade type: git promenade-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git rabbitmq: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: rabbitmq type: git rabbitmq-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git shipyard: - location: https://git.openstack.org/openstack/airship-shipyard + location: https://opendev.org/airship/shipyard reference: 4dd6b484d11e86ad51da733841b9ef137421d461 subpath: charts/shipyard type: git shipyard-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git tiller: - location: https://git.openstack.org/openstack/airship-armada + location: https://opendev.org/airship/armada reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 subpath: charts/tiller type: git tiller-htk: - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 subpath: helm-toolkit type: git openstack: glance: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: glance reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 glance-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 heat: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: heat reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 heat-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 horizon: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: horizon reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 horizon-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: ingress reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 keystone: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: keystone reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 keystone-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 libvirt: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: libvirt reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 libvirt-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 mariadb: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: mariadb reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 mariadb-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 memcached: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: memcached reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 memcached-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 neutron: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: neutron reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 neutron-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 nova: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: nova reference: 112e15b1655285194593a7afca4352ce046c7a47 nova-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 openvswitch: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: openvswitch reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 openvswitch-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 rabbitmq: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: rabbitmq reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 rabbitmq-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml index 24a3bcfa..66c420cf 100644 --- a/deployment_files/global/v1.0dev/software/config/versions.yaml +++ b/deployment_files/global/v1.0dev/software/config/versions.yaml @@ -15,275 +15,275 @@ data: calico: etcd: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/etcd reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 etcd-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 calico: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: calico reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 calico-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 apiserver: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/apiserver reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 apiserver-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 controller-manager: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/controller_manager reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 controller-manager-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 coredns: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/coredns reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 coredns-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 haproxy: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/haproxy reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 haproxy-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 etcd: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/etcd reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 etcd-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: ingress reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 proxy: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/proxy reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 proxy-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 scheduler: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/scheduler reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0 scheduler-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ucp: nfs_provisioner: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: nfs-provisioner reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 nfs_htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 armada: type: git - location: https://git.openstack.org/openstack/airship-armada + location: https://opendev.org/airship/armada subpath: charts/armada reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 armada-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 barbican: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: barbican reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 barbican-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 #TODO Update to split ceph charts ceph: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: ceph reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 #TODO Update to new HTK with split ceph charts ceph-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: helm-toolkit reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 deckhand: type: git - location: https://git.openstack.org/openstack/airship-deckhand + location: https://opendev.org/airship/deckhand subpath: charts/deckhand reference: a0f00013b5db1def374fbd5b9f0009f704290bb1 deckhand-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 divingbell: type: git - location: https://git.openstack.org/openstack/airship-divingbell + location: https://opendev.org/airship/divingbell subpath: divingbell reference: 87dbc54044fd679f56123ffb1db9fefd35a77801 divingbell-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 drydock: type: git - location: https://git.openstack.org/openstack/airship-drydock + location: https://opendev.org/airship/drydock subpath: charts/drydock reference: 3470f89519d018c572905566891bafc8a3c51c3b drydock-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: ingress reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 ingress-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 postgresql: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: postgresql reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 postgresql-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 promenade: type: git - location: https://git.openstack.org/openstack/airship-promenade + location: https://opendev.org/airship/promenade subpath: charts/promenade reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 promenade-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 keystone: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: keystone reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 keystone-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 maas: type: git - location: https://git.openstack.org/openstack/airship-maas + location: https://opendev.org/airship/maas subpath: charts/maas reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582 maas-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 mariadb: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://opendev.org/openstack/openstack-helm subpath: mariadb reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 mariadb-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 memcached: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: memcached reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 memcached-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 rabbitmq: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: rabbitmq reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 rabbitmq-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 shipyard: type: git - location: https://git.openstack.org/openstack/airship-shipyard + location: https://opendev.org/airship/shipyard subpath: charts/shipyard reference: 4dd6b484d11e86ad51da733841b9ef137421d461 shipyard-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: bb3ff98d53c38a2ba70f506a8b6dc36207baa207 tiller: type: git - location: https://git.openstack.org/openstack/airship-armada + location: https://opendev.org/airship/armada subpath: charts/tiller reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 tiller-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://opendev.org/openstack/openstack-helm-infra subpath: helm-toolkit reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9 diff --git a/doc/source/code-conventions.rst b/doc/source/code-conventions.rst index 16cb3ab7..dfeb20ba 100644 --- a/doc/source/code-conventions.rst +++ b/doc/source/code-conventions.rst @@ -208,5 +208,5 @@ prevail. .. _Docker: https://www.docker.com/ -.. _helm-toolkit: https://git.openstack.org/cgit/openstack/openstack-helm-infra/tree/helm-toolkit +.. _helm-toolkit: https://opendev.org/openstack/openstack-helm-infra/src/branch/master/helm-toolkit .. _Openstack-Helm: https://wiki.openstack.org/wiki/Openstack-helm diff --git a/manifests/common/deploy-airship.sh b/manifests/common/deploy-airship.sh index 9dd6b236..aa31d73f 100755 --- a/manifests/common/deploy-airship.sh +++ b/manifests/common/deploy-airship.sh @@ -70,11 +70,11 @@ POST_GENESIS_DELAY=${POST_GENESIS_DELAY:-60} # Repositories -AIRSHIP_IN_A_BOTTLE_REPO=${AIRSHIP_IN_A_BOTTLE_REPO:-"https://git.openstack.org/openstack/airship-in-a-bottle"} +AIRSHIP_IN_A_BOTTLE_REPO=${AIRSHIP_IN_A_BOTTLE_REPO:-"https://opendev.org/airship/airship-in-a-bottle"} AIRSHIP_IN_A_BOTTLE_REFSPEC=${AIRSHIP_IN_A_BOTTLE_REFSPEC:-""} -PEGLEG_REPO=${PEGLEG_REPO:-"https://git.openstack.org/openstack/airship-pegleg.git"} +PEGLEG_REPO=${PEGLEG_REPO:-"https://opendev.org/airship/pegleg.git"} PEGLEG_REFSPEC=${PEGLEG_REFSPEC:-""} -SHIPYARD_REPO=${SHIPYARD_REPO:-"https://git.openstack.org/openstack/airship-shipyard.git"} +SHIPYARD_REPO=${SHIPYARD_REPO:-"https://opendev.org/airship/shipyard.git"} SHIPYARD_REFSPEC=${SHIPYARD_REFSPEC:-""} # Images diff --git a/manifests/dev_minimal/README.txt b/manifests/dev_minimal/README.txt index c9475853..dc9551d7 100644 --- a/manifests/dev_minimal/README.txt +++ b/manifests/dev_minimal/README.txt @@ -52,7 +52,7 @@ behind a corporate proxy. armada: type: git - location: https://git.openstack.org/openstack/airship-armada + location: https://opendev.org/airship/armada subpath: charts/armada reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 proxy_server: http://your.proxy.address:port diff --git a/manifests/dev_minimal/set-env.sh b/manifests/dev_minimal/set-env.sh index 27daa774..47e92655 100644 --- a/manifests/dev_minimal/set-env.sh +++ b/manifests/dev_minimal/set-env.sh @@ -33,11 +33,11 @@ export HOSTCIDR=10.0.0.0/24 export NODE_NET_IFACE=ens3 # Repositories -# export AIRSHIP_IN_A_BOTTLE_REPO="https://git.openstack.org/openstack/airship-in-a-bottle" +# export AIRSHIP_IN_A_BOTTLE_REPO="https://opendev.org/airship/airship-in-a-bottle" # export AIRSHIP_IN_A_BOTTLE_REFSPEC="" -# export PEGLEG_REPO="https://git.openstack.org/openstack/airship-pegleg.git" +# export PEGLEG_REPO="https://opendev.org/airship/pegleg.git" # export PEGLEG_REFSPEC="" -# export SHIPYARD_REPO="https://git.openstack.org/openstack/airship-shipyard.git" +# export SHIPYARD_REPO="https://opendev.org/airship/shipyard.git" # export SHIPYARD_REFSPEC="" # Images