airship
/
airship-in-a-bottle
Code Issues Proposed changes

Merge "OSH: Update git refs to OpenStack-Infra"

This commit is contained in:
Zuul 2018-06-06 15:22:24 +00:00 committed by Gerrit Code Review
parent fd2ccd510f e3f95d332a
commit b081a10dc0
7 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -13,7 +13,7 @@ To get started, run the following in a fresh Ubuntu 16.04 VM
```
sudo -i
mkdir -p /root/deploy && cd "$_"
git clone https://github.com/openstack/airship-in-a-bottle
git clone https://git.openstack.org/openstack/airship-in-a-bottle
cd /root/deploy/airship-in-a-bottle/manifests/dev_single_node
./airship-in-a-bottle.sh
```

122
deployment_files/global/v1.0demo/software/config/versions.yaml
View File

@ -24,17 +24,17 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
etcd-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
calico:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: calico
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
calico-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
apiserver:
@ -44,7 +44,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
apiserver-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
controller-manager:
@ -54,7 +54,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
controller-manager-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
coredns:
@ -64,7 +64,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
coredns-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
haproxy:
@ -74,7 +74,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
haproxy-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
etcd:
@ -84,17 +84,17 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
etcd-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ingress
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
proxy:
@ -104,7 +104,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
proxy-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
scheduler:
@ -114,18 +114,18 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
scheduler-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ucp:
nfs_provisioner:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: nfs-provisioner
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
nfs_htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
armada:
@ -135,27 +135,27 @@ data:
reference: 2b714888c490a9f7c5a11383eb18b7226d1b1dc8
armada-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
barbican:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: barbican
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
barbican-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ceph:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ceph
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ceph-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
deckhand:
@ -165,7 +165,7 @@ data:
reference: 0118874a4a77d9afbae525359e65bd659142a82c
deckhand-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
divingbell:
@ -175,7 +175,7 @@ data:
reference: 9e7028416e8b6798c1b2bf04770bd165e398b5c1
divingbell-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
drydock:
@ -185,17 +185,17 @@ data:
reference: 506e06623a5f1c11c0d34f2089851cc8381f06ae
drydock-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ingress
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
postgresql:
@ -204,12 +204,12 @@ data:
subpath: postgresql
reference: refs/changes/80/569480/2
# Liveness probe is too aggressive right now, using ref above instead
# location: https://github.com/openstack/openstack-helm
# location: https://git.openstack.org/openstack/openstack-helm
# subpath: postgresql
# reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
postgresql-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
promenade:
@ -219,17 +219,17 @@ data:
reference: ccd372a97490971d4a5b2281424be7595c55c1b0
promenade-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
keystone:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: keystone
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
keystone-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
maas:
@ -239,37 +239,37 @@ data:
reference: 3e4849e132353f22378fa7d10838f3e0c2f0eef2
maas-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
mariadb:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: mariadb
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
mariadb-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
memcached:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: memcached
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
memcached-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
rabbitmq:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: rabbitmq
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
rabbitmq-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
shipyard:
@ -279,7 +279,7 @@ data:
reference: 0c9152d62e43747f33da58b217320f783a5cca8b
shipyard-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
tiller:
@ -289,28 +289,28 @@ data:
reference: 35b426db32a7440d862c88e7ac3eef3a453acfc9
tiller-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
openstack:
glance:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: glance
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
glance-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
heat:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: heat
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
heat-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
horizon:
@ -320,97 +320,97 @@ data:
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
horizon-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
ingress:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ingress
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
ingress-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
keystone:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: keystone
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
keystone-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
libvirt:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: libvirt
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
libvirt-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
mariadb:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: mariadb
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
mariadb-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
memcached:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: memcached
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
memcached-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
neutron:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: neutron
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
neutron-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
nova:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: nova
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
nova-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
openvswitch:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: openvswitch
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
openvswitch-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
rabbitmq:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: rabbitmq
reference: a4fa9b761e2de14df588c1e37f3693174f15ad36
rabbitmq-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75

76
deployment_files/global/v1.0dev/software/config/versions.yaml
View File

@ -24,17 +24,17 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
etcd-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
calico:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: calico
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
calico-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
apiserver:
@ -44,7 +44,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
apiserver-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
controller-manager:
@ -54,7 +54,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
controller-manager-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
coredns:
@ -64,7 +64,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
coredns-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
haproxy:
@ -74,7 +74,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
haproxy-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
etcd:
@ -84,17 +84,17 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
etcd-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ingress
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
proxy:
@ -104,7 +104,7 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
proxy-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
scheduler:
@ -114,18 +114,18 @@ data:
reference: 6e87b82f514cc4160b09cf394646410a9d9fe2a7
scheduler-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ucp:
nfs_provisioner:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: nfs-provisioner
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
nfs_htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
armada:
@ -135,27 +135,27 @@ data:
reference: 2b714888c490a9f7c5a11383eb18b7226d1b1dc8
armada-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
barbican:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: barbican
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
barbican-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ceph:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ceph
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ceph-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
deckhand:
@ -165,7 +165,7 @@ data:
reference: 0118874a4a77d9afbae525359e65bd659142a82c
deckhand-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
divingbell:
@ -175,7 +175,7 @@ data:
reference: 9e7028416e8b6798c1b2bf04770bd165e398b5c1
divingbell-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
drydock:
@ -185,17 +185,17 @@ data:
reference: 506e06623a5f1c11c0d34f2089851cc8381f06ae
drydock-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: ingress
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
ingress-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
postgresql:
@ -204,12 +204,12 @@ data:
subpath: postgresql
reference: refs/changes/80/569480/2
# Liveness probe is too aggressive right now, using ref above instead
# location: https://github.com/openstack/openstack-helm
# location: https://git.openstack.org/openstack/openstack-helm
# subpath: postgresql
# reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
postgresql-htk:
type: git
location: https://github.com/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 9f921f23fb2df702981a0b3d33062ff607350f75
promenade:
@ -219,17 +219,17 @@ data:
reference: ccd372a97490971d4a5b2281424be7595c55c1b0
promenade-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
keystone:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: keystone
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
keystone-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
maas:
@ -239,37 +239,37 @@ data:
reference: 3e4849e132353f22378fa7d10838f3e0c2f0eef2
maas-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
mariadb:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: mariadb
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
mariadb-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
memcached:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: memcached
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
memcached-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
rabbitmq:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: rabbitmq
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
rabbitmq-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
shipyard:
@ -279,7 +279,7 @@ data:
reference: 0c9152d62e43747f33da58b217320f783a5cca8b
shipyard-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
tiller:
@ -289,7 +289,7 @@ data:
reference: 35b426db32a7440d862c88e7ac3eef3a453acfc9
tiller-htk:
type: git
location: https://github.com/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
files:

2
docs/source/code-conventions.rst
View File

@ -204,5 +204,5 @@ prevail.
.. _Docker: https://www.docker.com/
.. _helm-toolkit: https://github.com/openstack/openstack-helm/tree/master/helm-toolkit
.. _helm-toolkit: https://git.openstack.org/cgit/openstack/openstack-helm-infra/tree/helm-toolkit
.. _Openstack-Helm: https://wiki.openstack.org/wiki/Openstack-helm

4
docs/source/index.rst
View File

@ -36,7 +36,7 @@ Approach
--------
Airship revolves around the setup and use of Kubernetes and `Helm`_ and takes
cues from these projects. The first use case of Airship is the deployment
of `OpenStack Helm`_ which also influences Airship's direction.
of `OpenStack-Helm`_ which also influences Airship's direction.
Building this Documentation
---------------------------
@ -60,6 +60,6 @@ Conventions and Standards
.. _Helm: https://helm.sh/
.. _Kubernetes: https://kubernetes.io/
.. _Openstack: https://www.openstack.org/
.. _Openstack Helm: https://github.com/openstack/openstack-helm
.. _Openstack-Helm: https://docs.openstack.org/openstack-helm/latest/
.. _Treasuremap: https://github.com/att-comdev/treasuremap
.. _yaml: http://yaml.org/

6
manifests/common/deploy-airship.sh
View File

@ -65,11 +65,11 @@ POST_GENESIS_DELAY=${POST_GENESIS_DELAY:-60}
# Repositories
AIRSHIP_IN_A_BOTTLE_REPO=${AIRSHIP_IN_A_BOTTLE_REPO:-"https://github.com/openstack/airship-in-a-bottle"}
AIRSHIP_IN_A_BOTTLE_REPO=${AIRSHIP_IN_A_BOTTLE_REPO:-"https://git.openstack.org/openstack/airship-in-a-bottle"}
AIRSHIP_IN_A_BOTTLE_REFSPEC=${AIRSHIP_IN_A_BOTTLE_REFSPEC:-""}
PEGLEG_REPO=${PEGLEG_REPO:-"https://github.com/openstack/airship-pegleg.git"}
PEGLEG_REPO=${PEGLEG_REPO:-"https://git.openstack.org/openstack/airship-pegleg.git"}
PEGLEG_REFSPEC=${PEGLEG_REFSPEC:-""}
SHIPYARD_REPO=${SHIPYARD_REPO:-"https://github.com/openstack/airship-shipyard.git"}
SHIPYARD_REPO=${SHIPYARD_REPO:-"https://git.openstack.org/openstack/airship-shipyard.git"}
SHIPYARD_REFSPEC=${SHIPYARD_REFSPEC:-""}
# Images

6
manifests/dev_minimal/set-env.sh
View File

@ -33,11 +33,11 @@ export HOSTCIDR=10.0.0.0/24
export NODE_NET_IFACE=ens3
# Repositories
# export UCP_INTEGRATION_REPO="https://github.com/openstack/airship-in-a-bottle"
# export UCP_INTEGRATION_REPO="https://git.openstack.org/openstack/airship-in-a-bottle"
# export UCP_INTEGRATION_REFSPEC=""
# export PEGLEG_REPO="https://github.com/openstack/airship-pegleg.git"
# export PEGLEG_REPO="https://git.openstack.org/openstack/airship-pegleg.git"
# export PEGLEG_REFSPEC=""
# export SHIPYARD_REPO="https://github.com/openstack/airship-shipyard.git"
# export SHIPYARD_REPO="https://git.openstack.org/openstack/airship-shipyard.git"
# export SHIPYARD_REFSPEC=""
# Images