Add missed commits from AIAB repo

* https://review.opendev.org/#/c/704168/
  * https://review.opendev.org/#/c/651659/
  * https://review.opendev.org/#/c/701272/
  * https://review.opendev.org/#/c/697565/
  * https://review.opendev.org/#/c/697457/

Change-Id: Id004c3cd81b35037b98c95b1ccf96326700d1f37

tools/deployment/seaworthy-virt/airship_gate/bin/shipyard.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -e
 
 SCRIPT_DIR="$(realpath "$(dirname "$0")")"
 WORKSPACE="$(realpath "${SCRIPT_DIR}/../../..")"

tools/deployment/seaworthy-virt/airship_gate/lib/config.sh

@@ -27,6 +27,8 @@ export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 8.8.4.4"}
 export NTP_POOLS=${NTP_POOLS:-"0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org"}
 export NTP_SERVERS=${NTP_SERVERS:-""}
 export PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY:-MjI1N2ZiMjMzYjI0ZmVkZDU4}
+export PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-ewd?egnPWL0Q?hzzGwEBmII5}
+export PEGLEG_SALT=${PEGLEG_SALT:-9EX&uapdz1ka17WOQMG-FjTA}
 
 # key-pair used for drydock/maas auth towards libvirt and access to
 # the virtual nodes; auto-generated if no value provided

tools/deployment/seaworthy-virt/airship_gate/lib/virsh.sh

@@ -484,7 +484,6 @@ vol_create_disk() {
 }
 
 vm_create() {
-    set -x
     NAME=${1}
     DISK_OPTS="$(vm_create_vols "${NAME}")"
     NETWORK_OPTS="$(vm_create_interfaces "${NAME}")"

tools/deployment/seaworthy-virt/airship_gate/manifests/multinode_deploy.json

@@ -6,14 +6,14 @@
   },
   "ingress": {
     "domain": "gate.local",
-    "ca": "-----BEGIN CERTIFICATE-----\nMIIDIDCCAgigAwIBAgIUfikFVpFSQKVjACP9i8P4tUMnQbcwDQYJKoZIhvcNAQEL\nBQAwKDERMA8GA1UEChMIU25ha2VvaWwxEzARBgNVBAMTCmluZ3Jlc3MtY2EwHhcN\nMTgxMjAzMjEzOTAwWhcNMjMxMjAyMjEzOTAwWjAoMREwDwYDVQQKEwhTbmFrZW9p\nbDETMBEGA1UEAxMKaW5ncmVzcy1jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\nAQoCggEBAOR6+3dCF5mtKvu2TlaYNHc6/v8VPvw3I0+EI+jRskXVQHZxF0kcLAVH\n/LM2maTMzNc1sZnxCnj8YYHxfhdIco+zwzCbG1YGolSPrPaslYmMmDjR0eVl1+tb\nmLnEHDZ88ds5rXNlUXDhAURzYPJivG2aYBVImvaS4GHztndaFFNE0Q7HQpldCs1Q\n5+xbFlKWHBt/xPM4QjoD/ReLEE5m5HhkT4WN0hWC0NC1OwW6bBhVkrk4D2kDTq8d\n/b5MH4FG2HHJYHXKR4caasrCHUrmuq7m6WoicwF7z53FvlM782EsNx6vSoBKYs39\n/AC4meM/9D8rjUlWaG3AjP0KFrFCLYECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEG\nMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJFfhFd1reBWgmrWe6PBV2z5W/Ee\nMA0GCSqGSIb3DQEBCwUAA4IBAQAZygjSCRSJrvgPllyWDpyKN1fg2r7P2ioI0WR9\nWkSrPKzdhi2hR8VdJxkMvRpEmWRhkQT7jNGEIWgy2jtyWiYKnKYobbY/kMU86QgL\nZazh2DiIeJim+Vt3RREyfOcNDwGMX7NpfwMTz7Dzl+jvtlBwKLFN0L15d0X+4J9V\ndRp5ZkooVjiOJb6vNcozDWxBrRPAowrvzLlJkFMaKgJQmGigEpgEygnCRH++NCle\n/ivGbdFuCsYzUTlR77xf9kGXMh3socMXcdu5SOtaDS7sl52DAJnAPxo9S6l0270G\na0989is2yCgDNmld5lpphVPaQSusGa8/XTaXR7YH+oc7qn1l\n-----END CERTIFICATE-----",
+    "ca": "-----BEGIN CERTIFICATE-----\nMIIDCzCCAfOgAwIBAgIUXetmvJ5wIpXdUOIn3Vg4D0hVLe4wDQYJKoZIhvcNAQEL\nBQAwFTETMBEGA1UEAwwKaW5ncmVzcy1jYTAeFw0xOTEyMDQxOTU5MTJaFw0yOTEy\nMDExOTU5MTJaMBUxEzARBgNVBAMMCmluZ3Jlc3MtY2EwggEiMA0GCSqGSIb3DQEB\nAQUAA4IBDwAwggEKAoIBAQCikS+idIoIpoHHWJUK8XYplluWIMRV4ssXmOqrVZiB\nVLdC1mkpnEo01RkCxw7YB9srXaRiemq7NqKpbNpxsZ6aII0QRgQbKXXjL8J9pX42\n0S0V6S/FGLLb0e80VhEbLhVuTX3V//fYg6CeGF3vy/UgoPGUYlXaHAgsZhBqS3yA\nQhq+kqUjwET/EoIoLWMqo+2PAIe/xHNqWH4sFexfj8GG1C1QpalTNdODkvQwZzSo\nMeu+UJbWTL7s+QJKemTVJJKCU9g1rFxbA6GypnV9xavgUR1sB0HlG7mmLnXqjKHm\nEgG78JZUkB2mrxKveVdW+Uad90EguKkuJUPirW0KHQl7AgMBAAGjUzBRMB0GA1Ud\nDgQWBBT7o/yXQYABZqcLW+D9+OMo84dHCDAfBgNVHSMEGDAWgBT7o/yXQYABZqcL\nW+D9+OMo84dHCDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBM\n0AF2+r5IeP1w0AZJjw0strgJ8HZNt4AVuD6nziqr1mtntKt5vEdWWgVqAVeAspnK\nglrYzGstw/dRAVhlZaKi8P5hl0taZto81tWoMLmXhu2WIwyf86JOmtE6HTGGO2jt\nPsuhwvqx592Ikq/WwiASHlJx/jP1Un4F/FewIy0StzkOIiEMXCtIF+RPbkS1y0pD\nzPgL0O9imT9CFZtm4e1nBE6BCahhiWO+PveI3c24BeGBRx79LYg0DY5E9aBkU/WV\nWpd7Y1dHqZxSBjd4UeDVZi/whs7Zv+I90Hcsb+PkrssKOJUivZ8RuR/2yKD40ujo\nDw3iF3Hyn5UCh4uA8ZJu\n-----END CERTIFICATE-----",
     "172.24.1.5": ["maas"],
     "172.24.1.6": ["drydock","shipyard","keystone"]
   },
   "disk_layouts":{
     "simple": {
       "vda": {
-        "size": 64,
+        "size": 96,
         "io_profile": "fast",
         "bootstrap": true
       }
@@ -228,6 +228,7 @@
       },
       "bootstrap": false
     }
+
   },
   "bgp" : {
     "quagga_as": 64688,

tools/deployment/seaworthy-virt/airship_gate/on_error/collect_genesis_info.sh

@@ -15,7 +15,6 @@
 
 # NOTE(mark-burnett): Keep trying to collect info even if there's an error
 set +e
-set -x
 
 KUBECONFIG="${KUBECONFIG:-/etc/kubernetes/admin/kubeconfig.yaml}"
 source "${GATE_UTILS}"

tools/deployment/seaworthy-virt/airship_gate/stages/pegleg-collect.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -xe
+set -e
 
 source "${GATE_UTILS}"
 
@@ -69,6 +69,8 @@ collect_design_docs() {
     -v "${HOME}/.ssh":/root/.ssh \
     -v "${REPO_ROOT}":/workspace \
     -v "${DEFINITION_DEPOT}":/collect \
+    -e "PEGLEG_PASSPHRASE=$PEGLEG_PASSPHRASE" \
+    -e "PEGLEG_SALT=$PEGLEG_SALT" \
     "${IMAGE_PEGLEG_CLI}" \
     $(render_pegleg_cli)
 }

tools/deployment/seaworthy-virt/airship_gate/stages/pegleg-render.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -xe
+set -e
 
 source "${GATE_UTILS}"
 
@@ -53,7 +53,7 @@ render_pegleg_cli() {
         done
     fi
 
-    cli_string+=("render" "-o" "/collect/rendered.yaml")
+    cli_string+=("render" "-s" "/collect/rendered.yaml")
 
     cli_string+=("$(config_pegleg_sitename)")
 
@@ -69,6 +69,8 @@ collect_rendered_doc() {
     -v "${HOME}/.ssh":/root/.ssh \
     -v "${REPO_ROOT}":/workspace \
     -v "${RENDERED_DEPOT}":/collect \
+    -e "PEGLEG_PASSPHRASE=$PEGLEG_PASSPHRASE" \
+    -e "PEGLEG_SALT=$PEGLEG_SALT" \
     "${IMAGE_PEGLEG_CLI}" \
     $(render_pegleg_cli)
 }