diff options
Diffstat (limited to 'site/intel-pod17')
| -rw-r--r-- | site/intel-pod17/profiles/region.yaml | 33 | ||||
| -rw-r--r-- | site/intel-pod17/secrets/passphrases/grego_crypt_password.yaml (renamed from site/intel-pod17/secrets/passphrases/ubuntu_crypt_password.yaml) | 2 | ||||
| -rw-r--r-- | site/intel-pod17/secrets/passphrases/kasparss_crypt_password.yaml | 12 | ||||
| -rw-r--r-- | site/intel-pod17/software/charts/ucp/ceph/ceph-client-update.yaml | 26 | ||||
| -rw-r--r-- | site/intel-pod17/software/charts/ucp/ceph/ceph-client.yaml | 100 | ||||
| -rw-r--r-- | site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml | 30 | ||||
| -rw-r--r-- | site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml | 25 |
7 files changed, 35 insertions, 193 deletions
diff --git a/site/intel-pod17/profiles/region.yaml b/site/intel-pod17/profiles/region.yaml index f8ac846..317f29a 100644 --- a/site/intel-pod17/profiles/region.yaml +++ b/site/intel-pod17/profiles/region.yaml @@ -5,12 +5,18 @@ schema: 'drydock/Region/v1' metadata: schema: 'metadata/Document/v1' # NEWSITE-CHANGEME: Replace with the site name - name: seaworthy + name: intel-pod17 layeringDefinition: abstract: false layer: site storagePolicy: cleartext substitutions: + - dest: + path: .repositories.main_archive + src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .packages.repositories.main_archive # NEWSITE-CHANGEME: 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 @@ -18,29 +24,22 @@ metadata: # shooting problems before UAM or UAM-lite is operational). SSH keys are # stored as secrets in site/seaworthy/secrets. - dest: - # Add/replace the first item in the list + # Add/replace the 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/seaworthy/secrets folder. - name: airship_ssh_public_key + # substituted, located in site/intel-pod17/secrets folder. + name: grego_ssh_public_key path: . - dest: - path: .repositories.main_archive + # Increment the list index + path: .authorized_keys[1] src: - schema: pegleg/SoftwareVersions/v1 - name: software-versions - path: .packages.repositories.main_archive - # Second key example - #- dest: - # # Increment the list index - # path: .authorized_keys[1] - # src: - # schema: deckhand/PublicKey/v1 - # # your ssh key - # name: MY_USER_ssh_public_key - # path: . + schema: deckhand/PublicKey/v1 + # your ssh key + name: kasparss_ssh_public_key + path: . data: tag_definitions: [] # This is the list of SSH keys which MaaS will register for the built-in diff --git a/site/intel-pod17/secrets/passphrases/ubuntu_crypt_password.yaml b/site/intel-pod17/secrets/passphrases/grego_crypt_password.yaml index 4d60468..3084c5d 100644 --- a/site/intel-pod17/secrets/passphrases/ubuntu_crypt_password.yaml +++ b/site/intel-pod17/secrets/passphrases/grego_crypt_password.yaml @@ -2,7 +2,7 @@ schema: deckhand/Passphrase/v1 metadata: schema: metadata/Document/v1 - name: ubuntu_crypt_password + name: grego_crypt_password layeringDefinition: abstract: false layer: site diff --git a/site/intel-pod17/secrets/passphrases/kasparss_crypt_password.yaml b/site/intel-pod17/secrets/passphrases/kasparss_crypt_password.yaml new file mode 100644 index 0000000..e0e57f3 --- /dev/null +++ b/site/intel-pod17/secrets/passphrases/kasparss_crypt_password.yaml @@ -0,0 +1,12 @@ +--- +schema: deckhand/Passphrase/v1 +metadata: + schema: metadata/Document/v1 + name: kasparss_crypt_password + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +# Pass: password123 +data: $6$qgvZ3LC9.t59Akqy$HAJfJpdrN8Ld9ssGyjFPzyJ3WUGN.ucqhSyA25LFjBrSYboVFgX8wLomRwlf5YIn1siaXHSh4JaPJED3BO36J1 +... diff --git a/site/intel-pod17/software/charts/ucp/ceph/ceph-client-update.yaml b/site/intel-pod17/software/charts/ucp/ceph/ceph-client-update.yaml deleted file mode 100644 index eb921b8..0000000 --- a/site/intel-pod17/software/charts/ucp/ceph/ceph-client-update.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# The purpose of this file is to define environment-specific parameters for ceph -# client update -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-ceph-client-update - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-ceph-client-update-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - pool: - target: - # NEWSITE-CHANGEME: Total number of OSDs. Does not need to change if - # your HW matches this site's HW. Verify for your environment. - # 8 OSDs per node x 3 nodes = 24 - osd: 3 -... diff --git a/site/intel-pod17/software/charts/ucp/ceph/ceph-client.yaml b/site/intel-pod17/software/charts/ucp/ceph/ceph-client.yaml deleted file mode 100644 index e1e8ecf..0000000 --- a/site/intel-pod17/software/charts/ucp/ceph/ceph-client.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# The purpose of this file is to define envrionment-specific parameters for the -# ceph client -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-ceph-client - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-ceph-client-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - pool: - target: - # NEWSITE-CHANGEME: The number of OSDs per ceph node. Does not need to - # change if your deployment HW matches this site's HW. - osd: 1 - spec: - # RBD pool - - name: rbd - application: rbd - replication: 1 - percent_total_data: 40 - - name: cephfs_metadata - application: cephfs - replication: 1 - percent_total_data: 5 - - name: cephfs_data - application: cephfs - replication: 1 - percent_total_data: 10 - # RadosGW pools - - name: .rgw.root - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.control - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.data.root - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.gc - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.log - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.intent-log - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.meta - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.usage - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.keys - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.email - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.swift - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.uid - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.buckets.extra - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.buckets.index - application: rgw - replication: 1 - percent_total_data: 3 - - name: default.rgw.buckets.data - application: rgw - replication: 1 - percent_total_data: 34.8 -... diff --git a/site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml b/site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml deleted file mode 100644 index 8cf291a..0000000 --- a/site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# The purpose of this file is to define environment-specific parameters for -# ceph-osd -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-ceph-osd - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-ceph-osd-global - actions: - - method: replace - path: .values.conf.storage.osd - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - storage: - osd: - - data: - type: block-logical - location: /dev/sdb - journal: - type: directory - location: /var/lib/openstack-helm/ceph/osd/osd-sdb -... diff --git a/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml b/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml index db6ef66..97e607e 100644 --- a/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml +++ b/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml @@ -25,44 +25,31 @@ metadata: path: .values.conf.uamlite.users[0].user_sshkeys[0] src: schema: deckhand/PublicKey/v1 - name: airship_ssh_public_key + name: grego_ssh_public_key path: . - dest: path: .values.conf.uamlite.users[0].user_crypt_passwd src: schema: deckhand/Passphrase/v1 - name: ubuntu_crypt_password + name: grego_crypt_password path: . - dest: path: .values.conf.uamlite.users[1].user_sshkeys[0] src: schema: deckhand/PublicKey/v1 - name: airship_ssh_public_key - path: . - - dest: - path: .values.conf.uamlite.users[2].user_sshkeys[0] - src: - schema: deckhand/PublicKey/v1 - name: grego_ssh_public_key + name: kasparss_ssh_public_key path: . - dest: - path: .values.conf.uamlite.users[3].user_sshkeys[0] + path: .values.conf.uamlite.users[1].user_crypt_passwd src: - schema: deckhand/PublicKey/v1 - name: kasparss_ssh_public_key + schema: deckhand/Passphrase/v1 + name: kasparss_crypt_password path: . - data: values: conf: uamlite: users: - - user_name: ubuntu - user_sudo: true - user_sshkeys: [] - - user_name: airship - user_sudo: true - user_sshkeys: [] - user_name: grego user_sudo: true user_sshkeys: [] |