airship
/
treasuremap
Code Issues Proposed changes

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
This commit is contained in:
Kaspars Skels 2018-08-16 15:20:23 -05:00
parent cf1f2af877
commit dcf54d4cf7
44 changed files with 2100 additions and 1987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -106,6 +106,11 @@ data:
# NEWSITE-CHANGEME: Update with the site's PXE network CIDR # NEWSITE-CHANGEME: Update with the site's PXE network CIDR
# NOTE: The CIDR minimum size = (number of nodes * 2) + 10 # NOTE: The CIDR minimum size = (number of nodes * 2) + 10
cidr: 10.23.20.0/24 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. # 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: # The remainder of the range is divided between two subnets of equal size:
# one static, and one DHCP. # one static, and one DHCP.
@ -129,12 +134,21 @@ data:
- type: dhcp - type: dhcp
start: 10.23.20.121 start: 10.23.20.121
end: 10.23.20.131 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' schema: 'drydock/NetworkLink/v1'
metadata: metadata:
schema: 'metadata/Document/v1' schema: 'metadata/Document/v1'
name: gp name: data
layeringDefinition: layeringDefinition:
abstract: false abstract: false
layer: site layer: site

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

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

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

@ -33,7 +33,7 @@ data:
networks: networks:
- pxe - pxe
bond0: bond0:
device_link: gp device_link: data
slaves: slaves:
- enp67s0f0 - enp67s0f0
- enp67s0f1 - enp67s0f1
@ -71,7 +71,7 @@ data:
fstype: 'ext4' fstype: 'ext4'
mount_options: 'defaults' mount_options: 'defaults'
- name: 'var' - name: 'var'
size: '>300g' size: '>100g'
filesystem: filesystem:
mountpoint: '/var' mountpoint: '/var'
fstype: 'ext4' fstype: 'ext4'
@ -79,7 +79,7 @@ data:
sdb: sdb:
partitions: partitions:
- name: 'cephj' - name: 'cephj'
size: '>100g' size: '100g'
filesystem: filesystem:
mountpoint: '/var/lib/ceph/cp' mountpoint: '/var/lib/ceph/cp'
fstype: 'xfs' fstype: 'xfs'
@ -110,6 +110,8 @@ metadata:
path: .interfaces path: .interfaces
- method: replace - method: replace
path: .storage path: .storage
- method: replace
path: .metadata.owner_data
- method: merge - method: merge
path: . path: .
data: data:
@ -125,7 +127,7 @@ data:
networks: networks:
- pxe - pxe
bond0: bond0:
device_link: gp device_link: data
slaves: slaves:
- enp67s0f0 - enp67s0f0
- enp67s0f1 - enp67s0f1
@ -163,7 +165,7 @@ data:
fstype: 'ext4' fstype: 'ext4'
mount_options: 'defaults' mount_options: 'defaults'
- name: 'var' - name: 'var'
size: '>300g' size: '>100g'
filesystem: filesystem:
mountpoint: '/var' mountpoint: '/var'
fstype: 'ext4' fstype: 'ext4'
@ -171,7 +173,7 @@ data:
sdb: sdb:
partitions: partitions:
- name: 'cephj' - name: 'cephj'
size: '>100g' size: '100g'
filesystem: filesystem:
mountpoint: '/var/lib/ceph/cp' mountpoint: '/var/lib/ceph/cp'
fstype: 'xfs' fstype: 'xfs'
@ -184,5 +186,58 @@ data:
metadata: metadata:
owner_data: owner_data:
openstack-l3-agent: enabled control-plane: enabled
ucp-control-plane: enabled
openstack-control-plane: enabled
openstack-heat: enabled
openstack-keystone: enabled
openstack-rabbitmq: enabled
openstack-dns-helper: enabled
openstack-mariadb: enabled
openstack-nova-control: enabled
# openstack-etcd: enabled
openstack-mistral: enabled
openstack-memcached: enabled
openstack-glance: enabled
openstack-horizon: enabled
openstack-cinder-control: enabled
openstack-cinder-volume: control
openstack-neutron: enabled
openvswitch: enabled
ucp-barbican: enabled
ceph-bootstrap: enabled
# ceph-mon: enabled
ceph-mgr: enabled
ceph-osd: enabled
ceph-mds: enabled
ceph-rgw: enabled
ucp-maas: enabled
kube-dns: enabled
kubernetes-apiserver: enabled
kubernetes-controller-manager: enabled
# kubernetes-etcd: enabled
kubernetes-scheduler: enabled
tiller-helm: enabled
# kube-etcd: enabled
calico-policy: enabled
calico-node: enabled
# calico-etcd: enabled
ucp-armada: enabled
ucp-drydock: enabled
ucp-deckhand: enabled
ucp-shipyard: enabled
IAM: enabled
ucp-promenade: enabled
prometheus-server: enabled
prometheus-client: enabled
fluentd: enabled
influxdb: enabled
kibana: enabled
elasticsearch-client: enabled
elasticsearch-master: enabled
elasticsearch-data: enabled
postgresql: enabled
kube-ingress: enabled
beta.kubernetes.io/fluentd-ds-ready: 'true'
node-exporter: enabled
... ...

6
site/airship-seaworthy/profiles/host/dp_r720.yaml
View File

@ -32,7 +32,7 @@ data:
networks: networks:
- pxe - pxe
bond0: bond0:
device_link: gp device_link: data
slaves: slaves:
- enp67s0f0 - enp67s0f0
- enp67s0f1 - enp67s0f1
@ -70,7 +70,7 @@ data:
fstype: 'ext4' fstype: 'ext4'
mount_options: 'defaults' mount_options: 'defaults'
- name: 'var' - name: 'var'
size: '>300g' size: '>100g'
filesystem: filesystem:
mountpoint: '/var' mountpoint: '/var'
fstype: 'ext4' fstype: 'ext4'
@ -78,7 +78,7 @@ data:
sdb: sdb:
partitions: partitions:
- name: 'nova' - name: 'nova'
size: '>100g' size: '99%'
filesystem: filesystem:
mountpoint: '/var/lib/nova' mountpoint: '/var/lib/nova'
fstype: 'ext4' fstype: 'ext4'

3414
site/airship-seaworthy/secrets/certificates/certificates.yaml
View File

File diff suppressed because it is too large Load Diff

16
site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml Normal file
View File

@ -0,0 +1,16 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: elasticsearch
layeringDefinition:
abstract: false
layer: site
parentSelector:
hosttype: elasticsearch-global
actions:
- method: merge
path: .
storagePolicy: cleartext
data: {}
...

16
site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml Normal file
View File

@ -0,0 +1,16 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: fluent-logging
layeringDefinition:
abstract: false
layer: site
parentSelector:
hosttype: fluent-logging-global
actions:
- method: merge
path: .
storagePolicy: cleartext
data: {}
...

230
site/airship-seaworthy/software/config/endpoints.yaml
View File

@ -10,107 +10,107 @@ metadata:
abstract: false abstract: false
layer: site layer: site
storagePolicy: cleartext storagePolicy: cleartext
substitutions: # substitutions:
- src: # - src:
schema: pegleg/CommonAddresses/v1 # schema: pegleg/CommonAddresses/v1
name: common-addresses # name: common-addresses
path: .dns.ingress_domain # path: .dns.ingress_domain
dest: # dest:
path: .ucp.identity.host_fqdn_override.public.host # path: .ucp.identity.host_fqdn_override.public.host
pattern: DOMAIN # pattern: DOMAIN
- src: # - src:
schema: pegleg/CommonAddresses/v1 # schema: pegleg/CommonAddresses/v1
name: common-addresses # name: common-addresses
path: .dns.ingress_domain # path: .dns.ingress_domain
dest: # dest:
path: .ucp.shipyard.host_fqdn_override.public.host # path: .ucp.shipyard.host_fqdn_override.public.host
pattern: DOMAIN # pattern: DOMAIN
- src: # - src:
schema: pegleg/CommonAddresses/v1 # schema: pegleg/CommonAddresses/v1
name: common-addresses # name: common-addresses
path: .dns.ingress_domain # path: .dns.ingress_domain
dest: # dest:
path: .ceph.object_store.host_fqdn_override.public.host # path: .ceph.object_store.host_fqdn_override.public.host
pattern: DOMAIN # pattern: DOMAIN
- src: # - src:
schema: pegleg/CommonAddresses/v1 # schema: pegleg/CommonAddresses/v1
name: common-addresses # name: common-addresses
path: .dns.ingress_domain # path: .dns.ingress_domain
dest: # dest:
path: .ceph.ceph_object_store.host_fqdn_override.public.host # path: .ceph.ceph_object_store.host_fqdn_override.public.host
pattern: DOMAIN # pattern: DOMAIN
- src: # - src:
schema: deckhand/Certificate/v1 # schema: deckhand/Certificate/v1
name: ingress-crt # name: ingress-crt
path: . # path: .
dest: # dest:
path: .ceph.object_store.host_fqdn_override.public.tls.crt # path: .ceph.object_store.host_fqdn_override.public.tls.crt
- src: # - src:
schema: deckhand/CertificateAuthority/v1 # schema: deckhand/CertificateAuthority/v1
name: ingress-ca # name: ingress-ca
path: . # path: .
dest: # dest:
path: .ceph.object_store.host_fqdn_override.public.tls.ca # path: .ceph.object_store.host_fqdn_override.public.tls.ca
- src: # - src:
schema: deckhand/CertificateKey/v1 # schema: deckhand/CertificateKey/v1
name: ingress-key # name: ingress-key
path: . # path: .
dest: # dest:
path: .ceph.object_store.host_fqdn_override.public.tls.key # path: .ceph.object_store.host_fqdn_override.public.tls.key
- src: # - src:
schema: deckhand/Certificate/v1 # schema: deckhand/Certificate/v1
name: ingress-crt # name: ingress-crt
path: . # path: .
dest: # dest:
path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt # path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt
- src: # - src:
schema: deckhand/CertificateAuthority/v1 # schema: deckhand/CertificateAuthority/v1
name: ingress-ca # name: ingress-ca
path: . # path: .
dest: # dest:
path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca # path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca
- src: # - src:
schema: deckhand/CertificateKey/v1 # schema: deckhand/CertificateKey/v1
name: ingress-key # name: ingress-key
path: . # path: .
dest: # dest:
path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key # path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key
- src: # - src:
schema: deckhand/Certificate/v1 # schema: deckhand/Certificate/v1
name: ingress-crt # name: ingress-crt
path: . # path: .
dest: # dest:
path: .ucp.identity.host_fqdn_override.public.tls.crt # path: .ucp.identity.host_fqdn_override.public.tls.crt
- src: # - src:
schema: deckhand/CertificateAuthority/v1 # schema: deckhand/CertificateAuthority/v1
name: ingress-ca # name: ingress-ca
path: . # path: .
dest: # dest:
path: .ucp.identity.host_fqdn_override.public.tls.ca # path: .ucp.identity.host_fqdn_override.public.tls.ca
- src: # - src:
schema: deckhand/CertificateKey/v1 # schema: deckhand/CertificateKey/v1
name: ingress-key # name: ingress-key
path: . # path: .
dest: # dest:
path: .ucp.identity.host_fqdn_override.public.tls.key # path: .ucp.identity.host_fqdn_override.public.tls.key
- src: # - src:
schema: deckhand/Certificate/v1 # schema: deckhand/Certificate/v1
name: ingress-crt # name: ingress-crt
path: . # path: .
dest: # dest:
path: .ucp.shipyard.host_fqdn_override.public.tls.crt # path: .ucp.shipyard.host_fqdn_override.public.tls.crt
- src: # - src:
schema: deckhand/CertificateAuthority/v1 # schema: deckhand/CertificateAuthority/v1
name: ingress-ca # name: ingress-ca
path: . # path: .
dest: # dest:
path: .ucp.shipyard.host_fqdn_override.public.tls.ca # path: .ucp.shipyard.host_fqdn_override.public.tls.ca
- src: # - src:
schema: deckhand/CertificateKey/v1 # schema: deckhand/CertificateKey/v1
name: ingress-key # name: ingress-key
path: . # path: .
dest: # dest:
path: .ucp.shipyard.host_fqdn_override.public.tls.key # path: .ucp.shipyard.host_fqdn_override.public.tls.key
data: data:
ucp: ucp:
identity: identity:
@ -121,19 +121,19 @@ data:
public: keystone public: keystone
host_fqdn_override: host_fqdn_override:
default: null default: null
public: # public:
host: iam.DOMAIN # host: iam.DOMAIN
path: path:
default: /v3 default: /v3
scheme: scheme:
default: http default: http
public: https # public: https
port: port:
admin: admin:
default: 35357 default: 35357
api: api:
default: 80 default: 80
public: 443 public: 80
armada: armada:
name: armada name: armada
hosts: hosts:
@ -281,16 +281,16 @@ data:
port: port:
api: api:
default: 9000 default: 9000
public: 443 public: 80
path: path:
default: /api/v1.0 default: /api/v1.0
scheme: scheme:
default: http default: http
public: https # public: https
host_fqdn_override: host_fqdn_override:
default: null default: null
public: # public:
host: shipyard.DOMAIN # host: shipyard.DOMAIN
airflow_web: airflow_web:
name: airflow-web name: airflow-web
hosts: hosts:
@ -327,8 +327,8 @@ data:
public: radosgw public: radosgw
host_fqdn_override: host_fqdn_override:
default: null default: null
public: # public:
host: object-store.DOMAIN # host: object-store.DOMAIN
path: path:
default: /swift/v1 default: /swift/v1
scheme: scheme:
@ -337,7 +337,7 @@ data:
port: port:
api: api:
default: 8088 default: 8088
public: 443 # public: 443
ceph_object_store: ceph_object_store:
name: radosgw name: radosgw
namespace: ceph namespace: ceph
@ -346,8 +346,8 @@ data:
public: radosgw public: radosgw
host_fqdn_override: host_fqdn_override:
default: null default: null
public: # public:
host: object-store.DOMAIN # host: object-store.DOMAIN
path: path:
default: /auth/v1.0 default: /auth/v1.0
scheme: scheme:
@ -356,7 +356,7 @@ data:
port: port:
api: api:
default: 8088 default: 8088
public: 443 # public: 443
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
hosts: hosts:

16
site/airship-seaworthy/software/config/service_accounts.yaml
View File

@ -24,7 +24,7 @@ data:
keystone: keystone:
admin: admin:
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
username: admin username: admin
project_name: admin project_name: admin
user_domain_name: default user_domain_name: default
@ -40,7 +40,7 @@ data:
promenade: promenade:
keystone: keystone:
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
role: admin role: admin
project_name: service project_name: service
project_domain_name: default project_domain_name: default
@ -49,7 +49,7 @@ data:
drydock: drydock:
keystone: keystone:
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
role: admin role: admin
project_name: service project_name: service
project_domain_name: default project_domain_name: default
@ -61,7 +61,7 @@ data:
shipyard: shipyard:
keystone: keystone:
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
role: admin role: admin
project_name: service project_name: service
project_domain_name: default project_domain_name: default
@ -86,7 +86,7 @@ data:
barbican: barbican:
keystone: keystone:
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
role: admin role: admin
project_name: service project_name: service
project_domain_name: default project_domain_name: default
@ -106,14 +106,14 @@ data:
user_domain_name: default user_domain_name: default
project_name: service project_name: service
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
role: admin role: admin
user_domain_name: default user_domain_name: default
username: armada username: armada
deckhand: deckhand:
keystone: keystone:
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
role: admin role: admin
project_name: service project_name: service
project_domain_name: default project_domain_name: default
@ -127,7 +127,7 @@ data:
keystone: keystone:
role: admin role: admin
# NEWSITE-CHANGEME: Replace with the site name # NEWSITE-CHANGEME: Replace with the site name
region_name: airship-seaworthy region_name: RegionOne
username: swift username: swift
project_name: service project_name: service
user_domain_name: default user_domain_name: default

36
site/airship-seaworthy/software/manifests/full-site.yaml
View File

@ -35,22 +35,22 @@ data:
- ucp-drydock - ucp-drydock
- ucp-promenade - ucp-promenade
- ucp-shipyard - ucp-shipyard
- osh-infra-ingress-controller # - osh-infra-ingress-controller
- osh-infra-ceph-config # - osh-infra-ceph-config
- osh-infra-logging # - osh-infra-logging
- osh-infra-monitoring # - osh-infra-monitoring
- osh-infra-mariadb # - osh-infra-mariadb
- osh-infra-dashboards # - osh-infra-dashboards
- openstack-ingress-controller # - openstack-ingress-controller
- openstack-ceph-config # - openstack-ceph-config
- openstack-mariadb # - openstack-mariadb
- openstack-memcached # - openstack-memcached
- openstack-keystone # - openstack-keystone
- openstack-radosgw # - openstack-radosgw
- openstack-glance # - openstack-glance
- openstack-cinder # - openstack-cinder
- openstack-compute-kit # - openstack-compute-kit
- openstack-heat # - openstack-heat
- osh-infra-prometheus-openstack-exporter # - osh-infra-prometheus-openstack-exporter
- openstack-horizon # - openstack-horizon
... ...