Few fixes for chart values
Remove unused database vars for maas chart Set default images using quay Allow export key job to log more info Change-Id: I71b6ef0e3a08136b748b626de004078f2913e269
This commit is contained in:
parent
88099da448
commit
3af68e79d5
|
@ -35,7 +35,7 @@ function post_secret {
|
||||||
--method=POST \
|
--method=POST \
|
||||||
--body-file=/tmp/secret.json \
|
--body-file=/tmp/secret.json \
|
||||||
https://kubernetes.default.svc.cluster.local/api/v1/namespaces/${SECRET_NAMESPACE}/secrets \
|
https://kubernetes.default.svc.cluster.local/api/v1/namespaces/${SECRET_NAMESPACE}/secrets \
|
||||||
2>&1 | grep -E "HTTP/1.1 (201 Created|409 Conflict)"
|
2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
KEY=$(maas-region apikey --username=${ADMIN_USERNAME})
|
KEY=$(maas-region apikey --username=${ADMIN_USERNAME})
|
||||||
|
@ -64,7 +64,8 @@ EOS
|
||||||
echo 'Secret exists, clearing before trying again'
|
echo 'Secret exists, clearing before trying again'
|
||||||
clear_secret
|
clear_secret
|
||||||
else
|
else
|
||||||
echo Secret creation failed
|
echo 'Secret creation failed'
|
||||||
|
echo $result
|
||||||
fi
|
fi
|
||||||
sleep 15
|
sleep 15
|
||||||
done
|
done
|
||||||
|
|
|
@ -70,12 +70,12 @@ manifests:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
db_init: docker.io/postgres:9.5
|
db_init: docker.io/postgres:9.5
|
||||||
db_sync: sthussey/maas-region-controller:2.3_patchv4
|
db_sync: quay.io/attcomdev/maas-region-controller:latest
|
||||||
maas_rack: sthussey/maas-rack-controller:2.3
|
maas_rack: quay.io/attcomdev/maas-rack-controller:latest
|
||||||
maas_region: sthussey/maas-region-controller:2.3_patchv4
|
maas_region: quay.io/attcomdev/maas-region-controller:latest
|
||||||
bootstrap: sthussey/maas-region-controller:2.3_patchv4
|
bootstrap: quay.io/attcomdev/maas-region-controller:latest
|
||||||
export_api_key: sthussey/maas-region-controller:2.3_patchv4
|
export_api_key: quay.io/attcomdev/maas-region-controller:latest
|
||||||
maas_cache: quay.io/attcomdev/maas-cache:master
|
maas_cache: quay.io/attcomdev/sstream-cache:latest
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
|
||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
|
|
||||||
|
@ -143,10 +143,6 @@ conf:
|
||||||
peer_proxy_enabled: false
|
peer_proxy_enabled: false
|
||||||
# An external proxy server to use
|
# An external proxy server to use
|
||||||
proxy_server: null
|
proxy_server: null
|
||||||
database:
|
|
||||||
database_name: maasdb
|
|
||||||
database_user: maas
|
|
||||||
database_password: password
|
|
||||||
images:
|
images:
|
||||||
default_os: 'ubuntu'
|
default_os: 'ubuntu'
|
||||||
default_image: 'xenial'
|
default_image: 'xenial'
|
||||||
|
|
Loading…
Reference in New Issue