updated templates and scripts for Airship 1.3

[yaml_builds.git] / site_type / sriov-a13 / templates / profiles / region.j2

diff --git a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/profiles/region.yaml b/site_type/sriov-a13/templates/profiles/region.j2
similarity index 83%
rename from site_type/sriov/airship-treasuremap/site/airship-seaworthy/profiles/region.yaml
rename to site_type/sriov-a13/templates/profiles/region.j2
index 9bef95a..c20a5e8 100644 (file)
--- a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/profiles/region.yaml
+++ b/site_type/sriov-a13/templates/profiles/region.j2
@@ -4,27 +4,27 @@
 schema: 'drydock/Region/v1'
 metadata:
   schema: 'metadata/Document/v1'
-  # NEWSITE-CHANGEME: Replace with the site name
-  name: airship-seaworthy
+  # NEWSITE-CHANGEXX: Replace with the site name
+  name: {{yaml.site_name}}
   layeringDefinition:
     abstract: false
     layer: site
   storagePolicy: cleartext
   substitutions:
-    # NEWSITE-CHANGEME: Substitutions from deckhand SSH public keys into the
+    # NEWSITE-CHANGEXX: Substitutions from deckhand SSH public keys into the
     # list of authorized keys which MaaS will register for the build-in "ubuntu"
     # 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.
-        name: airship_ssh_public_key
+        # substituted, located in site/seaworthy/secrets folder.
+        name: localadmin_ssh_public_key
         path: .
     - dest:
         path: .repositories.main_archive