Browse Source

Fixes for airship manifests

- Fix missing k8s IP for etcd certs
 - Fix release groups for wait labels
 - Fix versions that changed since initial manfiests
 - Fix barbican override to use loci image
 - Add re-generated certs
 - Adjust partitions for host profiles

Change-Id: I961886cbaa3a0ce03e836d2392cf81bb74afc26c
changes/79/592679/42
Kaspars Skels 4 years ago
parent
commit
dcf54d4cf7
  1. 2
      global/v4.0/profiles/host/cp.yaml
  2. 2
      global/v4.0/profiles/host/dp.yaml
  3. 4
      global/v4.0/software/charts/kubernetes/container-networking/calico.yaml
  4. 4
      global/v4.0/software/charts/kubernetes/container-networking/etcd.yaml
  5. 4
      global/v4.0/software/charts/kubernetes/core/apiserver.yaml
  6. 4
      global/v4.0/software/charts/kubernetes/core/controller-manager.yaml
  7. 4
      global/v4.0/software/charts/kubernetes/core/scheduler.yaml
  8. 4
      global/v4.0/software/charts/kubernetes/dns/coredns.yaml
  9. 4
      global/v4.0/software/charts/kubernetes/etcd/etcd.yaml
  10. 4
      global/v4.0/software/charts/kubernetes/haproxy/haproxy.yaml
  11. 4
      global/v4.0/software/charts/kubernetes/ingress/ingress.yaml
  12. 4
      global/v4.0/software/charts/kubernetes/proxy/kubernetes-proxy.yaml
  13. 4
      global/v4.0/software/charts/ucp/armada/armada.yaml
  14. 4
      global/v4.0/software/charts/ucp/armada/tiller.yaml
  15. 6
      global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml
  16. 4
      global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml
  17. 4
      global/v4.0/software/charts/ucp/ceph/ceph-client.yaml
  18. 4
      global/v4.0/software/charts/ucp/ceph/ceph-ingress.yaml
  19. 4
      global/v4.0/software/charts/ucp/ceph/ceph-mon.yaml
  20. 2
      global/v4.0/software/charts/ucp/ceph/ceph-osd.yaml
  21. 4
      global/v4.0/software/charts/ucp/core/ingress.yaml
  22. 4
      global/v4.0/software/charts/ucp/core/mariadb.yaml
  23. 4
      global/v4.0/software/charts/ucp/core/postgresql.yaml
  24. 4
      global/v4.0/software/charts/ucp/core/rabbitmq.yaml
  25. 4
      global/v4.0/software/charts/ucp/deckhand/barbican.yaml
  26. 4
      global/v4.0/software/charts/ucp/deckhand/deckhand.yaml
  27. 4
      global/v4.0/software/charts/ucp/divingbell/divingbell.yaml
  28. 4
      global/v4.0/software/charts/ucp/drydock/drydock.yaml
  29. 4
      global/v4.0/software/charts/ucp/drydock/maas.yaml
  30. 4
      global/v4.0/software/charts/ucp/keystone/keystone.yaml
  31. 4
      global/v4.0/software/charts/ucp/keystone/memcached.yaml
  32. 4
      global/v4.0/software/charts/ucp/promenade/promenade.yaml
  33. 4
      global/v4.0/software/charts/ucp/shipyard/shipyard.yaml
  34. 110
      global/v4.0/software/config/versions.yaml
  35. 16
      site/airship-seaworthy/networks/physical/networks.yaml
  36. 30
      site/airship-seaworthy/pki/pki-catalog.yaml
  37. 69
      site/airship-seaworthy/profiles/host/cp_r720.yaml
  38. 6
      site/airship-seaworthy/profiles/host/dp_r720.yaml
  39. 3414
      site/airship-seaworthy/secrets/certificates/certificates.yaml
  40. 16
      site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
  41. 16
      site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml
  42. 230
      site/airship-seaworthy/software/config/endpoints.yaml
  43. 16
      site/airship-seaworthy/software/config/service_accounts.yaml
  44. 36
      site/airship-seaworthy/software/manifests/full-site.yaml

2
global/v4.0/profiles/host/cp.yaml

@ -41,7 +41,7 @@ data:
fstype: 'ext4'
mount_options: 'defaults'
- name: 'var'
size: '>300g'
size: '>100g'
filesystem:
mountpoint: '/var'
fstype: 'ext4'

2
global/v4.0/profiles/host/dp.yaml

@ -41,7 +41,7 @@ data:
fstype: 'ext4'
mount_options: 'defaults'
- name: 'var'
size: '>300g'
size: '>100g'
filesystem:
mountpoint: '/var'
fstype: 'ext4'

4
global/v4.0/software/charts/kubernetes/container-networking/calico.yaml

@ -82,14 +82,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-calico
release_group: airship-kubernetes-calico
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-calico
release_group: airship-kubernetes-calico
values:
conf:
cni_network_config:

4
global/v4.0/software/charts/kubernetes/container-networking/etcd.yaml

@ -78,14 +78,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-calico-etcd
release_group: airship-kubernetes-calico-etcd
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-calico-etcd
release_group: airship-kubernetes-calico-etcd
values:
labels:
anchor:

4
global/v4.0/software/charts/kubernetes/core/apiserver.yaml

@ -109,14 +109,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-apiserver
release_group: airship-kubernetes-apiserver
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-apiserver
release_group: airship-kubernetes-apiserver
values:
apiserver:
etcd:

4
global/v4.0/software/charts/kubernetes/core/controller-manager.yaml

@ -91,14 +91,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-controller-manager
release_group: airship-kubernetes-controller-manager
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-controller-manager
release_group: airship-kubernetes-controller-manager
values:
command_prefix:
- /controller-manager

4
global/v4.0/software/charts/kubernetes/core/scheduler.yaml

@ -55,14 +55,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-scheduler
release_group: airship-kubernetes-scheduler
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-scheduler
release_group: airship-kubernetes-scheduler
values:
network:
kubernetes_netloc: 127.0.0.1:6553

4
global/v4.0/software/charts/kubernetes/dns/coredns.yaml

@ -86,14 +86,14 @@ data:
wait:
timeout: 600
labels:
release_group: coredns
release_group: airship-coredns
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: coredns
release_group: airship-coredns
values:
conf:
coredns:

4
global/v4.0/software/charts/kubernetes/etcd/etcd.yaml

@ -83,14 +83,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-etcd
release_group: airship-kubernetes-etcd
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-etcd
release_group: airship-kubernetes-etcd
values:
labels:
anchor:

4
global/v4.0/software/charts/kubernetes/haproxy/haproxy.yaml

@ -43,14 +43,14 @@ data:
wait:
timeout: 600
labels:
release_group: haproxy
release_group: airship-haproxy
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: haproxy
release_group: airship-haproxy
values:
conf:
anchor:

4
global/v4.0/software/charts/kubernetes/ingress/ingress.yaml

@ -31,7 +31,7 @@ data:
wait:
timeout: 300
labels:
release_group: ingress-kube-system
release_group: airship-ingress-kube-system
install:
no_hooks: false
upgrade:
@ -40,7 +40,7 @@ data:
delete:
- type: job
labels:
release_group: ingress-kube-system
release_group: airship-ingress-kube-system
values:
labels:
server:

4
global/v4.0/software/charts/kubernetes/proxy/kubernetes-proxy.yaml

@ -47,14 +47,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-proxy
release_group: airship-kubernetes-proxy
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-proxy
release_group: airship-kubernetes-proxy
values:
command_prefix:
- /proxy

4
global/v4.0/software/charts/ucp/armada/armada.yaml

@ -72,7 +72,7 @@ data:
wait:
timeout: 100
labels:
release_group: ucp-armada
release_group: airship-ucp-armada
install:
no_hooks: false
upgrade:
@ -81,7 +81,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-armada
release_group: airship-ucp-armada
values:
pod:
replicas:

4
global/v4.0/software/charts/ucp/armada/tiller.yaml

@ -31,7 +31,7 @@ data:
wait:
timeout: 100
labels:
release_group: ucp-tiller
release_group: airship-ucp-tiller
install:
no_hooks: false
upgrade:
@ -40,7 +40,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-tiller
release_group: airship-ucp-tiller
values: {}
dependencies:
- tiller-htk

6
global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml

@ -97,9 +97,9 @@ data:
release: ucp-ceph-config
namespace: ucp
wait:
timeout: 3600
timeout: 900
labels:
release_group: ucp-ceph-config
release_group: airship-ucp-ceph-config
install:
no_hooks: false
upgrade:
@ -108,7 +108,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-config
release_group: airship-ucp-ceph-config
values:
labels:
job:

4
global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml

@ -104,7 +104,7 @@ data:
wait:
timeout: 900
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
install:
no_hooks: false
upgrade:
@ -113,7 +113,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
values:
labels:
job:

4
global/v4.0/software/charts/ucp/ceph/ceph-client.yaml

@ -105,7 +105,7 @@ data:
wait:
timeout: 900
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
install:
no_hooks: false
upgrade:
@ -114,7 +114,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
values:
labels:
job:

4
global/v4.0/software/charts/ucp/ceph/ceph-ingress.yaml

@ -29,7 +29,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-ceph-ingress
release_group: airship-ucp-ceph-ingress
install:
no_hooks: false
upgrade:
@ -38,7 +38,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-ingress
release_group: airship-ucp-ceph-ingress
values:
conf:
ingress:

4
global/v4.0/software/charts/ucp/ceph/ceph-mon.yaml

@ -111,7 +111,7 @@ data:
wait:
timeout: 1800
labels:
release_group: ucp-ceph-mon
release_group: airship-ucp-ceph-mon
install:
no_hooks: false
upgrade:
@ -120,7 +120,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-mon
release_group: airship-ucp-ceph-mon
values:
logging:
fluentd: true

2
global/v4.0/software/charts/ucp/ceph/ceph-osd.yaml

@ -111,7 +111,7 @@ data:
wait:
timeout: 900
labels:
release_group: ucp-ceph-osd
release_group: airship-ucp-ceph-osd
install:
no_hooks: false
upgrade:

4
global/v4.0/software/charts/ucp/core/ingress.yaml

@ -29,7 +29,7 @@ data:
wait:
timeout: 300
labels:
release_group: ingress
release_group: airship-ingress
install:
no_hooks: false
upgrade:
@ -38,7 +38,7 @@ data:
delete:
- type: job
labels:
release_group: ingress
release_group: airship-ingress
values:
conf:
ingress:

4
global/v4.0/software/charts/ucp/core/mariadb.yaml

@ -54,7 +54,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-mariadb
release_group: airship-ucp-mariadb
install:
no_hooks: false
upgrade:
@ -63,7 +63,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-mariadb
release_group: airship-ucp-mariadb
values:
labels:
server:

4
global/v4.0/software/charts/ucp/core/postgresql.yaml

@ -53,7 +53,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-postgresql
release_group: airship-ucp-postgresql
install:
no_hooks: false
upgrade:
@ -62,7 +62,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-postgresql
release_group: airship-ucp-postgresql
create: []
post:
create: []

4
global/v4.0/software/charts/ucp/core/rabbitmq.yaml

@ -61,7 +61,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-rabbitmq
release_group: airship-ucp-rabbitmq
install:
no_hooks: false
upgrade:
@ -70,7 +70,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-rabbitmq
release_group: airship-ucp-rabbitmq
values:
pod:
replicas:

4
global/v4.0/software/charts/ucp/deckhand/barbican.yaml

@ -138,7 +138,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-barbican
release_group: airship-ucp-barbican
install:
no_hooks: false
upgrade:
@ -147,7 +147,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-barbican
release_group: airship-ucp-barbican
post:
create: []
values:

4
global/v4.0/software/charts/ucp/deckhand/deckhand.yaml

@ -121,7 +121,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-deckhand
release_group: airship-ucp-deckhand
install:
no_hooks: false
upgrade:
@ -130,7 +130,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-deckhand
release_group: airship-ucp-deckhand
post:
create: []
values:

4
global/v4.0/software/charts/ucp/divingbell/divingbell.yaml

@ -31,7 +31,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-divingbell
release_group: airship-ucp-divingbell
install:
no_hooks: false
upgrade:
@ -40,7 +40,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-divingbell
release_group: airship-ucp-divingbell
values:
conf:
sysctl:

4
global/v4.0/software/charts/ucp/drydock/drydock.yaml

@ -137,7 +137,7 @@ data:
wait:
timeout: 600
labels:
release_group: drydock
release_group: airship-drydock
install:
no_hooks: false
upgrade:
@ -146,7 +146,7 @@ data:
delete:
- type: job
labels:
release_group: drydock
release_group: airship-drydock
values:
labels:
node_selector_key: ucp-control-plane

4
global/v4.0/software/charts/ucp/drydock/maas.yaml

@ -157,7 +157,7 @@ data:
wait:
timeout: 600
labels:
release_group: maas
release_group: airship-maas
install:
no_hooks: false
upgrade:
@ -166,7 +166,7 @@ data:
delete:
- type: job
labels:
release_group: maas
release_group: airship-maas
values:
labels:
rack:

4
global/v4.0/software/charts/ucp/keystone/keystone.yaml

@ -121,7 +121,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-keystone
release_group: airship-ucp-keystone
install:
no_hooks: false
upgrade:
@ -130,7 +130,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-keystone
release_group: airship-ucp-keystone
post:
create: []
values:

4
global/v4.0/software/charts/ucp/keystone/memcached.yaml

@ -37,7 +37,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-keystone-memcached
release_group: airship-ucp-keystone-memcached
install:
no_hooks: false
upgrade:
@ -46,7 +46,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-keystone-memcached
release_group: airship-ucp-keystone-memcached
values:
labels:
server:

4
global/v4.0/software/charts/ucp/promenade/promenade.yaml

@ -78,7 +78,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-promenade
release_group: airship-ucp-promenade
install:
no_hooks: false
upgrade:
@ -87,7 +87,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-promenade
release_group: airship-ucp-promenade
values:
pod:
replicas:

4
global/v4.0/software/charts/ucp/shipyard/shipyard.yaml

@ -229,7 +229,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-shipyard
release_group: airship-ucp-shipyard
install:
no_hooks: false
upgrade:
@ -238,7 +238,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-shipyard
release_group: airship-ucp-shipyard
values:
endpoints:
postgresql_airflow_db:

110
global/v4.0/software/config/versions.yaml

@ -85,9 +85,9 @@ data:
reference: c0c5199fb20335b3e8839163129372059a876ce8
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: ingress
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: c0c5199fb20335b3e8839163129372059a876ce8
ingress-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -202,9 +202,9 @@ data:
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: ingress
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: c0c5199fb20335b3e8839163129372059a876ce8
keystone:
type: git
location: https://git.openstack.org/openstack/openstack-helm
@ -250,52 +250,52 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-armada
subpath: charts/armada
reference: 41683606507f4c391ba0d9f5ac932672596db7e2
reference: 0a5b74440c81ac9d7f84cf7b553f21bed01401e6
armada-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
barbican:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: barbican
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 8dc986740c83487261efa6540f89d5dbea211f98
barbican-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
ceph-mon:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: ceph-mon
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: e19be77f087995faccf06dd834a203fb2154a5f3
ceph-osd:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: ceph-osd
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: e19be77f087995faccf06dd834a203fb2154a5f3
ceph-client:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: ceph-client
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: e19be77f087995faccf06dd834a203fb2154a5f3
ceph-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
deckhand:
type: git
location: https://git.openstack.org/openstack/airship-deckhand
subpath: charts/deckhand
reference: 9b6eb81c824374303d4a4394f5c6ecfc20c48c92
reference: 0ac33c233d59a731bf289db23ec4a882ff359168
deckhand-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 3aeba707e36f36909e51e1cb0a81565ee28e0afa
divingbell:
type: git
location: https://git.openstack.org/openstack/airship-divingbell
@ -305,22 +305,22 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
drydock:
type: git
location: https://git.openstack.org/openstack/airship-drydock
subpath: charts/drydock
reference: 246775da422db523304a5d27f45bba6c18789d2e
reference: 7b6af1bdc9bdc8e8084dd825598100f9e1db163b
drydock-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 3aeba707e36f36909e51e1cb0a81565ee28e0afa
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: ingress
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: c0c5199fb20335b3e8839163129372059a876ce8
ingress-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -345,17 +345,17 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
keystone:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: keystone
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 8dc986740c83487261efa6540f89d5dbea211f98
keystone-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
maas:
type: git
location: https://git.openstack.org/openstack/airship-maas
@ -365,7 +365,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 3aeba707e36f36909e51e1cb0a81565ee28e0afa
mariadb:
type: git
location: https://git.openstack.org/openstack/openstack-helm
@ -380,42 +380,42 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: memcached
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 8dc986740c83487261efa6540f89d5dbea211f98
memcached-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
rabbitmq:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: rabbitmq
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 61829c0d45afbfe52dcbf15157048a59614aa2d0
rabbitmq-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: aac1c4e8c02680a159235c6097db0ed66cfbe104
shipyard:
type: git
location: https://git.openstack.org/openstack/airship-shipyard
subpath: charts/shipyard
reference: 0341954f0004311ffd07109cbfaa9c3350a9b01b
reference: 165c845e3e7459d2a4892ed4ca910b00675e7561
shipyard-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
tiller:
type: git
location: https://git.openstack.org/openstack/airship-armada
subpath: charts/tiller
reference: 41683606507f4c391ba0d9f5ac932672596db7e2
reference: 0a5b74440c81ac9d7f84cf7b553f21bed01401e6
tiller-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
files:
kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
@ -437,12 +437,12 @@ data:
nova_spiceproxy: &nova_spiceproxy docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3
ceph_daemon: &ceph_daemon docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:v2.8.1
os_barbican: &os_barbican docker.io/kolla/ubuntu-source-barbican-api:3.0.3
os_barbican: &os_barbican docker.io/openstackhelm/barbican:ocata
libvirt: &libvirt docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1
ingress_controller: &ingress_controller quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
ingress_error_pages: &ingress_error_pages gcr.io/google-containers/defaultbackend:1.0
# should probably be moved to https://quay.io/repository/airshipit/
storage_init: &storage_init docker.io/port/ceph-config-helper:v1.10.3
storage_init: &storage_init docker.io/port/ceph-config-helper:v1.10.2
keystone: &ref_keystone
ks_endpoints: *heat
ks_service: *heat
@ -451,14 +451,14 @@ data:
images:
ucp:
armada:
api: quay.io/airshipit/armada:41683606507f4c391ba0d9f5ac932672596db7e2
api: quay.io/airshipit/armada:0a5b74440c81ac9d7f84cf7b553f21bed01401e6
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_endpoints: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
image_repo_sync: docker.io/docker:17.07.0
helm: docker.io/lachlanevenson/k8s-helm:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
helm: docker.io/lachlanevenson/k8s-helm:v2.9.1
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
promenade:
promenade: quay.io/airshipit/promenade:7a06bef72c0bfd799c2353b8213627f6a0826251
ks_user: docker.io/openstackhelm/heat:ocata
@ -467,10 +467,10 @@ data:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
image_repo_sync: docker.io/docker:17.07.0
deckhand:
deckhand: quay.io/airshipit/deckhand:64975c820afa84a9753fb6d71670f3e65e8d9824
deckhand: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
db_init: docker.io/postgres:9.5
db_sync: quay.io/airshipit/deckhand:64975c820afa84a9753fb6d71670f3e65e8d9824
db_sync: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168
ks_endpoints: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
@ -479,23 +479,23 @@ data:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
scripted_test: docker.io/openstackhelm/heat:ocata
db_init: docker.io/openstackhelm/heat:ocata
barbican_db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
barbican_db_sync: docker.io/openstackhelm/barbican:ocata
db_drop: docker.io/openstackhelm/heat:ocata
ks_endpoints: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
barbican_api: docker.io/openstackhelm/barbican:ocata
rabbit_init: docker.io/rabbitmq:3.7-management
divingbell:
divingbell: docker.io/ubuntu:16.04
drydock:
drydock: quay.io/airshipit/drydock:246775da422db523304a5d27f45bba6c18789d2e
drydock: quay.io/airshipit/drydock:7b6af1bdc9bdc8e8084dd825598100f9e1db163b
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_user: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_endpoints: docker.io/openstackhelm/heat:ocata
drydock_db_init: docker.io/postgres:9.5
drydock_db_sync: quay.io/airshipit/drydock:246775da422db523304a5d27f45bba6c18789d2e
drydock_db_sync: quay.io/airshipit/drydock:7b6af1bdc9bdc8e8084dd825598100f9e1db163b
ingress:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
@ -504,14 +504,14 @@ data:
image_repo_sync: docker.io/docker:17.07.0
shipyard:
# should probably point to docker.io/puckel/docker-airflow:xxxxxx
airflow: quay.io/airshipit/airflow:20c27eed6669b72e13a97f6551fb0eee045be8ae
shipyard: quay.io/airshipit/shipyard:20c27eed6669b72e13a97f6551fb0eee045be8ae
airflow: quay.io/airshipit/airflow:165c845e3e7459d2a4892ed4ca910b00675e7561
shipyard: quay.io/airshipit/shipyard:165c845e3e7459d2a4892ed4ca910b00675e7561
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
shipyard_db_init: docker.io/postgres:9.5
shipyard_db_sync: quay.io/airshipit/shipyard:20c27eed6669b72e13a97f6551fb0eee045be8ae
shipyard_db_sync: quay.io/airshipit/shipyard:165c845e3e7459d2a4892ed4ca910b00675e7561
airflow_db_init: docker.io/postgres:9.5
# should probably point to docker.io/puckel/docker-airflow:xxxxxx
airflow_db_sync: quay.io/airshipit/airflow:20c27eed6669b72e13a97f6551fb0eee045be8ae
airflow_db_sync: quay.io/airshipit/airflow:165c845e3e7459d2a4892ed4ca910b00675e7561
ks_user: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_endpoints: docker.io/openstackhelm/heat:ocata
@ -542,7 +542,7 @@ data:
rabbit_init: docker.io/rabbitmq:3.7-management
image_repo_sync: docker.io/docker:17.07.0
tiller:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
mariadb:
mariadb: docker.io/mariadb:10.2.13
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
@ -720,7 +720,7 @@ data:
snapshot_repository: *heat
image_repo_sync: docker.io/docker:17.07.0
fluent_logging:
fluentbit: docker.io/fluent-bit:0.12.14
fluentbit: docker.io/fluent/fluent-bit:0.12.14
fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata
# should be moved to somewhere...
prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
@ -770,15 +770,15 @@ data:
image_repo_sync: docker.io/docker:17.07.0
ceph:
ceph-mon:
fluentbit: docker.io/fluent-bit:0.12.14
fluentbit: docker.io/fluent/fluent-bit:0.12.14
ceph_bootstrap: *ceph_daemon
ceph_config_helper: docker.io/port/ceph-config-helper:v1.10.3
ceph_config_helper: docker.io/port/ceph-config-helper:v1.10.2
ceph_mon: *ceph_daemon
ceph_mon_check: docker.io/port/ceph-config-helper:v1.10.3
ceph_mon_check: docker.io/port/ceph-config-helper:v1.10.2
dep_check: *dep_check
image_repo_sync: docker.io/docker:17.07.0
ceph-osd:
fluentbit: docker.io/fluent-bit:0.12.14
fluentbit: docker.io/fluent/fluent-bit:0.12.14
ceph_osd: *ceph_daemon
ceph_bootstrap: *ceph_daemon
dep_check: *dep_check
@ -786,10 +786,10 @@ data:
ceph-client:
ceph_bootstrap: *ceph_daemon
ceph_cephfs_provisioner: quay.io/external_storage/cephfs-provisioner:v0.1.1
ceph_config_helper: docker.io/port/ceph-config-helper:v1.10.3
ceph_config_helper: docker.io/port/ceph-config-helper:v1.10.2
ceph_mds: *ceph_daemon
ceph_mgr: *ceph_daemon
ceph_rbd_pool: docker.io/port/ceph-config-helper:v1.10.3
ceph_rbd_pool: docker.io/port/ceph-config-helper:v1.10.2
ceph_rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1
ceph_rgw: *ceph_daemon
dep_check: *dep_check

16
site/airship-seaworthy/networks/physical/networks.yaml

@ -106,6 +106,11 @@ data:
# NEWSITE-CHANGEME: Update with the site's PXE network CIDR
# NOTE: The CIDR minimum size = (number of nodes * 2) + 10
cidr: 10.23.20.0/24
routes:
- subnet: 0.0.0.0/0
# NEWSITE-CHANGEME: Set the OAM network gateway IP address
gateway: 10.23.20.1
metric: 100
# NOTE: The first 10 IPs in the subnet are reserved for network infrastructure.
# The remainder of the range is divided between two subnets of equal size:
# one static, and one DHCP.
@ -129,12 +134,21 @@ data:
- type: dhcp
start: 10.23.20.121
end: 10.23.20.131
dns:
# NEWSITE-CHANGEME: FQDN for bare metal nodes.
# Choose FQDN according to the node FQDN naming conventions at the top of
# this document.
domain: airship-seaworthy.atlantafoundry.com
# List of upstream DNS forwards. Verify you can reach them from your
# environment. If so, you should not need to change them.
# TODO: This should be populated via substitution from common-addresses
servers: '8.8.8.8,8.8.4.4,208.67.222.222'
...
---
schema: 'drydock/NetworkLink/v1'
metadata:
schema: 'metadata/Document/v1'
name: gp
name: data
layeringDefinition:
abstract: false
layer: site

30
site/airship-seaworthy/pki/pki-catalog.yaml

@ -84,20 +84,20 @@ data:
- 10.23.22.14
groups:
- system:nodes
- document_name: kubelet-cab23-r720-15
common_name: system:node:cab23-r720-15
- document_name: kubelet-cab23-r720-17
common_name: system:node:cab23-r720-17
hosts:
- cab23-r720-15
- 10.23.21.15
- 10.23.22.15
- cab23-r720-17
- 10.23.21.17
- 10.23.22.17
groups:
- system:nodes
- document_name: kubelet-cab23-r720-16
common_name: system:node:cab23-r720-16
- document_name: kubelet-cab23-r720-19
common_name: system:node:cab23-r720-19
hosts:
- cab23-r720-16
- 10.23.21.16
- 10.23.22.16
- cab23-r720-19
- 10.23.21.19
- 10.23.22.19
groups:
- system:nodes
# End node list
@ -153,6 +153,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-11
common_name: kubernetes-etcd-cab23-r720-11
hosts:
@ -162,6 +163,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-12
common_name: kubernetes-etcd-cab23-r720-12
hosts:
@ -171,6 +173,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-13
common_name: kubernetes-etcd-cab23-r720-13
hosts:
@ -180,6 +183,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-14
common_name: kubernetes-etcd-cab23-r720-14
hosts:
@ -189,6 +193,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
# End node list
kubernetes-etcd-peer:
certificates:
@ -203,6 +208,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-11-peer
common_name: kubernetes-etcd-cab23-r720-11-peer
hosts:
@ -212,6 +218,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-12-peer
common_name: kubernetes-etcd-cab23-r720-12-peer
hosts:
@ -221,6 +228,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-13-peer
common_name: kubernetes-etcd-cab23-r720-13-peer
hosts:
@ -230,6 +238,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-14-peer
common_name: kubernetes-etcd-cab23-r720-14-peer
hosts:
@ -239,6 +248,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
# End node list
calico-etcd:
description: Certificates for Calico etcd client traffic

69
site/airship-seaworthy/profiles/host/cp_r720.yaml

@ -33,7 +33,7 @@ data:
networks:
- pxe
bond0:
device_link: gp
device_link: data
slaves:
- enp67s0f0
- enp67s0f1
@ -71,7 +71,7 @@ data:
fstype: 'ext4'
mount_options: 'defaults'
- name: 'var'
size: '>300g'
size: '>100g'
filesystem:
mountpoint: '/var'
fstype: 'ext4'
@ -79,7 +79,7 @@ data:
sdb:
partitions:
- name: 'cephj'
size: '>100g'
size: '100g'
filesystem:
mountpoint: '/var/lib/ceph/cp'
fstype: 'xfs'
@ -110,6 +110,8 @@ metadata:
path: .interfaces
- method: replace
path: .storage
- method: replace
path: .metadata.owner_data
- method: merge
path: .
data:
@ -125,7 +127,7 @@ data:
networks:
- pxe
bond0:
device_link: gp
device_link: data
slaves:
- enp67s0f0
- enp67s0f1
@ -163,7 +165,7 @@ data:
fstype: 'ext4'
mount_options: 'defaults'
- name: 'var'
size: '>300g'
size: '>100g'
filesystem:
mountpoint: '/var'
fstype: 'ext4'
@ -171,7 +173,7 @@ data:
sdb:
partitions:
- name: 'cephj'
size: '>100g'
size: '100g'
filesystem:
mountpoint: '/var/lib/ceph/cp'
fstype: 'xfs'
@ -184,5 +186,58 @@ data: