Browse Source

Fixes to MAAS HA and follow-up to comments

Change-Id: I571a0e3bc8355e0ac398175373df40334ebcd1af
tags/v1.0
Kaspars Skels 1 year ago
parent
commit
b54d64f797
13 changed files with 81 additions and 32 deletions
  1. +2
    -1
      global/profiles/genesis.yaml
  2. +2
    -1
      global/profiles/host/cp.yaml
  3. +6
    -6
      global/software/charts/ucp/drydock/maas.yaml
  4. +1
    -1
      global/software/manifests/full-site.yaml
  5. +4
    -2
      site/airship-seaworthy/networks/common-addresses.yaml
  6. +2
    -1
      site/airship-seaworthy/profiles/genesis.yaml
  7. +7
    -1
      site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml
  8. +2
    -1
      site/airskiff/profiles/genesis.yaml
  9. +2
    -1
      site/airsloop/profiles/genesis.yaml
  10. +14
    -0
      type/foundry/charts/ucp/comps/chart-group.yaml
  11. +28
    -0
      type/foundry/charts/ucp/comps/maas-scaled.yaml
  12. +9
    -12
      type/foundry/charts/ucp/comps/maas.yaml
  13. +2
    -5
      type/sloop/charts/ucp/comps/maas.yaml

+ 2
- 1
global/profiles/genesis.yaml View File

@@ -111,7 +111,8 @@ data:
- kubernetes-scheduler=enabled
- promenade-genesis=enabled
- ucp-control-plane=enabled
- maas-control-plane=enabled
- maas-rack=enabled
- maas-region=enabled
- node-exporter=enabled
files:
- path: /var/lib/anchor/calico-etcd-bootstrap


+ 2
- 1
global/profiles/host/cp.yaml View File

@@ -82,7 +82,8 @@ data:
tenant-ceph-mon: enabled
tenant-ceph-rgw: enabled
tenant-ceph-mgr: enabled
ucp-maas: enabled
maas-rack: enabled
maas-region: enabled
kube-dns: enabled
kubernetes-apiserver: enabled
kubernetes-controller-manager: enabled


+ 6
- 6
global/software/charts/ucp/drydock/maas.yaml View File

@@ -141,15 +141,11 @@ data:
rack: 1
labels:
rack:
node_selector_key: maas-control-plane
node_selector_key: maas-rack
node_selector_value: enabled
region:
node_selector_key: maas-control-plane
node_selector_key: maas-region
node_selector_value: enabled
network:
proxy:
node_port:
enabled: true
jobs:
import_boot_resources:
timeout: 1800
@@ -158,6 +154,10 @@ data:
cache:
enabled: true
maas:
images:
default_os: 'ubuntu'
default_image: 'xenial'
default_kernel: 'hwe-16.04'
credentials:
secret:
namespace: ucp


+ 1
- 1
global/software/manifests/full-site.yaml View File

@@ -27,7 +27,7 @@ data:
- ucp-divingbell
- ucp-armada
- ucp-deckhand
- ucp-drydock
- ucp-drydock-scaled
- ucp-promenade
- ucp-shipyard
- ucp-prometheus-openstack-exporter


+ 4
- 2
site/airship-seaworthy/networks/common-addresses.yaml View File

@@ -22,12 +22,14 @@ data:
# network. E.g. VLAN 22 for the calico network as a member of bond0, you
# would set "interface=bond0.22" as shown here.
ip_autodetection_method: interface=bond0.22
ip_rule:
gateway: '10.23.21.1'
etcd:
# etcd service IP address
service_ip: 10.96.232.136

vip:
ingress_vip: '10.23.21.20/32'
maas_vip: '10.23.20.9/32'

dns:
# Kubernetes cluster domain. Do not change. This is internal to the cluster.
cluster_domain: cluster.local


+ 2
- 1
site/airship-seaworthy/profiles/genesis.yaml View File

@@ -39,7 +39,8 @@ data:
- kubernetes-scheduler=enabled
- promenade-genesis=enabled
- ucp-control-plane=enabled
- maas-control-plane=enabled
- maas-rack=enabled
- maas-region=enabled
- ceph-osd-bootstrap=enabled
- openstack-control-plane=enabled
- openvswitch=enabled


+ 7
- 1
site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml View File

@@ -14,6 +14,13 @@ metadata:
- method: merge
path: .
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .vip.ingress_vip
dest:
path: .values.network.vip.addr
data:
values:
network:
@@ -21,5 +28,4 @@ data:
disable-ipv6: "true"
vip:
manage: true
addr: '10.23.21.20/32'
...

+ 2
- 1
site/airskiff/profiles/genesis.yaml View File

@@ -41,7 +41,8 @@ data:
- kubernetes-scheduler=enabled
- promenade-genesis=enabled
- ucp-control-plane=enabled
- maas-control-plane=enabled
- maas-rack=enabled
- maas-region=enabled
- ceph-osd-bootstrap=enabled
- openstack-control-plane=enabled
- openvswitch=enabled


+ 2
- 1
site/airsloop/profiles/genesis.yaml View File

@@ -39,7 +39,8 @@ data:
- kubernetes-scheduler=enabled
- promenade-genesis=enabled
- ucp-control-plane=enabled
- maas-control-plane=enabled
- maas-rack=enabled
- maas-region=enabled
- ceph-osd-bootstrap=enabled
- openstack-control-plane=enabled
- openvswitch=enabled


+ 14
- 0
type/foundry/charts/ucp/comps/chart-group.yaml View File

@@ -0,0 +1,14 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: ucp-drydock-scaled
layeringDefinition:
abstract: false
layer: type
storagePolicy: cleartext
data:
description: Drydock
chart_group:
- ucp-maas-scaled
- ucp-drydock

+ 28
- 0
type/foundry/charts/ucp/comps/maas-scaled.yaml View File

@@ -0,0 +1,28 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-maas-scaled
layeringDefinition:
abstract: false
layer: type
parentSelector:
name: ucp-maas-global
actions:
- method: merge
path: .
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .vip.maas_vip
dest:
path: .values.network.maas_ingress.addr
data:
values:
pod:
replicas:
region: 2
rack: 2
...

site/airship-seaworthy/software/charts/ucp/drydock/maas.yaml → type/foundry/charts/ucp/comps/maas.yaml View File

@@ -6,22 +6,19 @@ metadata:
name: ucp-maas
layeringDefinition:
abstract: false
layer: site
layer: type
parentSelector:
name: ucp-maas-global
actions:
- method: merge
path: .
storagePolicy: cleartext
data:
values:
conf:
maas:
images:
default_os: 'ubuntu'
default_image: 'xenial'
default_kernel: 'hwe-16.04'
network:
maas_ingress:
addr: '10.23.20.9/32'
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .vip.maas_vip
dest:
path: .values.network.maas_ingress.addr
data: {}
...

+ 2
- 5
type/sloop/charts/ucp/comps/maas.yaml View File

@@ -74,16 +74,13 @@ data:
enabled: true

conf:
drydock:
bootaction_url: http://DRYDOCK_IP:DRYDOCK_PORT/api/v1.0
maas:
images:
default_os: 'ubuntu'
default_image: 'xenial'
default_kernel: 'ga-16.04'
cache:
enabled: true
drydock:
bootaction_url: http://DRYDOCK_IP:DRYDOCK_PORT/api/v1.0
maas:
credentials:
secret:
namespace: ucp


Loading…
Cancel
Save