summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Gorshunov <roman.gorshunov@att.com>2018-09-24 12:53:27 +0200
committerRoman Gorshunov <roman.gorshunov@att.com>2018-09-25 11:44:57 +0200
commitd734925bb6d80bb0fd3970641d7be08a70f1a453 (patch)
tree8535e7b953db5ae9955318c440c434762ffb1b6e
parent73880a9973a3e6608287e5fc290529ce0ca76c84 (diff)
Fix: various documentation and URL fixes
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
Notes
Notes (review): Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Workflow+1: Felipe Monteiro <felipe.monteiro@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 26 Sep 2018 20:09:24 +0000 Reviewed-on: https://review.openstack.org/604427 Project: openstack/airship-divingbell Branch: refs/heads/master
-rw-r--r--README.md2
-rw-r--r--divingbell/templates/bin/_uamlite.sh.tpl4
-rw-r--r--setup.cfg8
-rwxr-xr-xtools/helm_tk.sh2
4 files changed, 9 insertions, 7 deletions
diff --git a/README.md b/README.md
index b0123b6..2469a78 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
1# Divingbell 1# Divingbell
2 2
3Documentation can be found [here](https://divingbell.readthedocs.io). 3Documentation can be found [here](https://airship-divingbell.readthedocs.io).
diff --git a/divingbell/templates/bin/_uamlite.sh.tpl b/divingbell/templates/bin/_uamlite.sh.tpl
index 8331364..af7b9f6 100644
--- a/divingbell/templates/bin/_uamlite.sh.tpl
+++ b/divingbell/templates/bin/_uamlite.sh.tpl
@@ -143,7 +143,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
143 {{- if eq $key "user_crypt_passwd" }} 143 {{- if eq $key "user_crypt_passwd" }}
144 {{/* supported crypt types are 2a (blowfish), 1 (md5), 5 (sha-256), and 6 (sha-512) */}} 144 {{/* supported crypt types are 2a (blowfish), 1 (md5), 5 (sha-256), and 6 (sha-512) */}}
145 {{- if not (or (regexMatch "\\$2a\\$.*\\$.*" $value) (regexMatch "\\$[156]\\$.*\\$.*" $value)) }} 145 {{- if not (or (regexMatch "\\$2a\\$.*\\$.*" $value) (regexMatch "\\$[156]\\$.*\\$.*" $value)) }}
146 {{- 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") }} 146 {{- 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") }}
147 {{- end }} 147 {{- end }}
148 {{- end }} 148 {{- end }}
149 {{ $key }}={{ $value | squote }} \ 149 {{ $key }}={{ $value | squote }} \
@@ -155,7 +155,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
155 {{- end }} 155 {{- end }}
156 {{- if hasKey . "user_sshkeys" }} 156 {{- if hasKey . "user_sshkeys" }}
157 {{- if not (eq (first .user_sshkeys) "Unmanaged") }} 157 {{- if not (eq (first .user_sshkeys) "Unmanaged") }}
158 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 }} 158 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 }}
159{{- end }} 159{{- end }}
160{{- else }} 160{{- else }}
161 add_sshkeys 161 add_sshkeys
diff --git a/setup.cfg b/setup.cfg
index f0006ee..6912d4a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,10 @@
1[metadata] 1[metadata]
2name = divingbell 2name = Divingbell
3description-file = README.md 3description-file = README.md
4author = OpenStack 4author = The Airship Authors
5home-page = 5home-page = https://airship-divingbell.readthedocs.io/
6summary = Lightweight solution for Bare metal configuration management and package manager orchestration
7
6classifier = 8classifier =
7 Intended Audience :: Information Technology 9 Intended Audience :: Information Technology
8 Intended Audience :: System Administrators 10 Intended Audience :: System Administrators
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 1b49098..99ac4c0 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -53,7 +53,7 @@ function helm_serve {
53mkdir -p build 53mkdir -p build
54pushd build 54pushd build
55git clone --depth 1 $HTK_REPO || true 55git clone --depth 1 $HTK_REPO || true
56pushd openstack-helm/$HTK_PATH 56pushd ${HTK_REPO##*/}/$HTK_PATH
57 57
58git pull 58git pull
59make helm-toolkit 59make helm-toolkit