Merge "Move airship-seaworthy to seaworthy"

.zuul.yaml

@@ -18,13 +18,13 @@
       rtd_project_name: 'airship-treasuremap'
     check:
       jobs:
-        - treasuremap-airship-seaworthy-site-lint
+        - treasuremap-seaworthy-site-lint
         - treasuremap-airskiff-site-lint
         - treasuremap-airsloop-site-lint
         - treasuremap-airskiff-deployment-ubuntu
     gate:
       jobs:
-        - treasuremap-airship-seaworthy-site-lint
+        - treasuremap-seaworthy-site-lint
         - treasuremap-airskiff-site-lint
         - treasuremap-airsloop-site-lint
         - treasuremap-airskiff-deployment-ubuntu
@@ -42,7 +42,7 @@
 - job:
     name: treasuremap-site-lint
     description:
-      Lint a site using Pegleg. Default site is airship-seaworthy.
+      Lint a site using Pegleg. Default site is seaworthy.
     nodeset: treasuremap-single-node
     timeout: 900
     pre-run:
@@ -52,18 +52,18 @@
     required-projects:
       - airship/pegleg
     vars:
-      site: airship-seaworthy
+      site: seaworthy
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
 
 - job:
-    name: treasuremap-airship-seaworthy-site-lint
+    name: treasuremap-seaworthy-site-lint
     description: |
-      Lint the airship-seaworthy site using Pegleg.
+      Lint the seaworthy site using Pegleg.
     parent: treasuremap-site-lint
     vars:
-      site: airship-seaworthy
+      site: seaworthy
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -80,7 +80,7 @@
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
-      - ^site/airship-seaworthy/.*$
+      - ^site/seaworthy/.*$
       - ^site/airsloop/.*$
 
 - job:
@@ -93,7 +93,7 @@
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
-      - ^site/airship-seaworthy/.*$
+      - ^site/seaworthy/.*$
       - ^site/airskiff/.*$
 
 - job:
@@ -111,7 +111,7 @@
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
-      - ^site/airship-seaworthy/.*$
+      - ^site/seaworthy/.*$
       - ^site/airsloop/.*$
 
 - secret:

doc/source/airsloop.rst

@@ -6,7 +6,7 @@ The goal of this site is to be used as a reference for mini Airship deployments
 with one controller and one or more compute nodes.
 
 Airsloop is meant to get an operator up and running quickly with an Airship lab environment,
-and has some resiliency and security features tuned down.  Please see the `Seaworthy <https://opendev.org/airship/treasuremap/src/branch/master/site/airship-seaworthy>`__
+and has some resiliency and security features tuned down.  Please see the `Seaworthy <https://opendev.org/airship/treasuremap/src/branch/master/site/seaworthy>`__
 manifests for a production-oriented example.
 
 The site manifests are available at

doc/source/authoring_and_deployment.rst

@@ -13,7 +13,7 @@ Airship site. This can be broken down into two high-level pieces:
 
 This document is an "all in one" site authoring guide + deployment guide
 for a standard Airship deployment. For the most part, the site
-authoring guidance lives within ``airship-seaworthy`` reference site in the
+authoring guidance lives within ``seaworthy`` reference site in the
 form of YAML comments.
 
 Terminology
@@ -197,19 +197,19 @@ To gain a full understanding of the pegleg structure, it is highly
 recommended to read pegleg documentation on this
 `here <https://airship-pegleg.readthedocs.io/>`__.
 
-The ``airship-seaworthy`` site may be used as reference site. It is the
+The ``seaworthy`` site may be used as reference site. It is the
 principal pipeline for integration and continuous deployment testing of Airship.
 
 Change directory to the ``airship-treasuremap/site`` folder and copy the
-``airship-seaworthy`` site as follows:
+``seaworthy`` site as follows:
 
 ::
 
     NEW_SITE=mySite # replace with the name of your site
     cd airship-treasuremap/site
-    cp -r airship-seaworthy $NEW_SITE
+    cp -r seaworthy $NEW_SITE
 
-Remove ``airship-seaworthy`` specific certificates.
+Remove ``seaworthy`` specific certificates.
 
 ::
 

doc/source/config_update_guide.rst

@@ -47,8 +47,8 @@ site:
 
 ::
 
-    export SITE=airship-seaworthy
-    export SITE_PATH=treasuremap/site/airship-seaworthy
+    export SITE=seaworthy
+    export SITE_PATH=treasuremap/site/seaworthy
 
 Updating the manifests
 ----------------------
@@ -141,11 +141,11 @@ Install Airship CLI as described in `Configuring Airship CLI`_ section.
 Set the name of your site:
 
 ::
-    export SITE=airship-seaworthy
+    export SITE=seaworthy
 
 Configure credentials for accessing Shipyard; the password is stored
 in ``ucp_shipyard_keystone_password`` secret, you can find it in
-``site/airship-seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml``
+``site/seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml``
 configuration file of your site.
 
 ::

doc/source/seaworthy.rst

@@ -5,7 +5,7 @@ Airship Seaworthy is a multi-node site deployment reference
 and continuous integration pipeline.
 
 The site manifests are available at
-`site/airship-seaworthy <https://opendev.org/airship/treasuremap/src/branch/master/site/airship-seaworthy>`__.
+`site/seaworthy <https://opendev.org/airship/treasuremap/src/branch/master/site/seaworthy>`__.
 
 
 Pipeline
@@ -42,7 +42,7 @@ to align parts of the system such as Ceph replication, etcd, etc.
 
 Airship Seaworthy site has 6 DELL R720xd bare-metal servers:
 3 control, and 3 compute nodes.
-See host profiles for the servers `here <https://opendev.org/airship/treasuremap/src/branch/master/site/airship-seaworthy/profiles/host>`__.
+See host profiles for the servers `here <https://opendev.org/airship/treasuremap/src/branch/master/site/seaworthy/profiles/host>`__.
 
 Control (masters)
  - cab23-r720-11
@@ -59,7 +59,7 @@ Network
 -------
 
 Physical (underlay) networks are described in Drydock site configuration
-`here <https://opendev.org/airship/treasuremap/src/branch/master/site/airship-seaworthy/networks/physical/networks.yaml>`__.
+`here <https://opendev.org/airship/treasuremap/src/branch/master/site/seaworthy/networks/physical/networks.yaml>`__.
 It defines OOB (iLO/IPMI), untagged PXE, and multiple tagged general use networks.
 
 Calico overlay for k8s POD networking uses IPIP mesh.

doc/source/troubleshooting_guide.rst

@@ -74,7 +74,7 @@ where it fails, there are two major deployment steps:
 After `Configuring Airship CLI`_, setup credentials for accessing
 Shipyard; the password is stored in ``ucp_shipyard_keystone_password``
 secret, you can find it in
-``site/airship-seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml``
+``site/seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml``
 configuration file of your site.
 
 ::

site/airskiff/profiles/region.yaml

@@ -7,7 +7,7 @@ schema: 'drydock/Region/v1'
 metadata:
   schema: 'metadata/Document/v1'
   # NEWSITE-CHANGEME: Replace with the site name
-  name: airship-seaworthy
+  name: airskiff
   layeringDefinition:
     abstract: false
     layer: site
@@ -18,14 +18,14 @@ metadata:
     # account during the PXE process. Create a substitution rule for each SSH
     # key that should have access to the "ubuntu" account (useful for trouble-
     # shooting problems before UAM or UAM-lite is operational). SSH keys are
-    # stored as secrets in site/airship-seaworthy/secrets.
+    # stored as secrets in site/seaworthy/secrets.
     - dest:
         # Add/replace the first item in the list
         path: .authorized_keys[0]
       src:
         schema: deckhand/PublicKey/v1
         # This should match the "name" metadata of the SSH key which will be
-        # substituted, located in site/airship-seaworthy/secrets folder.
+        # substituted, located in site/seaworthy/secrets folder.
         name: airship_ssh_public_key
         path: .
     - dest:

site/seaworthy/profiles/region.yaml

@@ -5,7 +5,7 @@ schema: 'drydock/Region/v1'
 metadata:
   schema: 'metadata/Document/v1'
   # NEWSITE-CHANGEME: Replace with the site name
-  name: airship-seaworthy
+  name: seaworthy
   layeringDefinition:
     abstract: false
     layer: site
@@ -16,14 +16,14 @@ metadata:
     # account during the PXE process. Create a substitution rule for each SSH
     # key that should have access to the "ubuntu" account (useful for trouble-
     # shooting problems before UAM or UAM-lite is operational). SSH keys are
-    # stored as secrets in site/airship-seaworthy/secrets.
+    # stored as secrets in site/seaworthy/secrets.
     - dest:
         # Add/replace the first item in the list
         path: .authorized_keys[0]
       src:
         schema: deckhand/PublicKey/v1
         # This should match the "name" metadata of the SSH key which will be
-        # substituted, located in site/airship-seaworthy/secrets folder.
+        # substituted, located in site/seaworthy/secrets folder.
         name: airship_ssh_public_key
         path: .
     - dest: