Browse Source

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
Roman Gorshunov 7 months ago
parent
commit
d734925bb6
4 changed files with 9 additions and 7 deletions
  1. 1
    1
      README.md
  2. 2
    2
      divingbell/templates/bin/_uamlite.sh.tpl
  3. 5
    3
      setup.cfg
  4. 1
    1
      tools/helm_tk.sh

+ 1
- 1
README.md View File

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

+ 2
- 2
divingbell/templates/bin/_uamlite.sh.tpl View File

@@ -143,7 +143,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
143 143
     {{- if eq $key "user_crypt_passwd" }}
144 144
       {{/* supported crypt types are 2a (blowfish), 1 (md5), 5 (sha-256), and 6 (sha-512) */}}
145 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 147
       {{- end }}
148 148
     {{- end }}
149 149
     {{ $key }}={{ $value | squote }} \
@@ -155,7 +155,7 @@ purge_expired_users={{ .Values.conf.uamlite.purge_expired_users | squote }}
155 155
   {{- end }}
156 156
   {{- if hasKey . "user_sshkeys" }}
157 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 159
 {{- end }}
160 160
 {{- else }}
161 161
   add_sshkeys

+ 5
- 3
setup.cfg View File

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

+ 1
- 1
tools/helm_tk.sh View File

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

Loading…
Cancel
Save