From: Kaspars Skels Date: Thu, 15 Aug 2019 15:08:21 +0000 (-0500) Subject: Move ceph to SSD disk and CNTT type polish X-Git-Tag: opnfv-9.0.0~52 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=da8bd0499c80bc576531189ef35d250ca4ed1689;p=airship.git Move ceph to SSD disk and CNTT type polish Change-Id: Id661d4107efac128fd973c98f06805c44083e93f Signed-off-by: Kaspars Skels --- 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 similarity index 90% rename from site/intel-pod17/secrets/passphrases/ubuntu_crypt_password.yaml rename to 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/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: [] diff --git a/type/cntt/bootactions/promjoin.yaml b/type/cntt/baremetal/bootactions/promjoin.yaml similarity index 100% rename from type/cntt/bootactions/promjoin.yaml rename to type/cntt/baremetal/bootactions/promjoin.yaml diff --git a/type/cntt/profiles/host/dp-intel-s2600wt.yaml b/type/cntt/profiles/host/dp-intel-s2600wt.yaml index e05a2c7..49ece45 100644 --- a/type/cntt/profiles/host/dp-intel-s2600wt.yaml +++ b/type/cntt/profiles/host/dp-intel-s2600wt.yaml @@ -76,24 +76,21 @@ data: mountpoint: '/var/log' fstype: 'ext4' mount_options: 'defaults' - # - name: 'cephjournal' - # size: '10g' - name: 'var' size: '>100g' filesystem: mountpoint: '/var' fstype: 'ext4' mount_options: 'defaults' - # datadisk: - # partitions: - # - name: 'nova' - # size: '450g' - # filesystem: - # mountpoint: '/var/lib/nova' - # fstype: 'ext4' - # mount_options: 'defaults' - # - name: 'cephosd' - # size: '>100g' + + datadisk: + partitions: + - name: 'nova' + size: '99%' + filesystem: + mountpoint: '/var/lib/nova' + fstype: 'ext4' + mount_options: 'defaults' platform: image: 'xenial' diff --git a/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml index 8937fdc..e991718 100644 --- a/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml +++ b/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml @@ -26,9 +26,9 @@ data: storage: osd: - data: - type: block-logical - location: /dev/sdb + type: directory + location: /var/lib/tenant-ceph/osd/osd-one journal: type: directory - location: /var/lib/openstack-helm/tenant-ceph/osd/osd-sdb + location: /var/lib/tenant-ceph/journal/osd-one ... diff --git a/site/intel-pod17/software/charts/ucp/ceph/ceph-client-update.yaml b/type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml similarity index 100% rename from site/intel-pod17/software/charts/ucp/ceph/ceph-client-update.yaml rename to type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml diff --git a/site/intel-pod17/software/charts/ucp/ceph/ceph-client.yaml b/type/cntt/software/charts/ucp/ceph/ceph-client.yaml similarity index 100% rename from site/intel-pod17/software/charts/ucp/ceph/ceph-client.yaml rename to type/cntt/software/charts/ucp/ceph/ceph-client.yaml diff --git a/site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml b/type/cntt/software/charts/ucp/ceph/ceph-osd.yaml similarity index 80% rename from site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml rename to type/cntt/software/charts/ucp/ceph/ceph-osd.yaml index 8cf291a..25297d9 100644 --- a/site/intel-pod17/software/charts/ucp/ceph/ceph-osd.yaml +++ b/type/cntt/software/charts/ucp/ceph/ceph-osd.yaml @@ -22,9 +22,9 @@ data: storage: osd: - data: - type: block-logical - location: /dev/sdb + type: directory + location: /var/lib/ceph/osd/osd-one journal: type: directory - location: /var/lib/openstack-helm/ceph/osd/osd-sdb + location: /var/lib/ceph/journal/osd-one ... diff --git a/type/cntt/software/charts/ucp/comps/chart-group.yaml b/type/cntt/software/charts/ucp/drydock/chart-group.yaml similarity index 100% rename from type/cntt/software/charts/ucp/comps/chart-group.yaml rename to type/cntt/software/charts/ucp/drydock/chart-group.yaml diff --git a/type/cntt/software/charts/ucp/comps/drydock.yaml b/type/cntt/software/charts/ucp/drydock/drydock.yaml similarity index 100% rename from type/cntt/software/charts/ucp/comps/drydock.yaml rename to type/cntt/software/charts/ucp/drydock/drydock.yaml diff --git a/type/cntt/software/charts/ucp/comps/maas-scaled.yaml b/type/cntt/software/charts/ucp/drydock/maas-scaled.yaml similarity index 100% rename from type/cntt/software/charts/ucp/comps/maas-scaled.yaml rename to type/cntt/software/charts/ucp/drydock/maas-scaled.yaml diff --git a/type/cntt/software/charts/ucp/comps/maas.yaml b/type/cntt/software/charts/ucp/drydock/maas.yaml similarity index 100% rename from type/cntt/software/charts/ucp/comps/maas.yaml rename to type/cntt/software/charts/ucp/drydock/maas.yaml