diff --git a/global/profiles/genesis.yaml b/global/profiles/genesis.yaml index 589711c2e..e16b0758a 100644 --- a/global/profiles/genesis.yaml +++ b/global/profiles/genesis.yaml @@ -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 diff --git a/global/profiles/host/cp.yaml b/global/profiles/host/cp.yaml index 666b6a4d9..b1ad42744 100644 --- a/global/profiles/host/cp.yaml +++ b/global/profiles/host/cp.yaml @@ -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 diff --git a/global/software/charts/ucp/drydock/maas.yaml b/global/software/charts/ucp/drydock/maas.yaml index 45a53044f..437e0ff11 100644 --- a/global/software/charts/ucp/drydock/maas.yaml +++ b/global/software/charts/ucp/drydock/maas.yaml @@ -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 diff --git a/global/software/manifests/full-site.yaml b/global/software/manifests/full-site.yaml index 13574b599..1d4730f8b 100644 --- a/global/software/manifests/full-site.yaml +++ b/global/software/manifests/full-site.yaml @@ -27,7 +27,7 @@ data: - ucp-divingbell - ucp-armada - ucp-deckhand - - ucp-drydock + - ucp-drydock-scaled - ucp-promenade - ucp-shipyard - ucp-prometheus-openstack-exporter diff --git a/site/airship-seaworthy/networks/common-addresses.yaml b/site/airship-seaworthy/networks/common-addresses.yaml index 9aec47fd8..15a7b5add 100644 --- a/site/airship-seaworthy/networks/common-addresses.yaml +++ b/site/airship-seaworthy/networks/common-addresses.yaml @@ -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 diff --git a/site/airship-seaworthy/profiles/genesis.yaml b/site/airship-seaworthy/profiles/genesis.yaml index d40e41a1b..54c527687 100644 --- a/site/airship-seaworthy/profiles/genesis.yaml +++ b/site/airship-seaworthy/profiles/genesis.yaml @@ -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 diff --git a/site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml b/site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml index 8cd096908..be619535e 100644 --- a/site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml +++ b/site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml @@ -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' ... diff --git a/site/airskiff/profiles/genesis.yaml b/site/airskiff/profiles/genesis.yaml index abb3cb17d..0b9ca7479 100644 --- a/site/airskiff/profiles/genesis.yaml +++ b/site/airskiff/profiles/genesis.yaml @@ -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 diff --git a/site/airsloop/profiles/genesis.yaml b/site/airsloop/profiles/genesis.yaml index 3e4663e29..5947feb92 100644 --- a/site/airsloop/profiles/genesis.yaml +++ b/site/airsloop/profiles/genesis.yaml @@ -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 diff --git a/type/foundry/charts/ucp/comps/chart-group.yaml b/type/foundry/charts/ucp/comps/chart-group.yaml new file mode 100644 index 000000000..02236b539 --- /dev/null +++ b/type/foundry/charts/ucp/comps/chart-group.yaml @@ -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 diff --git a/type/foundry/charts/ucp/comps/maas-scaled.yaml b/type/foundry/charts/ucp/comps/maas-scaled.yaml new file mode 100644 index 000000000..6e7b7925b --- /dev/null +++ b/type/foundry/charts/ucp/comps/maas-scaled.yaml @@ -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 +... diff --git a/site/airship-seaworthy/software/charts/ucp/drydock/maas.yaml b/type/foundry/charts/ucp/comps/maas.yaml similarity index 57% rename from site/airship-seaworthy/software/charts/ucp/drydock/maas.yaml rename to type/foundry/charts/ucp/comps/maas.yaml index fe165ecb4..71ebffad4 100644 --- a/site/airship-seaworthy/software/charts/ucp/drydock/maas.yaml +++ b/type/foundry/charts/ucp/comps/maas.yaml @@ -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: {} ... diff --git a/type/sloop/charts/ucp/comps/maas.yaml b/type/sloop/charts/ucp/comps/maas.yaml index 513ae3b9f..a1aeeb39d 100644 --- a/type/sloop/charts/ucp/comps/maas.yaml +++ b/type/sloop/charts/ucp/comps/maas.yaml @@ -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