Merge "Support maas mobility"
This commit is contained in:
commit
8695f97b83
|
@ -56,13 +56,6 @@ metadata:
|
||||||
dest:
|
dest:
|
||||||
path: .values.conf.coredns.corefile
|
path: .values.conf.coredns.corefile
|
||||||
pattern: 'UPSTREAM1'
|
pattern: 'UPSTREAM1'
|
||||||
- src:
|
|
||||||
schema: pegleg/CommonAddresses/v1
|
|
||||||
name: common-addresses
|
|
||||||
path: .dns.upstream_servers[1]
|
|
||||||
dest:
|
|
||||||
path: .values.conf.coredns.corefile
|
|
||||||
pattern: 'UPSTREAM2'
|
|
||||||
data:
|
data:
|
||||||
chart_name: coredns
|
chart_name: coredns
|
||||||
release: coredns
|
release: coredns
|
||||||
|
@ -95,11 +88,9 @@ data:
|
||||||
pods insecure
|
pods insecure
|
||||||
fallthrough in-addr.arpa ip6.arpa
|
fallthrough in-addr.arpa ip6.arpa
|
||||||
upstream UPSTREAM1
|
upstream UPSTREAM1
|
||||||
upstream UPSTREAM2
|
|
||||||
}
|
}
|
||||||
prometheus :9153
|
prometheus :9153
|
||||||
proxy . UPSTREAM1
|
proxy . UPSTREAM1
|
||||||
proxy . UPSTREAM2
|
|
||||||
cache 30
|
cache 30
|
||||||
}
|
}
|
||||||
dependencies:
|
dependencies:
|
||||||
|
|
|
@ -6,6 +6,8 @@ metadata:
|
||||||
layeringDefinition:
|
layeringDefinition:
|
||||||
abstract: false
|
abstract: false
|
||||||
layer: global
|
layer: global
|
||||||
|
labels:
|
||||||
|
name: ingress-kube-system
|
||||||
storagePolicy: cleartext
|
storagePolicy: cleartext
|
||||||
substitutions:
|
substitutions:
|
||||||
# Chart source
|
# Chart source
|
||||||
|
@ -50,7 +52,7 @@ data:
|
||||||
nginx.ingress.kubernetes.io/proxy-read-timeout: "603"
|
nginx.ingress.kubernetes.io/proxy-read-timeout: "603"
|
||||||
pod:
|
pod:
|
||||||
replicas:
|
replicas:
|
||||||
error_page: 2
|
error_page: 1
|
||||||
dependencies:
|
dependencies:
|
||||||
- ingress-kube-system-htk
|
- ingress-kube-system-htk
|
||||||
---
|
---
|
||||||
|
|
|
@ -7,6 +7,8 @@ metadata:
|
||||||
abstract: false
|
abstract: false
|
||||||
layer: global
|
layer: global
|
||||||
storagePolicy: cleartext
|
storagePolicy: cleartext
|
||||||
|
labels:
|
||||||
|
name: ucp-ingress
|
||||||
substitutions:
|
substitutions:
|
||||||
# Chart source
|
# Chart source
|
||||||
- src:
|
- src:
|
||||||
|
|
|
@ -62,23 +62,6 @@ metadata:
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.physicalprovisioner.port.api.nodeport
|
path: .values.endpoints.physicalprovisioner.port.api.nodeport
|
||||||
|
|
||||||
# MaaS IPs
|
|
||||||
- src:
|
|
||||||
schema: pegleg/CommonAddresses/v1
|
|
||||||
name: common-addresses
|
|
||||||
# TODO(mb874d): Can change once we have an accessible VIP from fresh nodes.
|
|
||||||
path: .genesis.ip
|
|
||||||
dest:
|
|
||||||
path: .values.conf.drydock.maasdriver.maas_api_url
|
|
||||||
pattern: 'MAAS_IP'
|
|
||||||
- src:
|
|
||||||
schema: pegleg/CommonAddresses/v1
|
|
||||||
name: common-addresses
|
|
||||||
path: .node_ports.maas_api
|
|
||||||
dest:
|
|
||||||
path: .values.conf.drydock.maasdriver.maas_api_url
|
|
||||||
pattern: 'MAAS_PORT'
|
|
||||||
|
|
||||||
# Credentials
|
# Credentials
|
||||||
|
|
||||||
- src:
|
- src:
|
||||||
|
@ -100,12 +83,18 @@ metadata:
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.postgresql.path
|
path: .values.endpoints.postgresql.path
|
||||||
pattern: DB_NAME
|
pattern: DB_NAME
|
||||||
|
- src:
|
||||||
|
schema: pegleg/AccountCatalogue/v1
|
||||||
|
name: ucp_service_accounts
|
||||||
|
path: .ucp.keystone.admin
|
||||||
|
dest:
|
||||||
|
path: .values.endpoints.identity.auth.admin
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/AccountCatalogue/v1
|
schema: pegleg/AccountCatalogue/v1
|
||||||
name: ucp_service_accounts
|
name: ucp_service_accounts
|
||||||
path: .ucp.drydock.keystone
|
path: .ucp.drydock.keystone
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.identity.auth.user
|
path: .values.endpoints.identity.auth.drydock
|
||||||
|
|
||||||
# Secrets
|
# Secrets
|
||||||
- dest:
|
- dest:
|
||||||
|
@ -121,7 +110,7 @@ metadata:
|
||||||
name: ucp_postgres_admin_password
|
name: ucp_postgres_admin_password
|
||||||
path: .
|
path: .
|
||||||
- dest:
|
- dest:
|
||||||
path: .values.endpoints.identity.auth.user.password
|
path: .values.endpoints.identity.auth.drydock.password
|
||||||
src:
|
src:
|
||||||
schema: deckhand/Passphrase/v1
|
schema: deckhand/Passphrase/v1
|
||||||
name: ucp_drydock_keystone_password
|
name: ucp_drydock_keystone_password
|
||||||
|
|
|
@ -102,9 +102,15 @@ metadata:
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
name: ucp_endpoints
|
name: ucp_endpoints
|
||||||
path: .ucp.maas_region_ui
|
path: .ucp.maas_region
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.maas_region_ui
|
path: .values.endpoints.maas_region
|
||||||
|
- src:
|
||||||
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
|
name: ucp_endpoints
|
||||||
|
path: .ucp.physicalprovisioner
|
||||||
|
dest:
|
||||||
|
path: .values.endpoints.physicalprovisioner
|
||||||
|
|
||||||
# Account and credential substitutions
|
# Account and credential substitutions
|
||||||
- src:
|
- src:
|
||||||
|
@ -131,7 +137,7 @@ metadata:
|
||||||
name: ucp_service_accounts
|
name: ucp_service_accounts
|
||||||
path: .ucp.maas.admin
|
path: .ucp.maas.admin
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.maas_region_ui.auth.admin
|
path: .values.endpoints.maas_region.auth.admin
|
||||||
|
|
||||||
# Secrets
|
# Secrets
|
||||||
- dest:
|
- dest:
|
||||||
|
|
|
@ -11,8 +11,8 @@ data:
|
||||||
description: Airship Services
|
description: Airship Services
|
||||||
sequenced: true
|
sequenced: true
|
||||||
chart_group:
|
chart_group:
|
||||||
- ucp-maas
|
|
||||||
- ucp-tiller
|
- ucp-tiller
|
||||||
|
- ucp-maas
|
||||||
- ucp-armada
|
- ucp-armada
|
||||||
- ucp-barbican
|
- ucp-barbican
|
||||||
- ucp-deckhand
|
- ucp-deckhand
|
||||||
|
|
|
@ -17,6 +17,7 @@ data:
|
||||||
internal: keystone-api
|
internal: keystone-api
|
||||||
host_fqdn_override:
|
host_fqdn_override:
|
||||||
default: null
|
default: null
|
||||||
|
public: keystone.gate.local
|
||||||
path:
|
path:
|
||||||
default: /v3
|
default: /v3
|
||||||
scheme:
|
scheme:
|
||||||
|
@ -119,19 +120,19 @@ data:
|
||||||
api:
|
api:
|
||||||
default: 9000
|
default: 9000
|
||||||
nodeport: 31900
|
nodeport: 31900
|
||||||
|
public: 80
|
||||||
path:
|
path:
|
||||||
default: /api/v1.0
|
default: /api/v1.0
|
||||||
scheme:
|
scheme:
|
||||||
default: http
|
default: http
|
||||||
host_fqdn_override:
|
host_fqdn_override:
|
||||||
default: null
|
default: null
|
||||||
maas_region_ui:
|
public: drydock.gate.local
|
||||||
name: maas-region-ui
|
maas_region:
|
||||||
|
name: maas-region
|
||||||
hosts:
|
hosts:
|
||||||
default: maas-region-ui
|
default: maas-region
|
||||||
public: maas
|
public: maas
|
||||||
path:
|
|
||||||
default: /MAAS
|
|
||||||
scheme:
|
scheme:
|
||||||
default: "http"
|
default: "http"
|
||||||
port:
|
port:
|
||||||
|
@ -168,6 +169,7 @@ data:
|
||||||
default: http
|
default: http
|
||||||
host_fqdn_override:
|
host_fqdn_override:
|
||||||
default: null
|
default: null
|
||||||
|
public: shipyard.gate.local
|
||||||
airflow_web:
|
airflow_web:
|
||||||
name: airflow-web
|
name: airflow-web
|
||||||
hosts:
|
hosts:
|
||||||
|
|
|
@ -150,7 +150,6 @@ data:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm
|
location: https://git.openstack.org/openstack/openstack-helm
|
||||||
subpath: ceph
|
subpath: ceph
|
||||||
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
|
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
|
||||||
#TODO Update to new HTK with split ceph charts
|
|
||||||
ceph-htk:
|
ceph-htk:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/openstack-helm
|
location: https://git.openstack.org/openstack/openstack-helm
|
||||||
|
@ -180,14 +179,12 @@ data:
|
||||||
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: f8c821e7219f84f12e3a90e3101c6f20d3049b5b
|
reference: master
|
||||||
# TODO waiting for https://review.openstack.org/#/c/595902/ to move to
|
|
||||||
# openstack-helm-infra version.
|
|
||||||
drydock-htk:
|
drydock-htk:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/openstack-helm
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
subpath: helm-toolkit
|
subpath: helm-toolkit
|
||||||
reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
|
reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
|
||||||
ingress:
|
ingress:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
|
@ -212,7 +209,7 @@ data:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/airship-promenade
|
location: https://git.openstack.org/openstack/airship-promenade
|
||||||
subpath: charts/promenade
|
subpath: charts/promenade
|
||||||
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
|
reference: 24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
|
||||||
promenade-htk:
|
promenade-htk:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
|
@ -232,14 +229,12 @@ data:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/airship-maas
|
location: https://git.openstack.org/openstack/airship-maas
|
||||||
subpath: charts/maas
|
subpath: charts/maas
|
||||||
# TODO(bryan-strassner) set to new version
|
reference: master
|
||||||
# when https://review.openstack.org/#/c/595398/ is complete
|
|
||||||
reference: refs/changes/98/595398/5
|
|
||||||
maas-htk:
|
maas-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: 9f6194ff770d3776ae3572bcbe841a9289357244
|
reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
|
||||||
mariadb:
|
mariadb:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/openstack-helm
|
location: https://git.openstack.org/openstack/openstack-helm
|
||||||
|
@ -456,7 +451,7 @@ data:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
||||||
promenade:
|
promenade:
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
promenade: quay.io/airshipit/promenade:88c786b8e92d053fd0cba7237df68cc087b81f26
|
promenade: quay.io/airshipit/promenade:24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
|
||||||
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
|
||||||
|
|
|
@ -17,9 +17,8 @@ data:
|
||||||
cluster_domain: cluster.local
|
cluster_domain: cluster.local
|
||||||
service_ip: 10.96.0.10
|
service_ip: 10.96.0.10
|
||||||
upstream_servers:
|
upstream_servers:
|
||||||
- 8.8.8.8
|
- 172.24.1.9
|
||||||
- 8.8.4.4
|
upstream_servers_joined: 172.24.1.9
|
||||||
upstream_servers_joined: 8.8.8.8,8.8.4.4
|
|
||||||
|
|
||||||
genesis:
|
genesis:
|
||||||
hostname: n0
|
hostname: n0
|
||||||
|
|
|
@ -40,5 +40,5 @@ data:
|
||||||
metric: 10
|
metric: 10
|
||||||
dns:
|
dns:
|
||||||
domain: gate.local
|
domain: gate.local
|
||||||
servers: '8.8.8.8 8.8.4.4'
|
servers: '172.24.1.9'
|
||||||
...
|
...
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
---
|
||||||
|
schema: armada/Chart/v1
|
||||||
|
metadata:
|
||||||
|
schema: metadata/Document/v1
|
||||||
|
name: ingress-kube-system
|
||||||
|
replacement: true
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
|
parentSelector:
|
||||||
|
name: ingress-kube-system
|
||||||
|
actions:
|
||||||
|
- method: merge
|
||||||
|
path: .
|
||||||
|
storagePolicy: cleartext
|
||||||
|
data:
|
||||||
|
values:
|
||||||
|
network:
|
||||||
|
ingress:
|
||||||
|
disable-ipv6: "true"
|
||||||
|
vip:
|
||||||
|
manage: true
|
||||||
|
addr: '172.24.1.6/32'
|
||||||
|
...
|
|
@ -26,6 +26,8 @@ data:
|
||||||
secret_ssh_key: true
|
secret_ssh_key: true
|
||||||
conf:
|
conf:
|
||||||
drydock:
|
drydock:
|
||||||
|
maasdriver:
|
||||||
|
maas_api_url: 'http://maas.gate.local:9085/MAAS/api/2.0/'
|
||||||
plugins:
|
plugins:
|
||||||
oob_driver:
|
oob_driver:
|
||||||
- 'drydock_provisioner.drivers.oob.pyghmi_driver.driver.PyghmiDriver'
|
- 'drydock_provisioner.drivers.oob.pyghmi_driver.driver.PyghmiDriver'
|
||||||
|
|
|
@ -25,11 +25,36 @@ data:
|
||||||
manifests:
|
manifests:
|
||||||
secret_ssh_key: true
|
secret_ssh_key: true
|
||||||
conf:
|
conf:
|
||||||
cache:
|
maas:
|
||||||
enabled: true
|
dns: {dns_servers: '172.24.1.9'}
|
||||||
dns:
|
ntp: {use_external_only: 'true' }
|
||||||
dns_servers: 172.24.1.9
|
cache: {enabled: true}
|
||||||
network:
|
network:
|
||||||
maas_ingress:
|
maas_ingress:
|
||||||
addr: 172.24.1.5/32
|
addr: '172.24.1.5/32'
|
||||||
|
endpoints:
|
||||||
|
maas_region:
|
||||||
|
host_fqdn_override:
|
||||||
|
public: maas.gate.local
|
||||||
|
port:
|
||||||
|
region_api:
|
||||||
|
public: 9085
|
||||||
|
maas_ingress:
|
||||||
|
hosts:
|
||||||
|
default: maas-ingress
|
||||||
|
error_pages: maas-ingress-error
|
||||||
|
host_fqdn_override:
|
||||||
|
public: null
|
||||||
|
port:
|
||||||
|
http:
|
||||||
|
default: 9080
|
||||||
|
https:
|
||||||
|
default: 9443
|
||||||
|
error_pages:
|
||||||
|
default: 8080
|
||||||
|
podport: 8080
|
||||||
|
healthz:
|
||||||
|
podport: 10259
|
||||||
|
status:
|
||||||
|
podport: 18089
|
||||||
...
|
...
|
||||||
|
|
|
@ -21,9 +21,14 @@ data:
|
||||||
ucp:
|
ucp:
|
||||||
maas:
|
maas:
|
||||||
location: https://git.openstack.org/openstack/airship-maas
|
location: https://git.openstack.org/openstack/airship-maas
|
||||||
reference: refs/changes/53/600253/1
|
reference: refs/changes/53/600253/39
|
||||||
|
maas-htk:
|
||||||
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
|
subpath: helm-toolkit
|
||||||
|
reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
|
||||||
images:
|
images:
|
||||||
ucp:
|
ucp:
|
||||||
maas:
|
maas:
|
||||||
maas_region: docker.io/sthussey/maas-region-controller:dev
|
maas_region: 'docker.io/sthussey/maas-region-controller:dev'
|
||||||
|
maas_cache: 'quay.io/airshipit/sstream-cache:master'
|
||||||
...
|
...
|
||||||
|
|
|
@ -16,6 +16,7 @@ export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-password18}
|
||||||
export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
|
export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
|
||||||
export VIRSH_POOL=${VIRSH_POOL:-airship}
|
export VIRSH_POOL=${VIRSH_POOL:-airship}
|
||||||
export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
|
export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
|
||||||
|
export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 208.67.220.220"}
|
||||||
|
|
||||||
config_vm_memory() {
|
config_vm_memory() {
|
||||||
nodename=${1}
|
nodename=${1}
|
||||||
|
|
|
@ -30,5 +30,5 @@ ingress_dns_start() {
|
||||||
ssh_cmd "${nodename}" mkdir -p "${remote_work_dir}"
|
ssh_cmd "${nodename}" mkdir -p "${remote_work_dir}"
|
||||||
rsync_cmd "$DNS_ZONE_FILE" "${nodename}:${remote_zone_file}"
|
rsync_cmd "$DNS_ZONE_FILE" "${nodename}:${remote_zone_file}"
|
||||||
rsync_cmd "$COREFILE" "${nodename}:${remote_corefile}"
|
rsync_cmd "$COREFILE" "${nodename}:${remote_corefile}"
|
||||||
ssh_cmd "${nodename}" docker run -d -v /var/tmp/coredns:/data -w /data --network host -P $IMAGE_COREDNS -conf $(basename $remote_corefile)
|
ssh_cmd "${nodename}" docker run -d -v /var/tmp/coredns:/data -w /data --network host --restart always -P $IMAGE_COREDNS -conf $(basename $remote_corefile)
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,11 +117,11 @@ vm_clean() {
|
||||||
}
|
}
|
||||||
|
|
||||||
vm_clean_all() {
|
vm_clean_all() {
|
||||||
log Removing all VMs in parallel
|
log Removing all VMs
|
||||||
VM_NAMES=($(config_vm_names))
|
VM_NAMES=($(config_vm_names))
|
||||||
for NAME in ${VM_NAMES[*]}
|
for NAME in ${VM_NAMES[*]}
|
||||||
do
|
do
|
||||||
vm_clean "${NAME}" &
|
vm_clean "${NAME}"
|
||||||
done
|
done
|
||||||
wait
|
wait
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,10 +6,8 @@
|
||||||
},
|
},
|
||||||
"ingress": {
|
"ingress": {
|
||||||
"domain": "gate.local",
|
"domain": "gate.local",
|
||||||
"172.24.1.5": [
|
"172.24.1.5": ["maas"],
|
||||||
"maas",
|
"172.24.1.6": ["drydock","shipyard","keystone"]
|
||||||
"drydock"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"stages": [
|
"stages": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,6 +4,6 @@ ${DNS_DOMAIN} {
|
||||||
}
|
}
|
||||||
|
|
||||||
. {
|
. {
|
||||||
forward . /etc/resolv.conf
|
forward . ${UPSTREAM_DNS}
|
||||||
log
|
log
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue