airship/divingbell
Code Issues Proposed changes

Fix: various documentation and URL fixes

Browse Source 
1) UCP -> Airship
2) readthedocs.org -> readthedocs.io (there is redirect)
3) http -> https
4) attcomdev -> airshipit (repo on quay.io)
5) att-comdev -> openstack/airship-* (repo on github/openstack git)
6) many URLs have been verified and adjusted to be current
7) no need for 'en/latest/' path in URL of the RTD
8) added more info to some setup.cfg and setup.py files
9) ucp-integration docs are now in airship-in-a-bottle
10) airship-divingbell-ubuntu gate repo split fix (tools/helm_tk.sh)
11) various other minor fixes

Change-Id: I1b7956e77fdd2f01368df1b81b44fdd51ee8443c
This commit is contained in:
Roman Gorshunov 2018-09-24 12:53:27 +02:00
parent 73880a9973
commit d734925bb6
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,3 +1,3 @@
# Divingbell
Documentation can be found [here](https://divingbell.readthedocs.io).
Documentation can be found [here](https://airship-divingbell.readthedocs.io).

4
divingbell/templates/bin/_uamlite.sh.tpl
View File

@ -143,7 +143,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
{{- if eq $key "user_crypt_passwd" }}
{{/* supported crypt types are 2a (blowfish), 1 (md5), 5 (sha-256), and 6 (sha-512) */}}
{{- if not (or (regexMatch "\\$2a\\$.*\\$.*" $value) (regexMatch "\\$[156]\\$.*\\$.*" $value)) }}
{{- fail (print "BAD PASSWORD FOR '" $item.user_name "': The 'user_crypt_passwd' specified for '" $item.user_name "' does not pass regex checks. Ensure that the supplied user password is encoded per divingbell documentation at https://divingbell.readthedocs.io/en/latest/#uamlite") }}
{{- fail (print "BAD PASSWORD FOR '" $item.user_name "': The 'user_crypt_passwd' specified for '" $item.user_name "' does not pass regex checks. Ensure that the supplied user password is encoded per divingbell documentation at https://airship-divingbell.readthedocs.io/#uamlite") }}
{{- end }}
{{- end }}
{{ $key }}={{ $value | squote }} \
@ -155,7 +155,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
{{- end }}
{{- if hasKey . "user_sshkeys" }}
{{- if not (eq (first .user_sshkeys) "Unmanaged") }}
add_sshkeys {{ range $ssh_key := .user_sshkeys }}{{ if not (or (regexMatch "ssh-dss .*" $ssh_key) (regexMatch "ecdsa-.*" $ssh_key) (regexMatch "ssh-ed25519 .*" $ssh_key) (regexMatch "ssh-rsa .*" $ssh_key)) }}{{ fail (print "BAD SSH KEY FOR '" $item.user_name "': One of the 'user_sshkeys' specified for '" $item.user_name "' does not pass regex checks: '" $ssh_key "'. Ensure that the supplied user SSH keys are supported/formatted per divingbell documentation at https://divingbell.readthedocs.io/en/latest/#uamlite") }}{{ else }}{{ $ssh_key | squote }}{{ end }} {{ end }}
add_sshkeys {{ range $ssh_key := .user_sshkeys }}{{ if not (or (regexMatch "ssh-dss .*" $ssh_key) (regexMatch "ecdsa-.*" $ssh_key) (regexMatch "ssh-ed25519 .*" $ssh_key) (regexMatch "ssh-rsa .*" $ssh_key)) }}{{ fail (print "BAD SSH KEY FOR '" $item.user_name "': One of the 'user_sshkeys' specified for '" $item.user_name "' does not pass regex checks: '" $ssh_key "'. Ensure that the supplied user SSH keys are supported/formatted per divingbell documentation at https://airship-divingbell.readthedocs.io/#uamlite") }}{{ else }}{{ $ssh_key | squote }}{{ end }} {{ end }}
{{- end }}
{{- else }}
add_sshkeys

8
setup.cfg
View File

@ -1,8 +1,10 @@
[metadata]
name = divingbell
name = Divingbell
description-file = README.md
author = OpenStack
home-page =
author = The Airship Authors
home-page = https://airship-divingbell.readthedocs.io/
summary = Lightweight solution for Bare metal configuration management and package manager orchestration
classifier =
Intended Audience :: Information Technology
Intended Audience :: System Administrators

2
tools/helm_tk.sh
View File

@ -53,7 +53,7 @@ function helm_serve {
mkdir -p build
pushd build
git clone --depth 1 $HTK_REPO || true
pushd openstack-helm/$HTK_PATH
pushd ${HTK_REPO##*/}/$HTK_PATH
git pull
make helm-toolkit