From e28d0a1313b4ba797123fbd14fe3ec5bf416abc3 Mon Sep 17 00:00:00 2001 From: James Gu Date: Wed, 7 Aug 2019 00:40:39 +0000 Subject: [PATCH] Add new airskiff type Create a site type called skiff and point airskiff site to be based on the new type. This will help to reduce the duplication when creating airskiff-suse site in subsequent commit. Change-Id: Ie9cd6d0e572a4556ee6ff5c3d37f20349c2d7de3 --- global/software/config/versions.yaml | 20 +- .../baremetal/bootactions/promjoin.yaml | 34 -- site/airskiff/baremetal/nodes.yaml | 256 --------------- site/airskiff/networks/physical/networks.yaml | 302 ------------------ site/airskiff/profiles/genesis.yaml | 51 --- .../airskiff/profiles/hardware/dell_r720.yaml | 78 ----- site/airskiff/profiles/host/cp_r720.yaml | 232 -------------- site/airskiff/profiles/host/dp_r720.yaml | 93 ------ site/airskiff/profiles/region.yaml | 55 ---- site/airskiff/site-definition.yaml | 2 +- .../kubernetes/container-networking/etcd.yaml | 161 ---------- .../software/charts/kubernetes/etcd/etcd.yaml | 165 ---------- .../charts/kubernetes/ingress/ingress.yaml | 20 -- .../osh-infra-logging/elasticsearch.yaml | 18 -- .../osh-infra-logging/fluentbit.yaml | 18 -- .../osh-infra/osh-infra-logging/fluentd.yaml | 18 -- .../openstack-compute-kit/chart-group.yaml | 23 -- .../osh/openstack-glance/chart-group.yaml | 21 -- .../osh/openstack-heat/chart-group.yaml | 21 -- .../chart-group.yaml | 19 -- .../osh/openstack-keystone/chart-group.yaml | 21 -- .../osh/openstack-mariadb/chart-group.yaml | 19 -- .../osh/openstack-rabbitmq/chart-group.yaml | 21 -- .../charts/ucp/ceph/ceph-client-update.yaml | 28 -- .../software/charts/ucp/ceph/ceph-client.yaml | 27 -- .../software/charts/ucp/ceph/ceph-osd.yaml | 79 ----- .../charts/ucp/divingbell/divingbell.yaml | 55 ---- .../software/charts/ucp/drydock/maas.yaml | 26 -- .../charts/ucp/promenade/promenade.yaml | 52 --- site/airskiff/software/config/versions.yaml | 30 ++ .../developer/030-armada-bootstrap.sh | 2 +- tools/gate/manifests/full-site.yaml | 9 +- .../gate/playbooks/airskiff-reduce-site.yaml | 2 +- .../osh/openstack-compute-kit/libvirt.yaml | 7 +- .../osh/openstack-compute-kit/neutron.yaml | 7 +- .../osh/openstack-compute-kit/nova.yaml | 4 +- .../charts/osh/openstack-glance/glance.yaml | 7 +- .../openstack-ingress-controller/ingress.yaml | 7 +- .../osh/openstack-keystone/keystone.yaml | 7 +- .../charts/osh/openstack-mariadb/mariadb.yaml | 7 +- .../osh/openstack-rabbitmq/rabbitmq.yaml | 7 +- .../skiff}/charts/ucp/armada/armada.yaml | 7 +- .../skiff}/charts/ucp/armada/chart-group.yaml | 4 +- .../skiff}/charts/ucp/core/ingress.yaml | 4 +- .../skiff}/charts/ucp/core/mariadb.yaml | 4 +- .../skiff}/charts/ucp/core/postgresql.yaml | 4 +- .../skiff}/charts/ucp/core/rabbitmq.yaml | 4 +- .../skiff}/charts/ucp/deckhand/barbican.yaml | 4 +- .../skiff}/charts/ucp/deckhand/deckhand.yaml | 7 +- .../skiff}/charts/ucp/keystone/keystone.yaml | 4 +- .../skiff}/charts/ucp/shipyard/shipyard.yaml | 8 +- .../skiff}/config/endpoints.yaml | 8 +- .../skiff}/config/service_accounts.yaml | 8 +- .../skiff/manifests/bootstrap.yaml | 12 +- .../skiff}/manifests/full-site.yaml | 21 +- .../skiff}/networks/common-addresses.yaml | 2 +- .../secrets/certificates/certificates.yaml | 164 +++++----- .../skiff}/secrets/certificates/ingress.yaml | 6 +- .../apiserver-encryption-key-key1.yaml | 2 +- .../skiff}/secrets/passphrases/ceph_fsid.yaml | 2 +- .../ceph_swift_keystone_password.yaml | 2 +- .../passphrases/ipmi_admin_password.yaml | 2 +- .../secrets/passphrases/maas-region-key.yaml | 2 +- .../osh_barbican_oslo_db_password.yaml | 2 +- .../passphrases/osh_barbican_password.yaml | 2 +- .../osh_cinder_oslo_db_password.yaml | 2 +- .../passphrases/osh_cinder_password.yaml | 2 +- .../osh_glance_oslo_db_password.yaml | 2 +- .../passphrases/osh_glance_password.yaml | 2 +- .../osh_heat_oslo_db_password.yaml | 2 +- .../passphrases/osh_heat_password.yaml | 2 +- .../osh_heat_stack_user_password.yaml | 2 +- .../osh_heat_trustee_password.yaml | 2 +- .../osh_horizon_oslo_db_password.yaml | 2 +- ...sh_infra_elasticsearch_admin_password.yaml | 2 +- .../osh_infra_grafana_admin_password.yaml | 2 +- .../osh_infra_grafana_oslo_db_password.yaml | 2 +- ...nfra_grafana_oslo_db_session_password.yaml | 2 +- .../osh_infra_nagios_admin_password.yaml | 2 +- ...osh_infra_openstack_exporter_password.yaml | 2 +- .../osh_infra_oslo_db_admin_password.yaml | 2 +- .../osh_infra_oslo_db_exporter_password.yaml | 2 +- .../osh_infra_prometheus_admin_password.yaml | 2 +- .../osh_infra_rgw_s3_admin_access_key.yaml | 2 +- .../osh_infra_rgw_s3_admin_secret_key.yaml | 2 +- ...infra_rgw_s3_elasticsearch_access_key.yaml | 2 +- ...infra_rgw_s3_elasticsearch_secret_key.yaml | 2 +- .../osh_keystone_admin_password.yaml | 2 +- .../osh_keystone_ldap_password.yaml | 2 +- .../osh_keystone_oslo_db_password.yaml | 2 +- .../osh_neutron_oslo_db_password.yaml | 2 +- .../passphrases/osh_neutron_password.yaml | 2 +- ...osh_nova_metadata_proxy_shared_secret.yaml | 2 +- .../osh_nova_oslo_db_password.yaml | 2 +- .../passphrases/osh_nova_password.yaml | 2 +- .../osh_oslo_cache_secret_key.yaml | 2 +- .../osh_oslo_db_admin_password.yaml | 2 +- .../osh_oslo_db_exporter_password.yaml | 2 +- .../osh_oslo_messaging_password.yaml | 2 +- .../passphrases/osh_placement_password.yaml | 2 +- .../osh_rabbitmq_erlang_cookie.yaml | 2 +- .../passphrases/osh_tempest_password.yaml | 2 +- .../secrets/passphrases/tenant_ceph_fsid.yaml | 2 +- .../passphrases/ubuntu_crypt_password.yaml | 2 +- .../ucp_airflow_oslo_messaging_password.yaml | 2 +- .../ucp_airflow_postgres_password.yaml | 2 +- .../ucp_armada_keystone_password.yaml | 2 +- .../ucp_barbican_keystone_password.yaml | 2 +- .../ucp_barbican_oslo_db_password.yaml | 2 +- .../ucp_deckhand_keystone_password.yaml | 2 +- .../ucp_deckhand_postgres_password.yaml | 2 +- .../ucp_drydock_keystone_password.yaml | 2 +- .../ucp_drydock_postgres_password.yaml | 2 +- .../ucp_keystone_admin_password.yaml | 2 +- .../ucp_keystone_oslo_db_password.yaml | 2 +- .../passphrases/ucp_maas_admin_password.yaml | 2 +- .../ucp_maas_postgres_password.yaml | 2 +- ..._openstack_exporter_keystone_password.yaml | 2 +- .../ucp_oslo_db_admin_password.yaml | 2 +- .../ucp_oslo_messaging_password.yaml | 2 +- .../ucp_postgres_admin_password.yaml | 2 +- .../ucp_postgres_exporter_password.yaml | 2 +- .../ucp_postgres_replication_password.yaml | 2 +- .../ucp_promenade_keystone_password.yaml | 2 +- .../ucp_rabbitmq_erlang_cookie.yaml | 2 +- .../ucp_shipyard_keystone_password.yaml | 2 +- .../ucp_shipyard_postgres_password.yaml | 2 +- 127 files changed, 302 insertions(+), 2138 deletions(-) delete mode 100644 site/airskiff/baremetal/bootactions/promjoin.yaml delete mode 100644 site/airskiff/baremetal/nodes.yaml delete mode 100644 site/airskiff/networks/physical/networks.yaml delete mode 100644 site/airskiff/profiles/genesis.yaml delete mode 100644 site/airskiff/profiles/hardware/dell_r720.yaml delete mode 100644 site/airskiff/profiles/host/cp_r720.yaml delete mode 100644 site/airskiff/profiles/host/dp_r720.yaml delete mode 100644 site/airskiff/profiles/region.yaml delete mode 100644 site/airskiff/software/charts/kubernetes/container-networking/etcd.yaml delete mode 100644 site/airskiff/software/charts/kubernetes/etcd/etcd.yaml delete mode 100644 site/airskiff/software/charts/kubernetes/ingress/ingress.yaml delete mode 100644 site/airskiff/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml delete mode 100644 site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentbit.yaml delete mode 100644 site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentd.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-ingress-controller/chart-group.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-mariadb/chart-group.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml delete mode 100644 site/airskiff/software/charts/ucp/ceph/ceph-client-update.yaml delete mode 100644 site/airskiff/software/charts/ucp/ceph/ceph-client.yaml delete mode 100644 site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml delete mode 100644 site/airskiff/software/charts/ucp/divingbell/divingbell.yaml delete mode 100644 site/airskiff/software/charts/ucp/drydock/maas.yaml delete mode 100644 site/airskiff/software/charts/ucp/promenade/promenade.yaml create mode 100644 site/airskiff/software/config/versions.yaml rename {site/airskiff/software => type/skiff}/charts/osh/openstack-compute-kit/libvirt.yaml (84%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-compute-kit/neutron.yaml (93%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-compute-kit/nova.yaml (95%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-glance/glance.yaml (86%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-ingress-controller/ingress.yaml (74%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-keystone/keystone.yaml (79%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-mariadb/mariadb.yaml (80%) rename {site/airskiff/software => type/skiff}/charts/osh/openstack-rabbitmq/rabbitmq.yaml (81%) rename {site/airskiff/software => type/skiff}/charts/ucp/armada/armada.yaml (83%) rename {site/airskiff/software => type/skiff}/charts/ucp/armada/chart-group.yaml (84%) rename {site/airskiff/software => type/skiff}/charts/ucp/core/ingress.yaml (87%) rename {site/airskiff/software => type/skiff}/charts/ucp/core/mariadb.yaml (87%) rename {site/airskiff/software => type/skiff}/charts/ucp/core/postgresql.yaml (86%) rename {site/airskiff/software => type/skiff}/charts/ucp/core/rabbitmq.yaml (88%) rename {site/airskiff/software => type/skiff}/charts/ucp/deckhand/barbican.yaml (86%) rename {site/airskiff/software => type/skiff}/charts/ucp/deckhand/deckhand.yaml (83%) rename {site/airskiff/software => type/skiff}/charts/ucp/keystone/keystone.yaml (86%) rename {site/airskiff/software => type/skiff}/charts/ucp/shipyard/shipyard.yaml (83%) rename {site/airskiff/software => type/skiff}/config/endpoints.yaml (99%) rename {site/airskiff/software => type/skiff}/config/service_accounts.yaml (99%) rename site/airskiff/software/manifests/ucp-bootstrap.yaml => type/skiff/manifests/bootstrap.yaml (58%) rename {site/airskiff/software => type/skiff}/manifests/full-site.yaml (54%) rename {site/airskiff => type/skiff}/networks/common-addresses.yaml (99%) rename {site/airskiff => type/skiff}/secrets/certificates/certificates.yaml (99%) rename {site/airskiff => type/skiff}/secrets/certificates/ingress.yaml (99%) rename {site/airskiff => type/skiff}/secrets/passphrases/apiserver-encryption-key-key1.yaml (94%) rename {site/airskiff => type/skiff}/secrets/passphrases/ceph_fsid.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/ceph_swift_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ipmi_admin_password.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/maas-region-key.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_barbican_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_barbican_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_cinder_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_cinder_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_glance_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_glance_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_heat_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_heat_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_heat_stack_user_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_heat_trustee_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_horizon_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_grafana_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_nagios_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_openstack_exporter_password.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_prometheus_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_keystone_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_keystone_ldap_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_keystone_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_neutron_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_neutron_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_nova_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_nova_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_oslo_cache_secret_key.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_oslo_db_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_oslo_db_exporter_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_oslo_messaging_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_placement_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/osh_tempest_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/tenant_ceph_fsid.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/ubuntu_crypt_password.yaml (95%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_airflow_postgres_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_armada_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_barbican_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_barbican_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_deckhand_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_deckhand_postgres_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_drydock_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_drydock_postgres_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_keystone_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_keystone_oslo_db_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_maas_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_maas_postgres_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml (93%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_oslo_db_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_oslo_messaging_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_postgres_admin_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_postgres_exporter_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_postgres_replication_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_promenade_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_shipyard_keystone_password.yaml (92%) rename {site/airskiff => type/skiff}/secrets/passphrases/ucp_shipyard_postgres_password.yaml (92%) diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index f45a650cd..6e2498eed 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -1,4 +1,14 @@ --- +schema: pegleg/SoftwareVersions/v1 +metadata: + schema: metadata/Document/v1 + name: software-versions + labels: + name: software-versions-global + layeringDefinition: + abstract: false + layer: global + storagePolicy: cleartext data: charts: kubernetes: @@ -737,14 +747,4 @@ data: url: http://us.archive.ubuntu.com/ubuntu unnamed: - ceph-common -metadata: - labels: - name: software-versions-global - layeringDefinition: - abstract: false - layer: global - name: software-versions - schema: metadata/Document/v1 - storagePolicy: cleartext -schema: pegleg/SoftwareVersions/v1 ... diff --git a/site/airskiff/baremetal/bootactions/promjoin.yaml b/site/airskiff/baremetal/bootactions/promjoin.yaml deleted file mode 100644 index 2890c3a7e..000000000 --- a/site/airskiff/baremetal/bootactions/promjoin.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# This file defines a boot action which is responsible for fetching the node's -# promjoin script from the promenade API. This is the script responsible for -# installing kubernetes on the node and joining the kubernetes cluster. -# #GLOBAL-CANDIDATE# -schema: 'drydock/BootAction/v1' -metadata: - schema: 'metadata/Document/v1' - name: promjoin - storagePolicy: 'cleartext' - layeringDefinition: - abstract: false - layer: site - labels: - application: 'drydock' -data: - signaling: false - # TODO(alanmeadows) move what is global about this document - assets: - - path: /opt/promjoin.sh - type: file - permissions: '555' - # The ip= parameter must match the MaaS network name of the network used - # to contact kubernetes. With a standard, reference Airship deployment where - # L2 networks are shared between all racks, the network name (i.e. calico) - # should be correct. - location: promenade+http://promenade-api.ucp.svc.cluster.local/api/v1.0/join-scripts?design_ref={{ action.design_ref | urlencode }}&hostname={{ node.hostname }}&ip={{ node.network.calico.ip }}{% for k, v in node.labels.items() %}&labels.dynamic={{ k }}={{ v }}{% endfor %} - location_pipeline: - - template - data_pipeline: - - utf8_decode -... diff --git a/site/airskiff/baremetal/nodes.yaml b/site/airskiff/baremetal/nodes.yaml deleted file mode 100644 index b0da59e8d..000000000 --- a/site/airskiff/baremetal/nodes.yaml +++ /dev/null @@ -1,256 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# Drydock BaremetalNode resources for a specific rack are stored in this file. -# -# NOTE: For new sites, you should complete the networks/physical/networks.yaml -# file before working on this file. -# -# In this file, you should make the number of `drydock/BaremetalNode/v1` -# resources equal the number of bare metal nodes you have, either by deleting -# excess BaremetalNode definitions (if there are too many), or by copying and -# pasting the last BaremetalNode in the file until you have the correct number -# of baremetal nodes (if there are too few). -# -# Then in each file, address all additional NEWSITE-CHANGEME markers to update -# the data in these files with the right values for your new site. -# -# *NOTE: The Genesis node is counted as one of the control plane nodes. Note -# that the Genesis node does not appear on this bare metal list, because the -# procedure to reprovision the Genesis host with MaaS has not yet been -# implemented. Therefore there will be only three bare metal nodes in this file -# with the 'masters' tag, as the genesis roles are assigned in a difference -# place (profiles/genesis.yaml). -# NOTE: The host profiles for the control plane are further divided into two -# variants: primary and secondary. The only significance this has is that the -# "primary" nodes are active Ceph nodes, whereas the "secondary" nodes are Ceph -# standby nodes. For Ceph quorum, this means that the control plane split will -# be 3 primary + 1 standby host profile, and the Genesis node counts toward one -# of the 3 primary profiles. Other control plane services are not affected by -# primary vs secondary designation. -# -# TODO: Include the hostname naming convention -# -schema: 'drydock/BaremetalNode/v1' -metadata: - schema: 'metadata/Document/v1' - # NEWSITE-CHANGEME: Replace with the hostname of the first node in the rack, - # after (excluding) genesis. - name: cab23-r720-12 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: The IPv4 address assigned to each logical network on this - # node. In the reference Airship deployment, this is all logical Networks defined - # in networks/physical/networks.yaml. IP addresses are manually assigned, by-hand. - # (what could possibly go wrong!) The instructions differ for each logical - # network, which are laid out below. - addressing: - # The iDrac/iLo IP of the node. It's important that this match up with the - # node's hostname above, so that the rack number and node position encoded - # in the hostname are accurate and matching the node that IPMI operations - # will be performed against (for poweron, poweroff, PXE boot to wipe disk or - # reconfigure identity, etc - very important to get right for these reasons). - # These addresses should already be assigned to nodes racked and stacked in - # the environment; these are not addresses which MaaS assigns. - - network: oob - address: 10.23.104.12 - # The IP of the node on the PXE network. Refer to the static IP range - # defined for the PXE network in networks/physical/networks.yaml. Begin allocating - # IPs from this network, starting with the second IP (inclusive) from the - # allocation range of this subnet (Genesis node will have the first IP). - # Ex: If the start IP for the PXE "static" network is 10.23.20.11, then - # genesis will have 10.23.20.11, this node will have 10.23.20.12, and - # so on with incrementing IP addresses with each additional node. - - network: pxe - address: 10.23.20.12 - # Genesis node gets first IP, all other nodes increment IPs from there - # within the allocation range defined for the network in - # networks/physical/networks.yaml - - network: oam - address: 10.23.21.12 - # Genesis node gets first IP, all other nodes increment IPs from there - # within the allocation range defined for the network in - # networks/physical/networks.yaml - - network: storage - address: 10.23.23.12 - # Genesis node gets first IP, all other nodes increment IPs from there - # within the allocation range defined for the network in - # networks/physical/networks.yaml - - network: overlay - address: 10.23.24.12 - # Genesis node gets first IP, all other nodes increment IPs from there - # within the allocation range defined for the network in - # networks/physical/networks.yaml - - network: calico - address: 10.23.22.12 - # NEWSITE-CHANGEME: Set the host profile for the node. - # Note that there are different host profiles depending if this is a control - # plane vs data plane node, and different profiles that map to different types - # hardware. Control plane host profiles are further broken down into "primary" - # and "secondary" profiles (refer to the Notes section at the top of this doc). - # Select the host profile that matches up to your type of - # hardware and function. E.g., the r720 here refers to Dell R720 hardware, the - # 'cp' refers to a control plane profile, and the "primary" means it will be - # an active member in the ceph quorum. Refer to profiles/host/ for the list - # of available host profiles specific to this site (otherwise, you may find - # a general set of host profiles at the "type" or "global" layers/folders. - # If you have hardware that is not on this list of profiles, you may need to - # create a new host profile for that hardware. - # Regarding control plane vs other data plane profiles, refer to the notes at - # the beginning of this file. There should be one control plane node per rack, - # including Genesis. Note Genesis won't actually be listed in this file as a - # BaremetalNode, but the rest are. - # This is the second "primary" control plane node after Genesis. - host_profile: cp_r720-primary - metadata: - tags: - # NEWSITE-CHANGEME: See previous comment. Apply 'masters' tag for control - # plane node, and 'workers' tag for data plane hosts. - - 'masters' - # NEWSITE-CHANGEME: Refer to site engineering package or other supporting - # documentation for the specific rack name. This should be a rack name that - # is meaningful to data center personnel (i.e. a rack they could locate if - # you gave them this rack designation). - rack: cab23 -... ---- -schema: 'drydock/BaremetalNode/v1' -metadata: - schema: 'metadata/Document/v1' - # NEWSITE-CHANGEME: The next node's hostname - name: cab23-r720-13 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: The next node's IPv4 addressing - addressing: - - network: oob - address: 10.23.104.13 - - network: pxe - address: 10.23.20.13 - - network: oam - address: 10.23.21.13 - - network: storage - address: 10.23.23.13 - - network: overlay - address: 10.23.24.13 - - network: calico - address: 10.23.22.13 - # NEWSITE-CHANGEME: The next node's host profile - host_profile: cp_r720-primary - metadata: - # NEWSITE-CHANGEME: The next node's rack designation - rack: cab23 - # NEWSITE-CHANGEME: The next node's role desigatnion - tags: - - 'masters' -... ---- -schema: 'drydock/BaremetalNode/v1' -metadata: - schema: 'metadata/Document/v1' - # NEWSITE-CHANGEME: The next node's hostname - name: cab23-r720-14 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: The next node's IPv4 addressing - addressing: - - network: oob - address: 10.23.104.14 - - network: pxe - address: 10.23.20.14 - - network: oam - address: 10.23.21.14 - - network: storage - address: 10.23.23.14 - - network: overlay - address: 10.23.24.14 - - network: calico - address: 10.23.22.14 - # NEWSITE-CHANGEME: The next node's host profile - # This is the third "primary" control plane profile after genesis - host_profile: dp_r720 - metadata: - # NEWSITE-CHANGEME: The next node's rack designation - rack: cab23 - # NEWSITE-CHANGEME: The next node's role desigatnion - tags: - - 'workers' -... ---- -schema: 'drydock/BaremetalNode/v1' -metadata: - schema: 'metadata/Document/v1' - # NEWSITE-CHANGEME: The next node's hostname - name: cab23-r720-17 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: The next node's IPv4 addressing - addressing: - - network: oob - address: 10.23.104.17 - - network: pxe - address: 10.23.20.17 - - network: oam - address: 10.23.21.17 - - network: storage - address: 10.23.23.17 - - network: overlay - address: 10.23.24.17 - - network: calico - address: 10.23.22.17 - # NEWSITE-CHANGEME: The next node's host profile - # This is the one and only appearance of the "secondary" control plane profile - host_profile: dp_r720 - metadata: - # NEWSITE-CHANGEME: The next node's rack designation - rack: cab23 - # NEWSITE-CHANGEME: The next node's role desigatnion - tags: - - 'workers' -... ---- -schema: 'drydock/BaremetalNode/v1' -metadata: - schema: 'metadata/Document/v1' - # NEWSITE-CHANGEME: The next node's hostname - name: cab23-r720-19 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: The next node's IPv4 addressing - addressing: - - network: oob - address: 10.23.104.19 - - network: pxe - address: 10.23.20.19 - - network: oam - address: 10.23.21.19 - - network: storage - address: 10.23.23.19 - - network: overlay - address: 10.23.24.19 - - network: calico - address: 10.23.22.19 - # NEWSITE-CHANGEME: The next node's host profile - host_profile: dp_r720 - metadata: - # NEWSITE-CHANGEME: The next node's rack designation - rack: cab23 - # NEWSITE-CHANGEME: The next node's role desigatnion - tags: - - 'workers' -... diff --git a/site/airskiff/networks/physical/networks.yaml b/site/airskiff/networks/physical/networks.yaml deleted file mode 100644 index 23ab97bb3..000000000 --- a/site/airskiff/networks/physical/networks.yaml +++ /dev/null @@ -1,302 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to define all of the NetworkLinks (i.e. layer 1 -# devices) and Networks (i.e. layer 3 configurations). The following is standard -# for the logical networks in Airship: -# -# +----------+-----------------------------------+----------------+--------------+----------------------------------------------------+-----------------+ -# | Network | | Per-rack or | | | VLAN tagged | -# | Name | Purpose | per-site CIDR? | Has gateway? | Bond | or untagged? | -# +----------+-----------------------------------+----------------+--------------+----------------------------------------------------+-----------------+ -# | oob | Out of Band devices (iDrac/iLo) | per-site CIDR | Has gateway | No bond, N/A | Untagged/Native | -# | pxe | PXE boot network | per-site CIDR | No gateway | No bond, no LACP fallback. Dedicated PXE interface | Untagged/Native | -# | oam | management network | per-site CIDR | Has gateway | member of bond0 | tagged | -# | storage | storage network | per-site CIDR | No gateway | member of bond0 | tagged | -# | calico | underlay calico net; k8s traffic | per-site CIDR | No gateway | member of bond0 | tagged | -# | overlay | overlay network for openstack SDN | per-site CIDR | No gateway | member of bond0 | tagged | -# +----------+-----------------------------------+----------------+--------------+----------------------------------------------------+-----------------+ -# -# For standard Airship deployments, you should not need to modify the number of -# NetworkLinks and Networks in this file. Only the IP addresses and CIDRs should -# need editing. -# -# TODO: Given that we expect all network broadcast domains to span all racks in -# Airship, we should choose network names that do not include the rack number. -# -# TODO: FQDN naming standards for hosts -# -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: oob - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # MaaS doesnt own this network like it does the others, so the noconfig label - # is specified. - labels: - noconfig: enabled - bonding: - mode: disabled - mtu: 1500 - linkspeed: auto - trunking: - mode: disabled - default_network: oob - allowed_networks: - - oob -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: oob - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Update with the site's out-of-band CIDR - cidr: 10.23.104.0/24 - routes: - # NEWSITE-CHANGEME: Update with the site's out-of-band gateway IP - - subnet: '0.0.0.0/0' - gateway: 10.23.104.1 - metric: 100 - # NEWSITE-CHANGEME: Update with the site's out-of-band IP allocation range - # FIXME: Is this IP range actually used/allocated for anything? The HW already - # has its OOB IPs assigned. None of the Ubuntu OS's should need IPs on OOB - # network either, as they should be routable via the default gw on OAM network - ranges: - - type: static - start: 10.23.104.11 - end: 10.23.104.21 -... ---- -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: pxe - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - bonding: - mode: disabled - mtu: 1500 - linkspeed: auto - trunking: - mode: disabled - default_network: pxe - allowed_networks: - - pxe -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: pxe - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Update with the site's PXE network CIDR - # NOTE: The CIDR minimum size = (number of nodes * 2) + 10 - cidr: 10.23.20.0/24 - routes: - - subnet: 0.0.0.0/0 - # NEWSITE-CHANGEME: Set the OAM network gateway IP address - gateway: 10.23.20.1 - metric: 100 - # NOTE: The first 10 IPs in the subnet are reserved for network infrastructure. - # The remainder of the range is divided between two subnets of equal size: - # one static, and one DHCP. - # The DHCP addresses are used when nodes perform a PXE boot (DHCP address gets - # assigned), and when a node is commissioning in MaaS (also uses DHCP to get - # its IP address). However, when MaaS installs the operating system - # ("Deploying/Deployed" states), it will write a static IP assignment to - # /etc/network/interfaces[.d] with IPs from the "static" subnet defined here. - ranges: - # NEWSITE-CHANGEME: Update to the first 10 IPs in the CIDR - - type: reserved - start: 10.23.20.1 - end: 10.23.20.10 - # NEWSITE-CHANGEME: Update to the first half of the remaining range after - # excluding the 10 reserved IPs. - - type: static - start: 10.23.20.11 - end: 10.23.20.21 - # NEWSITE-CHANGEME: Update to the second half of the remaining range after - # excluding the 10 reserved IPs. - - type: dhcp - start: 10.23.20.40 - end: 10.23.20.80 - dns: - # NEWSITE-CHANGEME: FQDN for bare metal nodes. - # Choose FQDN according to the node FQDN naming conventions at the top of - # this document. - domain: atlantafoundry.com - # List of upstream DNS forwards. Verify you can reach them from your - # environment. If so, you should not need to change them. - # TODO: This should be populated via substitution from common-addresses - servers: '8.8.8.8,8.8.4.4,208.67.222.222' -... ---- -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: data - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - bonding: - mode: 802.3ad - hash: layer3+4 - peer_rate: fast - mon_rate: 100 - up_delay: 1000 - down_delay: 3000 - # NEWSITE-CHANGEME: Ensure the network switches in the environment are - # configured for this MTU or greater. Even if switches are configured for or - # can support a slightly higher MTU, there is no need (and negliable benefit) - # to squeeze every last byte into the MTU (e.g., 9216 vs 9100). Leave MTU at - # 9100 for maximum compatibility. - mtu: 9100 - linkspeed: auto - trunking: - mode: 802.1q - allowed_networks: - - oam - - storage - - overlay - - calico -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: oam - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Set the VLAN ID which the OAM network is on - vlan: '21' - mtu: 9100 - # NEWSITE-CHANGEME: Set the CIDR for the OAM network - # NOTE: The CIDR minimum size = number of nodes + 10 - cidr: 10.23.21.0/24 - routes: - - subnet: 0.0.0.0/0 - # NEWSITE-CHANGEME: Set the OAM network gateway IP address - gateway: 10.23.21.1 - metric: 100 - ranges: - # NEWSITE-CHANGEME: Update to the first 10 IPs in the CIDR - - type: reserved - start: 10.23.21.1 - end: 10.23.21.10 - # NEWSITE-CHANGEME: Update to the remaining range after excluding the 10 - # 10 reserved IPs. - - type: static - start: 10.23.21.11 - end: 10.23.21.21 - dns: - # NEWSITE-CHANGEME: FQDN for bare metal nodes. - # Choose FQDN according to the node FQDN naming conventions at the top of - # this document. - domain: atlantafoundry.com - # List of upstream DNS forwards. Verify you can reach them from your - # environment. If so, you should not need to change them. - # TODO: This should be populated via substitution from common-addresses - servers: '8.8.8.8,8.8.4.4,208.67.222.222' -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: storage - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Set the VLAN ID which the storage network is on - vlan: '23' - mtu: 9100 - # NEWSITE-CHANGEME: Set the CIDR for the storage network - # NOTE: The CIDR minimum size = number of nodes + 10 - cidr: 10.23.23.0/24 - ranges: - # NEWSITE-CHANGEME: Update to the first 10 IPs in the CIDR - - type: reserved - start: 10.23.23.1 - end: 10.23.23.10 - # NEWSITE-CHANGEME: Update to the remaining range after excluding the 10 - # 10 reserved IPs. - - type: static - start: 10.23.23.11 - end: 10.23.23.21 -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: overlay - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Set the VLAN ID which the overlay network is on - vlan: '24' - mtu: 9100 - # NEWSITE-CHANGEME: Set the CIDR for the overlay network - # NOTE: The CIDR minimum size = number of nodes + 10 - cidr: 10.23.24.0/24 - ranges: - # NEWSITE-CHANGEME: Update to the first 10 IPs in the CIDR - - type: reserved - start: 10.23.24.1 - end: 10.23.24.10 - # NEWSITE-CHANGEME: Update to the remaining range after excluding the 10 - # 10 reserved IPs. - - type: static - start: 10.23.24.11 - end: 10.23.24.21 -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: calico - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Set the VLAN ID which the calico network is on - vlan: '22' - mtu: 9100 - # NEWSITE-CHANGEME: Set the CIDR for the calico network - # NOTE: The CIDR minimum size = number of nodes + 10 - cidr: 10.23.22.0/24 - ranges: - # NEWSITE-CHANGEME: Update to the first 10 IPs in the CIDR - - type: reserved - start: 10.23.22.1 - end: 10.23.22.10 - # NEWSITE-CHANGEME: Update to the remaining range after excluding the 10 - # 10 reserved IPs. - - type: static - start: 10.23.22.11 - end: 10.23.22.21 -... diff --git a/site/airskiff/profiles/genesis.yaml b/site/airskiff/profiles/genesis.yaml deleted file mode 100644 index 0b9ca7479..000000000 --- a/site/airskiff/profiles/genesis.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to apply proper labels to Genesis node so the -# proper services are installed and proper configuration applied. This should -# not need to be changed for a new site. -# #GLOBAL-CANDIDATE# -schema: promenade/Genesis/v1 -metadata: - schema: metadata/Document/v1 - name: genesis-site - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: genesis-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - labels: - dynamic: - - beta.kubernetes.io/fluentd-ds-ready=true - - calico-etcd=enabled - - ceph-mds=enabled - - ceph-mon=enabled - - ceph-osd=enabled - - ceph-rgw=enabled - - ceph-mgr=enabled - - ceph-bootstrap=enabled - - tenant-ceph-control-plane=enabled - - tenant-ceph-mon=enabled - - tenant-ceph-rgw=enabled - - tenant-ceph-mgr=enabled - - kube-dns=enabled - - kube-ingress=enabled - - kubernetes-apiserver=enabled - - kubernetes-controller-manager=enabled - - kubernetes-etcd=enabled - - kubernetes-scheduler=enabled - - promenade-genesis=enabled - - ucp-control-plane=enabled - - maas-rack=enabled - - maas-region=enabled - - ceph-osd-bootstrap=enabled - - openstack-control-plane=enabled - - openvswitch=enabled - - openstack-l3-agent=enabled - - node-exporter=enabled -... diff --git a/site/airskiff/profiles/hardware/dell_r720.yaml b/site/airskiff/profiles/hardware/dell_r720.yaml deleted file mode 100644 index 8bf966c9d..000000000 --- a/site/airskiff/profiles/hardware/dell_r720.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -schema: 'drydock/HardwareProfile/v1' -metadata: - schema: 'metadata/Document/v1' - name: dell_r720 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # Vendor of the server chassis - vendor: DELL - # Generation of the chassis model - generation: '8' - # Version of the chassis model within its generation - not version of the hardware definition - hw_version: '3' - # The certified version of the chassis BIOS - bios_version: '2.2.3' - # Mode of the default boot of hardware - bios, uefi - boot_mode: bios - # Protocol of boot of the hardware - pxe, usb, hdd - bootstrap_protocol: pxe - # Which interface to use for network booting within the OOB manager, not OS device - pxe_interface: 0 - # Map hardware addresses to aliases/roles to allow a mix of hardware configs - # in a site to result in a consistent configuration - device_aliases: - ## network - # eno1 - pxe_nic01: - address: '0000:01:00.0' - # type could identify expected hardware - used for hardware manifest validation - dev_type: 'I350 Gigabit Network Connection' - bus_type: 'pci' - # enp67s0f0 - data_nic01: - address: '0000:43:00.0' - dev_type: 'Ethernet 10G 2P X520 Adapter' - bus_type: 'pci' - # enp67s0f1 - data_nic02: - address: '0000:43:00.1' - dev_type: 'Ethernet 10G 2P X520 Adapter' - bus_type: 'pci' - # enp68s0f0 - data_nic03: - address: '0000:44:00.0' - dev_type: 'Ethernet 10G 2P X520 Adapter' - bus_type: 'pci' - # enp68s0f1 - data_nic04: - address: '0000:44:00.1' - dev_type: 'Ethernet 10G 2P X520 Adapter' - bus_type: 'pci' - ## storage - # /dev/sda - bootdisk: - address: '0:2.0.0' - dev_type: 'PERC H710P' - bus_type: 'scsi' - # /dev/sdb - cephjournal1: - address: '0:2.1.0' - dev_type: 'PERC H710P' - bus_type: 'scsi' - # /dev/sdc - cephjournal2: - address: '0:2.2.0' - dev_type: 'PERC H710P' - bus_type: 'scsi' - # /dev/sdc - ephemeral: - address: '0:2.3.0' - dev_type: 'PERC H710P' - bus_type: 'scsi' -... diff --git a/site/airskiff/profiles/host/cp_r720.yaml b/site/airskiff/profiles/host/cp_r720.yaml deleted file mode 100644 index 283bb8393..000000000 --- a/site/airskiff/profiles/host/cp_r720.yaml +++ /dev/null @@ -1,232 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The primary control plane host profile for Airship for DELL R720s, and -# should not need to be altered if you are using matching HW. The active -# participants in the Ceph cluster run on this profile. Other control plane -# services are not affected by primary vs secondary designation. -schema: drydock/HostProfile/v1 -metadata: - schema: metadata/Document/v1 - name: cp_r720-primary - storagePolicy: cleartext - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: cp-global - actions: - - method: replace - path: .interfaces - - method: replace - path: .storage - - method: merge - path: . -data: - hardware_profile: dell_r720 - - primary_network: oam - interfaces: - pxe: - device_link: pxe - slaves: - - pxe_nic01 - networks: - - pxe - bond0: - device_link: data - slaves: - - data_nic01 - - data_nic02 - - data_nic03 - - data_nic04 - networks: - - oam - - storage - - overlay - - calico - - storage: - physical_devices: - bootdisk: - labels: - bootdrive: 'true' - partitions: - - name: 'root' - size: '30g' - bootable: true - filesystem: - mountpoint: '/' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'boot' - size: '1g' - filesystem: - mountpoint: '/boot' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'var_log' - size: '100g' - filesystem: - mountpoint: '/var/log' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'var' - size: '>100g' - filesystem: - mountpoint: '/var' - fstype: 'ext4' - mount_options: 'defaults' - - - platform: - kernel: 'hwe-16.04' - kernel_params: - console: 'ttyS1,115200n8' - - metadata: - owner_data: - openstack-l3-agent: enabled -... ---- -schema: drydock/HostProfile/v1 -metadata: - schema: metadata/Document/v1 - name: cp_r740-secondary - storagePolicy: cleartext - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: cp-global - actions: - - method: replace - path: .interfaces - - method: replace - path: .storage - - method: replace - path: .metadata.owner_data - - method: merge - path: . -data: - hardware_profile: dell_r720 - - primary_network: oam - interfaces: - pxe: - device_link: pxe - slaves: - - pxe_nic01 - networks: - - pxe - bond0: - device_link: data - slaves: - - data_nic01 - - data_nic02 - - data_nic03 - - data_nic04 - networks: - - oam - - storage - - overlay - - calico - - storage: - physical_devices: - bootdisk: - labels: - bootdrive: 'true' - partitions: - - name: 'root' - size: '30g' - bootable: true - filesystem: - mountpoint: '/' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'boot' - size: '1g' - filesystem: - mountpoint: '/boot' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'var_log' - size: '100g' - filesystem: - mountpoint: '/var/log' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'var' - size: '>100g' - filesystem: - mountpoint: '/var' - fstype: 'ext4' - mount_options: 'defaults' - - - platform: - kernel: 'hwe-16.04' - kernel_params: - console: 'ttyS1,115200n8' - - metadata: - owner_data: - control-plane: enabled - ucp-control-plane: enabled - openstack-control-plane: enabled - openstack-heat: enabled - openstack-keystone: enabled - openstack-rabbitmq: enabled - openstack-dns-helper: enabled - openstack-mariadb: enabled - openstack-nova-control: enabled - # openstack-etcd: enabled - openstack-mistral: enabled - openstack-memcached: enabled - openstack-glance: enabled - openstack-horizon: enabled - openstack-cinder-control: enabled - openstack-cinder-volume: control - openstack-neutron: enabled - openvswitch: enabled - ucp-barbican: enabled - # ceph-mon: enabled - ceph-mgr: enabled - ceph-osd: enabled - ceph-mds: enabled - ceph-rgw: enabled - ucp-maas: enabled - kube-dns: enabled - tenant-ceph-control-plane: enabled - # tenant-ceph-mon: enabled - tenant-ceph-rgw: enabled - tenant-ceph-mgr: enabled - kubernetes-apiserver: enabled - kubernetes-controller-manager: enabled - # kubernetes-etcd: enabled - kubernetes-scheduler: enabled - tiller-helm: enabled - # kube-etcd: enabled - calico-policy: enabled - calico-node: enabled - # calico-etcd: enabled - ucp-armada: enabled - ucp-drydock: enabled - ucp-deckhand: enabled - ucp-shipyard: enabled - IAM: enabled - ucp-promenade: enabled - prometheus-server: enabled - prometheus-client: enabled - fluentd: enabled - influxdb: enabled - kibana: enabled - elasticsearch-client: enabled - elasticsearch-master: enabled - elasticsearch-data: enabled - postgresql: enabled - kube-ingress: enabled - beta.kubernetes.io/fluentd-ds-ready: 'true' - node-exporter: enabled -... diff --git a/site/airskiff/profiles/host/dp_r720.yaml b/site/airskiff/profiles/host/dp_r720.yaml deleted file mode 100644 index 1e4c5c46f..000000000 --- a/site/airskiff/profiles/host/dp_r720.yaml +++ /dev/null @@ -1,93 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The data plane host profile for Airship for DELL R720s, and should -# not need to be altered if you are using matching HW. The host profile is setup -# for cpu isolation (for nova pinning), hugepages, and sr-iov. -schema: drydock/HostProfile/v1 -metadata: - schema: metadata/Document/v1 - name: dp_r720 - storagePolicy: cleartext - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: dp-global - actions: - - method: replace - path: .interfaces - - method: replace - path: .storage - - method: merge - path: . -data: - hardware_profile: dell_r720 - - primary_network: oam - interfaces: - pxe: - device_link: pxe - slaves: - - pxe_nic01 - networks: - - pxe - bond0: - device_link: data - slaves: - - data_nic01 - - data_nic02 - - data_nic03 - - data_nic04 - networks: - - oam - - storage - - overlay - - calico - - storage: - physical_devices: - bootdisk: - labels: - bootdrive: 'true' - partitions: - - name: 'root' - size: '30g' - bootable: true - filesystem: - mountpoint: '/' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'boot' - size: '1g' - filesystem: - mountpoint: '/boot' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'var_log' - size: '100g' - filesystem: - mountpoint: '/var/log' - fstype: 'ext4' - mount_options: 'defaults' - - name: 'var' - size: '>100g' - filesystem: - mountpoint: '/var' - fstype: 'ext4' - mount_options: 'defaults' - - - ephemeral: - partitions: - - name: 'nova' - size: '99%' - filesystem: - mountpoint: '/var/lib/nova' - fstype: 'ext4' - mount_options: 'defaults' - platform: - kernel: 'hwe-16.04' - kernel_params: - console: 'ttyS1,115200n8' -... diff --git a/site/airskiff/profiles/region.yaml b/site/airskiff/profiles/region.yaml deleted file mode 100644 index 9db891bdb..000000000 --- a/site/airskiff/profiles/region.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to define the drydock Region, which in turn drives -# the MaaS region. -schema: 'drydock/Region/v1' -metadata: - schema: 'metadata/Document/v1' - # NEWSITE-CHANGEME: Replace with the site name - name: airskiff - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext - substitutions: - # 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 - # 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/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/seaworthy/secrets folder. - name: airship_ssh_public_key - path: . - - dest: - path: .repositories.main_archive - 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: . -data: - tag_definitions: [] - # This is the list of SSH keys which MaaS will register for the built-in - # "ubuntu" account during the PXE process. This list is populated by - # substitution, so the same SSH keys do not need to be repeated in multiple - # manifests. - authorized_keys: [] - repositories: - remove_unlisted: true -... diff --git a/site/airskiff/site-definition.yaml b/site/airskiff/site-definition.yaml index c53351092..2545796aa 100644 --- a/site/airskiff/site-definition.yaml +++ b/site/airskiff/site-definition.yaml @@ -8,5 +8,5 @@ metadata: name: airskiff storagePolicy: cleartext data: - site_type: single-node + site_type: skiff ... diff --git a/site/airskiff/software/charts/kubernetes/container-networking/etcd.yaml b/site/airskiff/software/charts/kubernetes/container-networking/etcd.yaml deleted file mode 100644 index 78bacdf84..000000000 --- a/site/airskiff/software/charts/kubernetes/container-networking/etcd.yaml +++ /dev/null @@ -1,161 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to build the list of calico etcd nodes and the -# calico etcd certs for those nodes in the environment. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kubernetes-calico-etcd - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: kubernetes-calico-etcd-global - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - # Generate a list of control plane nodes (i.e. genesis node + master node - # list) on which calico etcd will run and will need certs. It is assumed - # that Airship sites will have 4 control plane nodes, so this should not need to - # change for a new site. - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .genesis.hostname - dest: - path: .values.nodes[0].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[0].hostname - dest: - path: .values.nodes[1].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[1].hostname - dest: - path: .values.nodes[2].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[2].hostname - dest: - path: .values.nodes[3].name - - # Certificate substitutions for the node names assembled on the above list. - # NEWSITE-CHANGEME: Per above, the number of substitutions should not need - # to change with a standard Airship deployment. However, the names of each - # deckhand certficiate should be updated with the correct hostnames for your - # environment. The ordering is important (Genesis is index 0, then master - # nodes in the order they are specified in common-addresses). - - # Genesis hostname - cab23-r720-11 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-11 - path: . - dest: - path: .values.nodes[0].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-11 - path: . - dest: - path: .values.nodes[0].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-11-peer - path: . - dest: - path: .values.nodes[0].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-11-peer - path: . - dest: - path: .values.nodes[0].tls.peer.key - - # master node 1 hostname - cab23-r720-12 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-12 - path: . - dest: - path: .values.nodes[1].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-12 - path: . - dest: - path: .values.nodes[1].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-12-peer - path: . - dest: - path: .values.nodes[1].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-12-peer - path: . - dest: - path: .values.nodes[1].tls.peer.key - - # master node 2 hostname - cab23-r720-13 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-13 - path: . - dest: - path: .values.nodes[2].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-13 - path: . - dest: - path: .values.nodes[2].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-13-peer - path: . - dest: - path: .values.nodes[2].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-13-peer - path: . - dest: - path: .values.nodes[2].tls.peer.key - - # master node 3 hostname - cab23-r720-14 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-14 - path: . - dest: - path: .values.nodes[3].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-14 - path: . - dest: - path: .values.nodes[3].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-cab23-r720-14-peer - path: . - dest: - path: .values.nodes[3].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-cab23-r720-14-peer - path: $ - dest: - path: .values.nodes[3].tls.peer.key - -data: {} -... diff --git a/site/airskiff/software/charts/kubernetes/etcd/etcd.yaml b/site/airskiff/software/charts/kubernetes/etcd/etcd.yaml deleted file mode 100644 index 9f1bca355..000000000 --- a/site/airskiff/software/charts/kubernetes/etcd/etcd.yaml +++ /dev/null @@ -1,165 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to build the list of k8s etcd nodes and the -# k8s etcd certs for those nodes in the environment. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kubernetes-etcd - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: kubernetes-etcd-global - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - # Generate a list of control plane nodes (i.e. genesis node + master node - # list) on which k8s etcd will run and will need certs. It is assumed - # that Airship sites will have 4 control plane nodes, so this should not need to - # change for a new site. - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .genesis.hostname - dest: - path: .values.nodes[0].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[0].hostname - dest: - path: .values.nodes[1].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[1].hostname - dest: - path: .values.nodes[2].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[2].hostname - dest: - path: .values.nodes[3].name - - # Certificate substitutions for the node names assembled on the above list. - # NEWSITE-CHANGEME: Per above, the number of substitutions should not need - # to change with a standard Airship deployment. However, the names of each - # deckhand certficiate should be updated with the correct hostnames for your - # environment. The ordering is important (Genesis is index 0, then master - # nodes in the order they are specified in common-addresses). - - # Genesis Exception* - # *NOTE: This is an exception in that `genesis` is not the hostname of the - # genesis node, but `genesis` is reference here in the certificate names - # because of certain Promenade assumptions that may be addressed in the - # future. Therefore `genesis` is used instead of `cab23-r720-11` here. - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-genesis - path: . - dest: - path: .values.nodes[0].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-genesis - path: . - dest: - path: .values.nodes[0].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-genesis-peer - path: . - dest: - path: .values.nodes[0].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-genesis-peer - path: . - dest: - path: .values.nodes[0].tls.peer.key - - # master node 1 hostname - cab23-r720-12 - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-cab23-r720-12 - path: . - dest: - path: .values.nodes[1].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-cab23-r720-12 - path: . - dest: - path: .values.nodes[1].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-cab23-r720-12-peer - path: . - dest: - path: .values.nodes[1].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-cab23-r720-12-peer - path: . - dest: - path: .values.nodes[1].tls.peer.key - - # master node 2 hostname - cab23-r720-13 - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-cab23-r720-13 - path: . - dest: - path: .values.nodes[2].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-cab23-r720-13 - path: . - dest: - path: .values.nodes[2].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-cab23-r720-13-peer - path: . - dest: - path: .values.nodes[2].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-cab23-r720-13-peer - path: $ - dest: - path: .values.nodes[2].tls.peer.key - - # master node 3 hostname - cab23-r720-14 - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-cab23-r720-14 - path: . - dest: - path: .values.nodes[3].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-cab23-r720-14 - path: . - dest: - path: .values.nodes[3].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-cab23-r720-14-peer - path: . - dest: - path: .values.nodes[3].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-cab23-r720-14-peer - path: $ - dest: - path: .values.nodes[3].tls.peer.key - -data: {} -... diff --git a/site/airskiff/software/charts/kubernetes/ingress/ingress.yaml b/site/airskiff/software/charts/kubernetes/ingress/ingress.yaml deleted file mode 100644 index edb1dd505..000000000 --- a/site/airskiff/software/charts/kubernetes/ingress/ingress.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to define the environment-specific public-facing -# VIP for the ingress controller -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ingress-kube-system - layeringDefinition: - abstract: false - layer: site - parentSelector: - ingress: kube-system - actions: - - method: merge - path: . - storagePolicy: cleartext -data: {} -... diff --git a/site/airskiff/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/site/airskiff/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml deleted file mode 100644 index 58ba3b01d..000000000 --- a/site/airskiff/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: elasticsearch - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: elasticsearch-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: {} -... diff --git a/site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentbit.yaml b/site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentbit.yaml deleted file mode 100644 index d5b98bc0c..000000000 --- a/site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentbit.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: fluentbit - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: fluentbit-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: {} -... diff --git a/site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentd.yaml b/site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentd.yaml deleted file mode 100644 index f94b327c0..000000000 --- a/site/airskiff/software/charts/osh-infra/osh-infra-logging/fluentd.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: fluentd - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: fluentd-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: {} -... diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml deleted file mode 100644 index 72eed553a..000000000 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-compute-kit-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-compute-kit-chart-group-global - actions: - - method: merge - path: .sequenced - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - sequenced: false - chart_group: - - libvirt-airskiff - - openvswitch - - neutron-airskiff - - nova diff --git a/site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml deleted file mode 100644 index 0f0eec4bf..000000000 --- a/site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-glance-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-glance-chart-group-global - component: glance - actions: - - method: merge - path: .sequenced - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - sequenced: true - chart_group: - - glance-airskiff diff --git a/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml deleted file mode 100644 index 52dd4bc7e..000000000 --- a/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-heat-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-heat-chart-group-global - component: heat - actions: - - method: merge - path: .sequenced - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - sequenced: true - chart_group: - - heat diff --git a/site/airskiff/software/charts/osh/openstack-ingress-controller/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-ingress-controller/chart-group.yaml deleted file mode 100644 index aa7a9d7aa..000000000 --- a/site/airskiff/software/charts/osh/openstack-ingress-controller/chart-group.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-ingress-controller-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-ingress-controller-chart-group-global - component: ingress - actions: - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - chart_group: - - openstack-ingress-controller-airskiff -... diff --git a/site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml deleted file mode 100644 index d730cf99b..000000000 --- a/site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-keystone-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-keystone-chart-group-global - component: keystone - actions: - - method: merge - path: .sequenced - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - sequenced: true - chart_group: - - keystone-airskiff diff --git a/site/airskiff/software/charts/osh/openstack-mariadb/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-mariadb/chart-group.yaml deleted file mode 100644 index cf523e102..000000000 --- a/site/airskiff/software/charts/osh/openstack-mariadb/chart-group.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-mariadb-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-mariadb-chart-group-global - component: mariadb - actions: - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - chart_group: - - openstack-mariadb-airskiff -... diff --git a/site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml deleted file mode 100644 index b800bd099..000000000 --- a/site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-rabbitmq-airskiff - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: openstack-rabbitmq-chart-group-global - component: keystone - actions: - - method: merge - path: .sequenced - - method: replace - path: .chart_group - storagePolicy: cleartext -data: - sequenced: true - chart_group: - - openstack-rabbitmq-airskiff diff --git a/site/airskiff/software/charts/ucp/ceph/ceph-client-update.yaml b/site/airskiff/software/charts/ucp/ceph/ceph-client-update.yaml deleted file mode 100644 index 6f9ba1a7f..000000000 --- a/site/airskiff/software/charts/ucp/ceph/ceph-client-update.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# 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: 24 -... diff --git a/site/airskiff/software/charts/ucp/ceph/ceph-client.yaml b/site/airskiff/software/charts/ucp/ceph/ceph-client.yaml deleted file mode 100644 index 56025e19f..000000000 --- a/site/airskiff/software/charts/ucp/ceph/ceph-client.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# 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: 8 -... diff --git a/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml b/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml deleted file mode 100644 index b5f105f83..000000000 --- a/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml +++ /dev/null @@ -1,79 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# 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: - # NEWSITE-CHANGEME: The OSD count and configuration here should not need - # to change if your HW matches the HW used in this environment. - # Otherwise you may need to add or subtract disks to this list. - # no need to create below jounal partitons as ceph charts will create them - # default size of journal partions is 10GB - osd: - - data: - type: block-logical - location: /dev/sdd - journal: - type: block-logical - location: /dev/sdb1 - - data: - type: block-logical - location: /dev/sde - journal: - type: block-logical - location: /dev/sdb2 - - data: - type: block-logical - location: /dev/sdf - journal: - type: block-logical - location: /dev/sdb3 - - data: - type: block-logical - location: /dev/sdg - journal: - type: block-logical - location: /dev/sdb4 - - data: - type: block-logical - location: /dev/sdh - journal: - type: block-logical - location: /dev/sdc1 - - data: - type: block-logical - location: /dev/sdi - journal: - type: block-logical - location: /dev/sdc2 - - data: - type: block-logical - location: /dev/sdj - journal: - type: block-logical - location: /dev/sdc3 - - data: - type: block-logical - location: /dev/sdk - journal: - type: block-logical - location: /dev/sdc4 -... diff --git a/site/airskiff/software/charts/ucp/divingbell/divingbell.yaml b/site/airskiff/software/charts/ucp/divingbell/divingbell.yaml deleted file mode 100644 index a9048c3da..000000000 --- a/site/airskiff/software/charts/ucp/divingbell/divingbell.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to define site-specific parameters to the -# UAM-lite portion of the divingbell chart: -# 1. User accounts to create on bare metal -# 2. SSH public key for operationg system access to the bare metal -# 3. Passwords for operating system access via iDrac/iLo console. SSH password- -# based auth is disabled. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-divingbell - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-divingbell-global - actions: - - method: merge - path: . - labels: - name: ucp-divingbell-site - storagePolicy: cleartext - substitutions: - - dest: - path: .values.conf.uamlite.users[0].user_sshkeys[0] - src: - schema: deckhand/PublicKey/v1 - name: airship_ssh_public_key - path: . - - dest: - path: .values.conf.uamlite.users[0].user_crypt_passwd - src: - schema: deckhand/Passphrase/v1 - name: ubuntu_crypt_password - path: . - - dest: - path: .values.conf.uamlite.users[1].user_sshkeys[0] - src: - schema: deckhand/PublicKey/v1 - name: airship_ssh_public_key - path: . -data: - values: - conf: - uamlite: - users: - - user_name: ubuntu - user_sudo: true - user_sshkeys: [] - - user_name: airship - user_sudo: true - user_sshkeys: [] -... diff --git a/site/airskiff/software/charts/ucp/drydock/maas.yaml b/site/airskiff/software/charts/ucp/drydock/maas.yaml deleted file mode 100644 index af924e270..000000000 --- a/site/airskiff/software/charts/ucp/drydock/maas.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# This file defines site-specific deviations for MaaS. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-maas - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-maas-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - maas: - images: - default_os: 'ubuntu' - default_image: 'xenial' - default_kernel: 'hwe-16.04' -... diff --git a/site/airskiff/software/charts/ucp/promenade/promenade.yaml b/site/airskiff/software/charts/ucp/promenade/promenade.yaml deleted file mode 100644 index c49b50e88..000000000 --- a/site/airskiff/software/charts/ucp/promenade/promenade.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -# NOTE: This file is ignored by Airskiff and is copied from the seaworthy site. - -# The purpose of this file is to provide site-specific parameters for the ucp- -# promenade chart. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-promenade - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-promenade-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - env: - promenade_api: [] - # NEWSITE-CHANGEME: If your site uses an http proxy, enter it here. - # Otherwise comment out these lines. - # - name: http_proxy - # value: http://proxy.example.com:8080 - # NEWSITE-CHANGEME: If your site uses an https proxy, enter it here. - # Otherwise comment out these lines. - # - name: https_proxy - # value: http://proxy.example.com:8080 - # NEWSITE-CHANGEME: If your site uses an http/https proxy, enter the - # IPs / domain names which the proxy should not be used for (i.e. the - # cluster domain and kubernetes service_cidr defined in common-addresses) - # Otherwise comment out these lines. - # - name: no_proxy - # value: 10.36.0.1,.cluster.local - # NEWSITE-CHANGEME: If your site uses an http proxy, enter it here. - # Otherwise comment out these lines. - # - name: HTTP_PROXY - # value: http://proxy.example.com:8080 - # NEWSITE-CHANGEME: If your site uses an https proxy, enter it here. - # Otherwise comment out these lines. - # - name: HTTPS_PROXY - # value: http://proxy.example.com:8080 - # NEWSITE-CHANGEME: If your site uses an http/https proxy, enter the - # IPs / domain names which the proxy should not be used for (i.e. the - # cluster domain and kubernetes service_cidr defined in common-addresses) - # Otherwise comment out these lines. - # - name: NO_PROXY - # value: 10.36.0.1,.cluster.local -... diff --git a/site/airskiff/software/config/versions.yaml b/site/airskiff/software/config/versions.yaml new file mode 100644 index 000000000..4902edb2c --- /dev/null +++ b/site/airskiff/software/config/versions.yaml @@ -0,0 +1,30 @@ +--- +schema: pegleg/SoftwareVersions/v1 +metadata: + schema: metadata/Document/v1 + replacement: true + name: software-versions + labels: + name: software-versions-airskiff-ubuntu + layeringDefinition: + abstract: false + layer: site + parentSelector: + name: software-versions-global + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + images: + ucp: + armada: + api: "quay.io/airshipit/armada:latest-ubuntu_xenial" + deckhand: + deckhand: "quay.io/airshipit/deckhand:latest-ubuntu_xenial" + shipyard: + shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_xenial" + shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_xenial" + airflow: "quay.io/airshipit/airflow:latest-ubuntu_xenial" + airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_xenial" +... diff --git a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh index 8ad8b7658..94f478dad 100755 --- a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh +++ b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh @@ -20,7 +20,7 @@ set -xe : "${INSTALL_PATH:="$(pwd)/../"}" : "${PEGLEG:="./tools/airship pegleg"}" : "${PL_SITE:="airskiff"}" -: "${TARGET_MANIFEST:="ucp-bootstrap"}" +: "${TARGET_MANIFEST:="cluster-bootstrap"}" # Render documents ${PEGLEG} site -r . render "${PL_SITE}" -o airskiff.yaml diff --git a/tools/gate/manifests/full-site.yaml b/tools/gate/manifests/full-site.yaml index 52b3b4c2f..f2f65731d 100644 --- a/tools/gate/manifests/full-site.yaml +++ b/tools/gate/manifests/full-site.yaml @@ -2,11 +2,13 @@ schema: armada/Manifest/v1 metadata: schema: metadata/Document/v1 - name: full-site replacement: true + name: full-site + labels: + name: full-site-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: full-site-global actions: @@ -14,8 +16,7 @@ metadata: path: .chart_groups storagePolicy: cleartext data: - release_prefix: airship chart_groups: - - openstack-ingress-controller-airskiff + - openstack-ingress-controller - openstack-memcached ... diff --git a/tools/gate/playbooks/airskiff-reduce-site.yaml b/tools/gate/playbooks/airskiff-reduce-site.yaml index e6b16a5bc..35e27e426 100644 --- a/tools/gate/playbooks/airskiff-reduce-site.yaml +++ b/tools/gate/playbooks/airskiff-reduce-site.yaml @@ -17,6 +17,6 @@ - name: Replace Armada manifest shell: | mv tools/gate/manifests/full-site.yaml \ - site/airskiff/software/manifests/full-site.yaml + type/skiff/manifests/full-site.yaml args: chdir: "{{ zuul.project.src_dir }}" diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/libvirt.yaml b/type/skiff/charts/osh/openstack-compute-kit/libvirt.yaml similarity index 84% rename from site/airskiff/software/charts/osh/openstack-compute-kit/libvirt.yaml rename to type/skiff/charts/osh/openstack-compute-kit/libvirt.yaml index 6a3ee3e95..c28e1dcb4 100644 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/libvirt.yaml +++ b/type/skiff/charts/osh/openstack-compute-kit/libvirt.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: libvirt-airskiff + name: libvirt + replacement: true + labels: + name: libvirt-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: libvirt-global component: libvirt diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml b/type/skiff/charts/osh/openstack-compute-kit/neutron.yaml similarity index 93% rename from site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml rename to type/skiff/charts/osh/openstack-compute-kit/neutron.yaml index a47e039e6..117a304ff 100644 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/type/skiff/charts/osh/openstack-compute-kit/neutron.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: neutron-airskiff + name: neutron + replacement: true + labels: + name: neutron-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: neutron-global component: neutron diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/nova.yaml b/type/skiff/charts/osh/openstack-compute-kit/nova.yaml similarity index 95% rename from site/airskiff/software/charts/osh/openstack-compute-kit/nova.yaml rename to type/skiff/charts/osh/openstack-compute-kit/nova.yaml index d6a9bf9af..82fd9214b 100644 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/nova.yaml +++ b/type/skiff/charts/osh/openstack-compute-kit/nova.yaml @@ -3,9 +3,11 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: nova + labels: + name: nova-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: nova-global component: nova diff --git a/site/airskiff/software/charts/osh/openstack-glance/glance.yaml b/type/skiff/charts/osh/openstack-glance/glance.yaml similarity index 86% rename from site/airskiff/software/charts/osh/openstack-glance/glance.yaml rename to type/skiff/charts/osh/openstack-glance/glance.yaml index 150fa229c..b884c4c91 100644 --- a/site/airskiff/software/charts/osh/openstack-glance/glance.yaml +++ b/type/skiff/charts/osh/openstack-glance/glance.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: glance-airskiff + name: glance + replacement: true + labels: + name: glance-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: glance-global component: glance diff --git a/site/airskiff/software/charts/osh/openstack-ingress-controller/ingress.yaml b/type/skiff/charts/osh/openstack-ingress-controller/ingress.yaml similarity index 74% rename from site/airskiff/software/charts/osh/openstack-ingress-controller/ingress.yaml rename to type/skiff/charts/osh/openstack-ingress-controller/ingress.yaml index 8857ea451..933a2d765 100644 --- a/site/airskiff/software/charts/osh/openstack-ingress-controller/ingress.yaml +++ b/type/skiff/charts/osh/openstack-ingress-controller/ingress.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: openstack-ingress-controller-airskiff + name: openstack-ingress-controller + replacement: true + labels: + name: openstack-ingress-controller-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: openstack-ingress-controller-global component: ingress diff --git a/site/airskiff/software/charts/osh/openstack-keystone/keystone.yaml b/type/skiff/charts/osh/openstack-keystone/keystone.yaml similarity index 79% rename from site/airskiff/software/charts/osh/openstack-keystone/keystone.yaml rename to type/skiff/charts/osh/openstack-keystone/keystone.yaml index 856199ee0..b9f5cfac0 100644 --- a/site/airskiff/software/charts/osh/openstack-keystone/keystone.yaml +++ b/type/skiff/charts/osh/openstack-keystone/keystone.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: keystone-airskiff + name: keystone + replacement: true + labels: + name: keystone-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: keystone-global component: keystone diff --git a/site/airskiff/software/charts/osh/openstack-mariadb/mariadb.yaml b/type/skiff/charts/osh/openstack-mariadb/mariadb.yaml similarity index 80% rename from site/airskiff/software/charts/osh/openstack-mariadb/mariadb.yaml rename to type/skiff/charts/osh/openstack-mariadb/mariadb.yaml index 698586a8f..9f30a54f3 100644 --- a/site/airskiff/software/charts/osh/openstack-mariadb/mariadb.yaml +++ b/type/skiff/charts/osh/openstack-mariadb/mariadb.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: openstack-mariadb-airskiff + name: openstack-mariadb + replacement: true + labels: + name: openstack-mariadb-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: openstack-mariadb-global component: mariadb diff --git a/site/airskiff/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml b/type/skiff/charts/osh/openstack-rabbitmq/rabbitmq.yaml similarity index 81% rename from site/airskiff/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml rename to type/skiff/charts/osh/openstack-rabbitmq/rabbitmq.yaml index b47b61302..25b7a1e4d 100644 --- a/site/airskiff/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml +++ b/type/skiff/charts/osh/openstack-rabbitmq/rabbitmq.yaml @@ -2,10 +2,13 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 - name: openstack-rabbitmq-airskiff + name: openstack-rabbitmq + replacement: true + labels: + name: openstack-rabbitmq-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: openstack-rabbitmq-global actions: diff --git a/site/airskiff/software/charts/ucp/armada/armada.yaml b/type/skiff/charts/ucp/armada/armada.yaml similarity index 83% rename from site/airskiff/software/charts/ucp/armada/armada.yaml rename to type/skiff/charts/ucp/armada/armada.yaml index 79dec1277..284a84171 100644 --- a/site/airskiff/software/charts/ucp/armada/armada.yaml +++ b/type/skiff/charts/ucp/armada/armada.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-armada replacement: true + labels: + name: ucp-armada-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-armada-global actions: @@ -23,9 +25,6 @@ data: location: /airship-components/armada subpath: charts/armada values: - images: - tags: - api: quay.io/airshipit/armada:latest-ubuntu_xenial pod: replicas: api: 1 diff --git a/site/airskiff/software/charts/ucp/armada/chart-group.yaml b/type/skiff/charts/ucp/armada/chart-group.yaml similarity index 84% rename from site/airskiff/software/charts/ucp/armada/chart-group.yaml rename to type/skiff/charts/ucp/armada/chart-group.yaml index dc4342532..7af12c4ed 100644 --- a/site/airskiff/software/charts/ucp/armada/chart-group.yaml +++ b/type/skiff/charts/ucp/armada/chart-group.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-armada replacement: true + labels: + name: ucp-armada-chart-group-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-armada-chart-group-global actions: diff --git a/site/airskiff/software/charts/ucp/core/ingress.yaml b/type/skiff/charts/ucp/core/ingress.yaml similarity index 87% rename from site/airskiff/software/charts/ucp/core/ingress.yaml rename to type/skiff/charts/ucp/core/ingress.yaml index 2c7a08bcd..9cc0392bc 100644 --- a/site/airskiff/software/charts/ucp/core/ingress.yaml +++ b/type/skiff/charts/ucp/core/ingress.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-ingress replacement: true + labels: + name: ucp-ingress-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-ingress-global actions: diff --git a/site/airskiff/software/charts/ucp/core/mariadb.yaml b/type/skiff/charts/ucp/core/mariadb.yaml similarity index 87% rename from site/airskiff/software/charts/ucp/core/mariadb.yaml rename to type/skiff/charts/ucp/core/mariadb.yaml index 2cdffb6b6..8120a1ab1 100644 --- a/site/airskiff/software/charts/ucp/core/mariadb.yaml +++ b/type/skiff/charts/ucp/core/mariadb.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-mariadb replacement: true + labels: + name: ucp-mariadb-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-mariadb-global actions: diff --git a/site/airskiff/software/charts/ucp/core/postgresql.yaml b/type/skiff/charts/ucp/core/postgresql.yaml similarity index 86% rename from site/airskiff/software/charts/ucp/core/postgresql.yaml rename to type/skiff/charts/ucp/core/postgresql.yaml index 08fae7c00..8e7a3e3b1 100644 --- a/site/airskiff/software/charts/ucp/core/postgresql.yaml +++ b/type/skiff/charts/ucp/core/postgresql.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-postgresql replacement: true + labels: + name: ucp-postgresql-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-postgresql-global actions: diff --git a/site/airskiff/software/charts/ucp/core/rabbitmq.yaml b/type/skiff/charts/ucp/core/rabbitmq.yaml similarity index 88% rename from site/airskiff/software/charts/ucp/core/rabbitmq.yaml rename to type/skiff/charts/ucp/core/rabbitmq.yaml index e865bc087..207daba11 100644 --- a/site/airskiff/software/charts/ucp/core/rabbitmq.yaml +++ b/type/skiff/charts/ucp/core/rabbitmq.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-rabbitmq replacement: true + labels: + name: ucp-rabbitmq-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-rabbitmq-global actions: diff --git a/site/airskiff/software/charts/ucp/deckhand/barbican.yaml b/type/skiff/charts/ucp/deckhand/barbican.yaml similarity index 86% rename from site/airskiff/software/charts/ucp/deckhand/barbican.yaml rename to type/skiff/charts/ucp/deckhand/barbican.yaml index 3263efb20..3508c255f 100644 --- a/site/airskiff/software/charts/ucp/deckhand/barbican.yaml +++ b/type/skiff/charts/ucp/deckhand/barbican.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-barbican replacement: true + labels: + name: ucp-barbican-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-barbican-global actions: diff --git a/site/airskiff/software/charts/ucp/deckhand/deckhand.yaml b/type/skiff/charts/ucp/deckhand/deckhand.yaml similarity index 83% rename from site/airskiff/software/charts/ucp/deckhand/deckhand.yaml rename to type/skiff/charts/ucp/deckhand/deckhand.yaml index 81db6bb18..80b421d51 100644 --- a/site/airskiff/software/charts/ucp/deckhand/deckhand.yaml +++ b/type/skiff/charts/ucp/deckhand/deckhand.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-deckhand replacement: true + labels: + name: ucp-deckhand-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-deckhand-global actions: @@ -23,9 +25,6 @@ data: location: /airship-components/deckhand subpath: charts/deckhand values: - images: - tags: - api: quay.io/airshipit/deckhand:latest-ubuntu_xenial pod: replicas: deckhand: 1 diff --git a/site/airskiff/software/charts/ucp/keystone/keystone.yaml b/type/skiff/charts/ucp/keystone/keystone.yaml similarity index 86% rename from site/airskiff/software/charts/ucp/keystone/keystone.yaml rename to type/skiff/charts/ucp/keystone/keystone.yaml index 2cdfbc884..27d5f2fd8 100644 --- a/site/airskiff/software/charts/ucp/keystone/keystone.yaml +++ b/type/skiff/charts/ucp/keystone/keystone.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-keystone replacement: true + labels: + name: ucp-keystone-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-keystone-global actions: diff --git a/site/airskiff/software/charts/ucp/shipyard/shipyard.yaml b/type/skiff/charts/ucp/shipyard/shipyard.yaml similarity index 83% rename from site/airskiff/software/charts/ucp/shipyard/shipyard.yaml rename to type/skiff/charts/ucp/shipyard/shipyard.yaml index a5840bb0c..07f9c3348 100644 --- a/site/airskiff/software/charts/ucp/shipyard/shipyard.yaml +++ b/type/skiff/charts/ucp/shipyard/shipyard.yaml @@ -4,9 +4,11 @@ metadata: schema: metadata/Document/v1 name: ucp-shipyard replacement: true + labels: + name: ucp-shipyard-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: ucp-shipyard-global actions: @@ -23,10 +25,6 @@ data: location: /airship-components/shipyard subpath: charts/shipyard values: - images: - tags: - airflow: quay.io/airshipit/airflow:latest-ubuntu_xenial - shipyard: quay.io/airshipit/shipyard:latest-ubuntu_xenial pod: replicas: shipyard: diff --git a/site/airskiff/software/config/endpoints.yaml b/type/skiff/config/endpoints.yaml similarity index 99% rename from site/airskiff/software/config/endpoints.yaml rename to type/skiff/config/endpoints.yaml index 1e6d16934..0aa655d3a 100644 --- a/site/airskiff/software/config/endpoints.yaml +++ b/type/skiff/config/endpoints.yaml @@ -6,9 +6,11 @@ schema: pegleg/EndpointCatalogue/v1 metadata: schema: metadata/Document/v1 name: ucp_endpoints + labels: + name: ucp_endpoints-type layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: ucp: @@ -323,7 +325,7 @@ metadata: name: osh_endpoints layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: osh: @@ -683,7 +685,7 @@ metadata: name: osh_infra_endpoints layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext substitutions: - src: diff --git a/site/airskiff/software/config/service_accounts.yaml b/type/skiff/config/service_accounts.yaml similarity index 99% rename from site/airskiff/software/config/service_accounts.yaml rename to type/skiff/config/service_accounts.yaml index 751f1b1f7..4541cdc2f 100644 --- a/site/airskiff/software/config/service_accounts.yaml +++ b/type/skiff/config/service_accounts.yaml @@ -6,9 +6,11 @@ schema: pegleg/AccountCatalogue/v1 metadata: schema: metadata/Document/v1 name: ucp_service_accounts + labels: + name: ucp_service_accounts-type layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: ucp: @@ -154,7 +156,7 @@ metadata: name: osh_service_accounts layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext substitutions: - src: @@ -379,7 +381,7 @@ metadata: name: osh_infra_service_accounts layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext substitutions: - src: diff --git a/site/airskiff/software/manifests/ucp-bootstrap.yaml b/type/skiff/manifests/bootstrap.yaml similarity index 58% rename from site/airskiff/software/manifests/ucp-bootstrap.yaml rename to type/skiff/manifests/bootstrap.yaml index 6bab3ac6c..7551e69fe 100644 --- a/site/airskiff/software/manifests/ucp-bootstrap.yaml +++ b/type/skiff/manifests/bootstrap.yaml @@ -2,10 +2,18 @@ schema: armada/Manifest/v1 metadata: schema: metadata/Document/v1 - name: ucp-bootstrap + replacement: true + name: cluster-bootstrap + labels: + name: cluster-bootstrap-type layeringDefinition: abstract: false - layer: site + layer: type + parentSelector: + name: cluster-bootstrap-global + actions: + - method: replace + path: .chart_groups storagePolicy: cleartext data: release_prefix: airship diff --git a/site/airskiff/software/manifests/full-site.yaml b/type/skiff/manifests/full-site.yaml similarity index 54% rename from site/airskiff/software/manifests/full-site.yaml rename to type/skiff/manifests/full-site.yaml index 51ffa42bd..ce4c24d75 100644 --- a/site/airskiff/software/manifests/full-site.yaml +++ b/type/skiff/manifests/full-site.yaml @@ -2,11 +2,13 @@ schema: armada/Manifest/v1 metadata: schema: metadata/Document/v1 - name: full-site replacement: true + name: full-site + labels: + name: full-site-type layeringDefinition: abstract: false - layer: site + layer: type parentSelector: name: full-site-global actions: @@ -14,14 +16,13 @@ metadata: path: .chart_groups storagePolicy: cleartext data: - release_prefix: airship chart_groups: - - openstack-ingress-controller-airskiff - - openstack-mariadb-airskiff - - openstack-rabbitmq-airskiff + - openstack-ingress-controller + - openstack-mariadb + - openstack-rabbitmq - openstack-memcached - - openstack-keystone-airskiff - - openstack-glance-airskiff - - openstack-compute-kit-airskiff - - openstack-heat-airskiff + - openstack-keystone + - openstack-glance + - openstack-compute-kit + - openstack-heat ... diff --git a/site/airskiff/networks/common-addresses.yaml b/type/skiff/networks/common-addresses.yaml similarity index 99% rename from site/airskiff/networks/common-addresses.yaml rename to type/skiff/networks/common-addresses.yaml index 035fe9202..62a1d7b92 100644 --- a/site/airskiff/networks/common-addresses.yaml +++ b/type/skiff/networks/common-addresses.yaml @@ -5,7 +5,7 @@ metadata: name: common-addresses layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: calico: diff --git a/site/airskiff/secrets/certificates/certificates.yaml b/type/skiff/secrets/certificates/certificates.yaml similarity index 99% rename from site/airskiff/secrets/certificates/certificates.yaml rename to type/skiff/secrets/certificates/certificates.yaml index 0cd057377..a4b37ef2e 100644 --- a/site/airskiff/secrets/certificates/certificates.yaml +++ b/type/skiff/secrets/certificates/certificates.yaml @@ -25,7 +25,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes schema: metadata/Document/v1 storagePolicy: cleartext @@ -55,7 +55,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd schema: metadata/Document/v1 storagePolicy: cleartext @@ -85,7 +85,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -115,7 +115,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd schema: metadata/Document/v1 storagePolicy: cleartext @@ -145,7 +145,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -182,7 +182,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes schema: metadata/Document/v1 storagePolicy: cleartext @@ -219,7 +219,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd schema: metadata/Document/v1 storagePolicy: cleartext @@ -256,7 +256,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -293,7 +293,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd schema: metadata/Document/v1 storagePolicy: cleartext @@ -330,7 +330,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -364,7 +364,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: apiserver schema: metadata/Document/v1 storagePolicy: cleartext @@ -396,7 +396,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-genesis schema: metadata/Document/v1 storagePolicy: cleartext @@ -428,7 +428,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-11 schema: metadata/Document/v1 storagePolicy: cleartext @@ -460,7 +460,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-12 schema: metadata/Document/v1 storagePolicy: cleartext @@ -492,7 +492,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-13 schema: metadata/Document/v1 storagePolicy: cleartext @@ -524,7 +524,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-14 schema: metadata/Document/v1 storagePolicy: cleartext @@ -556,7 +556,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-17 schema: metadata/Document/v1 storagePolicy: cleartext @@ -588,7 +588,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-19 schema: metadata/Document/v1 storagePolicy: cleartext @@ -618,7 +618,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: scheduler schema: metadata/Document/v1 storagePolicy: cleartext @@ -649,7 +649,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: controller-manager schema: metadata/Document/v1 storagePolicy: cleartext @@ -680,7 +680,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: admin schema: metadata/Document/v1 storagePolicy: cleartext @@ -711,7 +711,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: armada schema: metadata/Document/v1 storagePolicy: cleartext @@ -741,7 +741,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: apiserver-etcd schema: metadata/Document/v1 storagePolicy: cleartext @@ -771,7 +771,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-anchor schema: metadata/Document/v1 storagePolicy: cleartext @@ -804,7 +804,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-genesis schema: metadata/Document/v1 storagePolicy: cleartext @@ -837,7 +837,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-11 schema: metadata/Document/v1 storagePolicy: cleartext @@ -870,7 +870,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-12 schema: metadata/Document/v1 storagePolicy: cleartext @@ -903,7 +903,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-13 schema: metadata/Document/v1 storagePolicy: cleartext @@ -936,7 +936,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-14 schema: metadata/Document/v1 storagePolicy: cleartext @@ -969,7 +969,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-genesis-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1002,7 +1002,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-11-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1035,7 +1035,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-12-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1068,7 +1068,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-13-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1101,7 +1101,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-14-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1131,7 +1131,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-anchor schema: metadata/Document/v1 storagePolicy: cleartext @@ -1163,7 +1163,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-11 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1195,7 +1195,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-12 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1227,7 +1227,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-13 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1259,7 +1259,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-14 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1289,7 +1289,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-node schema: metadata/Document/v1 storagePolicy: cleartext @@ -1321,7 +1321,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-11-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1353,7 +1353,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-12-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1385,7 +1385,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-13-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1417,7 +1417,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-14-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1447,7 +1447,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-node-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -1484,7 +1484,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: apiserver schema: metadata/Document/v1 storagePolicy: cleartext @@ -1521,7 +1521,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-genesis schema: metadata/Document/v1 storagePolicy: cleartext @@ -1558,7 +1558,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-11 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1595,7 +1595,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-12 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1632,7 +1632,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-13 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1669,7 +1669,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-14 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1706,7 +1706,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-17 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1743,7 +1743,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubelet-cab23-r720-19 schema: metadata/Document/v1 storagePolicy: cleartext @@ -1780,7 +1780,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: scheduler schema: metadata/Document/v1 storagePolicy: cleartext @@ -1817,7 +1817,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: controller-manager schema: metadata/Document/v1 storagePolicy: cleartext @@ -1854,7 +1854,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: admin schema: metadata/Document/v1 storagePolicy: cleartext @@ -1891,7 +1891,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: armada schema: metadata/Document/v1 storagePolicy: cleartext @@ -1928,7 +1928,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: apiserver-etcd schema: metadata/Document/v1 storagePolicy: cleartext @@ -1965,7 +1965,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-anchor schema: metadata/Document/v1 storagePolicy: cleartext @@ -2002,7 +2002,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-genesis schema: metadata/Document/v1 storagePolicy: cleartext @@ -2039,7 +2039,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-11 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2076,7 +2076,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-12 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2113,7 +2113,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-13 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2150,7 +2150,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-14 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2187,7 +2187,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-genesis-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2224,7 +2224,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-11-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2261,7 +2261,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-12-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2298,7 +2298,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-13-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2335,7 +2335,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: kubernetes-etcd-cab23-r720-14-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2372,7 +2372,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-anchor schema: metadata/Document/v1 storagePolicy: cleartext @@ -2409,7 +2409,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-11 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2446,7 +2446,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-12 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2483,7 +2483,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-13 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2520,7 +2520,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-14 schema: metadata/Document/v1 storagePolicy: cleartext @@ -2557,7 +2557,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-node schema: metadata/Document/v1 storagePolicy: cleartext @@ -2594,7 +2594,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-11-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2631,7 +2631,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-12-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2668,7 +2668,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-13-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2705,7 +2705,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-etcd-cab23-r720-14-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2742,7 +2742,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: calico-node-peer schema: metadata/Document/v1 storagePolicy: cleartext @@ -2761,7 +2761,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: service-account schema: metadata/Document/v1 storagePolicy: cleartext @@ -2798,7 +2798,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: service-account schema: metadata/Document/v1 storagePolicy: cleartext diff --git a/site/airskiff/secrets/certificates/ingress.yaml b/type/skiff/secrets/certificates/ingress.yaml similarity index 99% rename from site/airskiff/secrets/certificates/ingress.yaml rename to type/skiff/secrets/certificates/ingress.yaml index ce475d4e2..78c063b23 100644 --- a/site/airskiff/secrets/certificates/ingress.yaml +++ b/type/skiff/secrets/certificates/ingress.yaml @@ -5,7 +5,7 @@ metadata: layeringDefinition: abstract: false - layer: site + layer: type name: ingress-crt schema: metadata/Document/v1 labels: @@ -48,7 +48,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: ingress-ca schema: metadata/Document/v1 labels: @@ -85,7 +85,7 @@ data: | metadata: layeringDefinition: abstract: false - layer: site + layer: type name: ingress-key schema: metadata/Document/v1 labels: diff --git a/site/airskiff/secrets/passphrases/apiserver-encryption-key-key1.yaml b/type/skiff/secrets/passphrases/apiserver-encryption-key-key1.yaml similarity index 94% rename from site/airskiff/secrets/passphrases/apiserver-encryption-key-key1.yaml rename to type/skiff/secrets/passphrases/apiserver-encryption-key-key1.yaml index f0529476f..c3bf5ed98 100644 --- a/site/airskiff/secrets/passphrases/apiserver-encryption-key-key1.yaml +++ b/type/skiff/secrets/passphrases/apiserver-encryption-key-key1.yaml @@ -5,7 +5,7 @@ metadata: name: apiserver-encryption-key-key1 layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext # head -c 32 /dev/urandom | base64 data: AH/KZrduGOc8NRs5Dkp1maqaOrVY+HZ9pAD/fCweMqw= diff --git a/site/airskiff/secrets/passphrases/ceph_fsid.yaml b/type/skiff/secrets/passphrases/ceph_fsid.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/ceph_fsid.yaml rename to type/skiff/secrets/passphrases/ceph_fsid.yaml index 720150288..9964d0c47 100644 --- a/site/airskiff/secrets/passphrases/ceph_fsid.yaml +++ b/type/skiff/secrets/passphrases/ceph_fsid.yaml @@ -5,7 +5,7 @@ metadata: name: ceph_fsid layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext # uuidgen data: 7b7576f4-3358-4668-9112-100440079807 diff --git a/site/airskiff/secrets/passphrases/ceph_swift_keystone_password.yaml b/type/skiff/secrets/passphrases/ceph_swift_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ceph_swift_keystone_password.yaml rename to type/skiff/secrets/passphrases/ceph_swift_keystone_password.yaml index 9a9af1f2c..b45ed1398 100644 --- a/site/airskiff/secrets/passphrases/ceph_swift_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ceph_swift_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ceph_swift_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ipmi_admin_password.yaml b/type/skiff/secrets/passphrases/ipmi_admin_password.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/ipmi_admin_password.yaml rename to type/skiff/secrets/passphrases/ipmi_admin_password.yaml index 6ab430ed8..d086faa2f 100644 --- a/site/airskiff/secrets/passphrases/ipmi_admin_password.yaml +++ b/type/skiff/secrets/passphrases/ipmi_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: ipmi_admin_password layeringDefinition: abstract: false - layer: site + layer: type labels: name: ipmi-admin-password-site storagePolicy: cleartext diff --git a/site/airskiff/secrets/passphrases/maas-region-key.yaml b/type/skiff/secrets/passphrases/maas-region-key.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/maas-region-key.yaml rename to type/skiff/secrets/passphrases/maas-region-key.yaml index 73d4a6970..58aa1410e 100644 --- a/site/airskiff/secrets/passphrases/maas-region-key.yaml +++ b/type/skiff/secrets/passphrases/maas-region-key.yaml @@ -5,7 +5,7 @@ metadata: name: maas-region-key layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext # openssl rand -hex 10 data: 9026f6048d6a017dc913 diff --git a/site/airskiff/secrets/passphrases/osh_barbican_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_barbican_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_barbican_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_barbican_oslo_db_password.yaml index c5f866c85..d1aedc00e 100644 --- a/site/airskiff/secrets/passphrases/osh_barbican_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_barbican_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_barbican_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_barbican_password.yaml b/type/skiff/secrets/passphrases/osh_barbican_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_barbican_password.yaml rename to type/skiff/secrets/passphrases/osh_barbican_password.yaml index 51221924c..3848e24f0 100644 --- a/site/airskiff/secrets/passphrases/osh_barbican_password.yaml +++ b/type/skiff/secrets/passphrases/osh_barbican_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_barbican_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_cinder_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_cinder_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_cinder_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_cinder_oslo_db_password.yaml index b22f898b6..c12d3f73f 100644 --- a/site/airskiff/secrets/passphrases/osh_cinder_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_cinder_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_cinder_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_cinder_password.yaml b/type/skiff/secrets/passphrases/osh_cinder_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_cinder_password.yaml rename to type/skiff/secrets/passphrases/osh_cinder_password.yaml index 26565dbe3..15543fba0 100644 --- a/site/airskiff/secrets/passphrases/osh_cinder_password.yaml +++ b/type/skiff/secrets/passphrases/osh_cinder_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_cinder_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_glance_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_glance_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_glance_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_glance_oslo_db_password.yaml index 073906900..21a1681e5 100644 --- a/site/airskiff/secrets/passphrases/osh_glance_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_glance_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_glance_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_glance_password.yaml b/type/skiff/secrets/passphrases/osh_glance_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_glance_password.yaml rename to type/skiff/secrets/passphrases/osh_glance_password.yaml index 93ae0f24b..04218f59d 100644 --- a/site/airskiff/secrets/passphrases/osh_glance_password.yaml +++ b/type/skiff/secrets/passphrases/osh_glance_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_glance_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_heat_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_heat_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_heat_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_heat_oslo_db_password.yaml index 3352d4ce9..e1723600a 100644 --- a/site/airskiff/secrets/passphrases/osh_heat_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_heat_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_heat_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_heat_password.yaml b/type/skiff/secrets/passphrases/osh_heat_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_heat_password.yaml rename to type/skiff/secrets/passphrases/osh_heat_password.yaml index 5777ebbf8..74eae91fc 100644 --- a/site/airskiff/secrets/passphrases/osh_heat_password.yaml +++ b/type/skiff/secrets/passphrases/osh_heat_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_heat_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_heat_stack_user_password.yaml b/type/skiff/secrets/passphrases/osh_heat_stack_user_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_heat_stack_user_password.yaml rename to type/skiff/secrets/passphrases/osh_heat_stack_user_password.yaml index 36db28bc2..d812f4347 100644 --- a/site/airskiff/secrets/passphrases/osh_heat_stack_user_password.yaml +++ b/type/skiff/secrets/passphrases/osh_heat_stack_user_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_heat_stack_user_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_heat_trustee_password.yaml b/type/skiff/secrets/passphrases/osh_heat_trustee_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_heat_trustee_password.yaml rename to type/skiff/secrets/passphrases/osh_heat_trustee_password.yaml index 58129ef5d..0fe586dcf 100644 --- a/site/airskiff/secrets/passphrases/osh_heat_trustee_password.yaml +++ b/type/skiff/secrets/passphrases/osh_heat_trustee_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_heat_trustee_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_horizon_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_horizon_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_horizon_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_horizon_oslo_db_password.yaml index 7c78d4572..36e67095b 100644 --- a/site/airskiff/secrets/passphrases/osh_horizon_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_horizon_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_horizon_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml b/type/skiff/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml index 78c265edc..2b09bc0da 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_elasticsearch_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_grafana_admin_password.yaml b/type/skiff/secrets/passphrases/osh_infra_grafana_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_infra_grafana_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_grafana_admin_password.yaml index 9232de761..a676f215b 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_grafana_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_grafana_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_grafana_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml index 6d5f49e5b..a267fcb1e 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_grafana_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml b/type/skiff/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml index bd4e57399..e09b0c61f 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_grafana_oslo_db_session_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_nagios_admin_password.yaml b/type/skiff/secrets/passphrases/osh_infra_nagios_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_infra_nagios_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_nagios_admin_password.yaml index 52dbe16a0..e53b1c826 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_nagios_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_nagios_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_nagios_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_openstack_exporter_password.yaml b/type/skiff/secrets/passphrases/osh_infra_openstack_exporter_password.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_openstack_exporter_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_openstack_exporter_password.yaml index 64f78e1a4..cd39defe7 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_openstack_exporter_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_openstack_exporter_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_openstack_exporter_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml b/type/skiff/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml index 9c68e9d5c..e89876a5d 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_oslo_db_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml b/type/skiff/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml index f134f46a9..74a628b5e 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_oslo_db_exporter_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_prometheus_admin_password.yaml b/type/skiff/secrets/passphrases/osh_infra_prometheus_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_infra_prometheus_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_infra_prometheus_admin_password.yaml index b3df5f659..335107e7f 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_prometheus_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_prometheus_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_prometheus_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml rename to type/skiff/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml index 9f64719a0..3eecfb8c3 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_rgw_s3_admin_access_key layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: admin_access_key ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml rename to type/skiff/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml index 3e06f913a..4c123bdd9 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_rgw_s3_admin_secret_key layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: admin_secret_key ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml rename to type/skiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml index 97c7d2312..a8f1f4f5a 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_rgw_s3_elasticsearch_access_key layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: elastic_access_key ... diff --git a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml rename to type/skiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml index 60f0134e0..fc3ca2ff0 100644 --- a/site/airskiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml +++ b/type/skiff/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml @@ -5,7 +5,7 @@ metadata: name: osh_infra_rgw_s3_elasticsearch_secret_key layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: elastic_secret_key ... diff --git a/site/airskiff/secrets/passphrases/osh_keystone_admin_password.yaml b/type/skiff/secrets/passphrases/osh_keystone_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_keystone_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_keystone_admin_password.yaml index 6c3f44695..212940618 100644 --- a/site/airskiff/secrets/passphrases/osh_keystone_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_keystone_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_keystone_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_keystone_ldap_password.yaml b/type/skiff/secrets/passphrases/osh_keystone_ldap_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_keystone_ldap_password.yaml rename to type/skiff/secrets/passphrases/osh_keystone_ldap_password.yaml index 2edf0f22c..681f3cec1 100644 --- a/site/airskiff/secrets/passphrases/osh_keystone_ldap_password.yaml +++ b/type/skiff/secrets/passphrases/osh_keystone_ldap_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_keystone_ldap_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_keystone_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_keystone_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_keystone_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_keystone_oslo_db_password.yaml index 07b2206ab..5782a8c33 100644 --- a/site/airskiff/secrets/passphrases/osh_keystone_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_keystone_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_keystone_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_neutron_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_neutron_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_neutron_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_neutron_oslo_db_password.yaml index 4d0b15749..773c2463c 100644 --- a/site/airskiff/secrets/passphrases/osh_neutron_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_neutron_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_neutron_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_neutron_password.yaml b/type/skiff/secrets/passphrases/osh_neutron_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_neutron_password.yaml rename to type/skiff/secrets/passphrases/osh_neutron_password.yaml index dd0b2b68b..41e3fd10f 100644 --- a/site/airskiff/secrets/passphrases/osh_neutron_password.yaml +++ b/type/skiff/secrets/passphrases/osh_neutron_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_neutron_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml b/type/skiff/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml rename to type/skiff/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml index 37d5c627c..7177cbeb7 100644 --- a/site/airskiff/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml +++ b/type/skiff/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml @@ -5,7 +5,7 @@ metadata: name: osh_nova_metadata_proxy_shared_secret layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_nova_oslo_db_password.yaml b/type/skiff/secrets/passphrases/osh_nova_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_nova_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/osh_nova_oslo_db_password.yaml index 2cd60f567..34c3a9ddd 100644 --- a/site/airskiff/secrets/passphrases/osh_nova_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/osh_nova_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_nova_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_nova_password.yaml b/type/skiff/secrets/passphrases/osh_nova_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_nova_password.yaml rename to type/skiff/secrets/passphrases/osh_nova_password.yaml index 4c2223d36..1d115e3bd 100644 --- a/site/airskiff/secrets/passphrases/osh_nova_password.yaml +++ b/type/skiff/secrets/passphrases/osh_nova_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_nova_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_oslo_cache_secret_key.yaml b/type/skiff/secrets/passphrases/osh_oslo_cache_secret_key.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_oslo_cache_secret_key.yaml rename to type/skiff/secrets/passphrases/osh_oslo_cache_secret_key.yaml index 11747a726..a6406a31b 100644 --- a/site/airskiff/secrets/passphrases/osh_oslo_cache_secret_key.yaml +++ b/type/skiff/secrets/passphrases/osh_oslo_cache_secret_key.yaml @@ -5,7 +5,7 @@ metadata: name: osh_oslo_cache_secret_key layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_oslo_db_admin_password.yaml b/type/skiff/secrets/passphrases/osh_oslo_db_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_oslo_db_admin_password.yaml rename to type/skiff/secrets/passphrases/osh_oslo_db_admin_password.yaml index 48df9ee54..9082d3e7d 100644 --- a/site/airskiff/secrets/passphrases/osh_oslo_db_admin_password.yaml +++ b/type/skiff/secrets/passphrases/osh_oslo_db_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_oslo_db_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_oslo_db_exporter_password.yaml b/type/skiff/secrets/passphrases/osh_oslo_db_exporter_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_oslo_db_exporter_password.yaml rename to type/skiff/secrets/passphrases/osh_oslo_db_exporter_password.yaml index 61b4144ad..dd06f0b46 100644 --- a/site/airskiff/secrets/passphrases/osh_oslo_db_exporter_password.yaml +++ b/type/skiff/secrets/passphrases/osh_oslo_db_exporter_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_oslo_db_exporter_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_oslo_messaging_password.yaml b/type/skiff/secrets/passphrases/osh_oslo_messaging_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_oslo_messaging_password.yaml rename to type/skiff/secrets/passphrases/osh_oslo_messaging_password.yaml index e7d97e27c..df7f34bcc 100644 --- a/site/airskiff/secrets/passphrases/osh_oslo_messaging_password.yaml +++ b/type/skiff/secrets/passphrases/osh_oslo_messaging_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_oslo_messaging_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_placement_password.yaml b/type/skiff/secrets/passphrases/osh_placement_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_placement_password.yaml rename to type/skiff/secrets/passphrases/osh_placement_password.yaml index c72b59ac0..d278e7725 100644 --- a/site/airskiff/secrets/passphrases/osh_placement_password.yaml +++ b/type/skiff/secrets/passphrases/osh_placement_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_placement_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml b/type/skiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml rename to type/skiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml index a3b5a2b69..0f0712e22 100644 --- a/site/airskiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml +++ b/type/skiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml @@ -5,7 +5,7 @@ metadata: name: osh_rabbitmq_erlang_cookie layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/osh_tempest_password.yaml b/type/skiff/secrets/passphrases/osh_tempest_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/osh_tempest_password.yaml rename to type/skiff/secrets/passphrases/osh_tempest_password.yaml index af90ec05b..a5dcdb842 100644 --- a/site/airskiff/secrets/passphrases/osh_tempest_password.yaml +++ b/type/skiff/secrets/passphrases/osh_tempest_password.yaml @@ -5,7 +5,7 @@ metadata: name: osh_tempest_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/tenant_ceph_fsid.yaml b/type/skiff/secrets/passphrases/tenant_ceph_fsid.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/tenant_ceph_fsid.yaml rename to type/skiff/secrets/passphrases/tenant_ceph_fsid.yaml index 18bd48556..ff4ad65c0 100644 --- a/site/airskiff/secrets/passphrases/tenant_ceph_fsid.yaml +++ b/type/skiff/secrets/passphrases/tenant_ceph_fsid.yaml @@ -5,7 +5,7 @@ metadata: name: tenant_ceph_fsid layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext # uuidgen data: 29d8953d-0bb6-4ba1-a48a-f9be1c0937a9 diff --git a/site/airskiff/secrets/passphrases/ubuntu_crypt_password.yaml b/type/skiff/secrets/passphrases/ubuntu_crypt_password.yaml similarity index 95% rename from site/airskiff/secrets/passphrases/ubuntu_crypt_password.yaml rename to type/skiff/secrets/passphrases/ubuntu_crypt_password.yaml index 4d6046803..98a1f7ee4 100644 --- a/site/airskiff/secrets/passphrases/ubuntu_crypt_password.yaml +++ b/type/skiff/secrets/passphrases/ubuntu_crypt_password.yaml @@ -5,7 +5,7 @@ metadata: name: ubuntu_crypt_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext # Pass: password123 data: $6$qgvZ3LC9.t59Akqy$HAJfJpdrN8Ld9ssGyjFPzyJ3WUGN.ucqhSyA25LFjBrSYboVFgX8wLomRwlf5YIn1siaXHSh4JaPJED3BO36J1 diff --git a/site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/type/skiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml rename to type/skiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml index 33c4125ef..3ce573f79 100644 --- a/site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_airflow_oslo_messaging_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_airflow_postgres_password.yaml b/type/skiff/secrets/passphrases/ucp_airflow_postgres_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_airflow_postgres_password.yaml rename to type/skiff/secrets/passphrases/ucp_airflow_postgres_password.yaml index 8a1d64884..d7bb0b644 100644 --- a/site/airskiff/secrets/passphrases/ucp_airflow_postgres_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_airflow_postgres_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_airflow_postgres_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_armada_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_armada_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_armada_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_armada_keystone_password.yaml index 866efcce2..a886fceb1 100644 --- a/site/airskiff/secrets/passphrases/ucp_armada_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_armada_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_armada_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_barbican_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_barbican_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_barbican_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_barbican_keystone_password.yaml index cb2da2244..0a52e8830 100644 --- a/site/airskiff/secrets/passphrases/ucp_barbican_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_barbican_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_barbican_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_barbican_oslo_db_password.yaml b/type/skiff/secrets/passphrases/ucp_barbican_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_barbican_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/ucp_barbican_oslo_db_password.yaml index 95a76ed17..ad9513d9f 100644 --- a/site/airskiff/secrets/passphrases/ucp_barbican_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_barbican_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_barbican_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_deckhand_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_deckhand_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_deckhand_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_deckhand_keystone_password.yaml index 5ee27f2a8..941fbb0af 100644 --- a/site/airskiff/secrets/passphrases/ucp_deckhand_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_deckhand_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_deckhand_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_deckhand_postgres_password.yaml b/type/skiff/secrets/passphrases/ucp_deckhand_postgres_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_deckhand_postgres_password.yaml rename to type/skiff/secrets/passphrases/ucp_deckhand_postgres_password.yaml index e63319b71..de43f1ab4 100644 --- a/site/airskiff/secrets/passphrases/ucp_deckhand_postgres_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_deckhand_postgres_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_deckhand_postgres_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_drydock_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_drydock_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_drydock_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_drydock_keystone_password.yaml index b8083b519..36bafd04b 100644 --- a/site/airskiff/secrets/passphrases/ucp_drydock_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_drydock_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_drydock_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_drydock_postgres_password.yaml b/type/skiff/secrets/passphrases/ucp_drydock_postgres_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_drydock_postgres_password.yaml rename to type/skiff/secrets/passphrases/ucp_drydock_postgres_password.yaml index 2eff5255c..c7b0eeb42 100644 --- a/site/airskiff/secrets/passphrases/ucp_drydock_postgres_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_drydock_postgres_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_drydock_postgres_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_keystone_admin_password.yaml b/type/skiff/secrets/passphrases/ucp_keystone_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_keystone_admin_password.yaml rename to type/skiff/secrets/passphrases/ucp_keystone_admin_password.yaml index 91f74fdc0..1731fe5ed 100644 --- a/site/airskiff/secrets/passphrases/ucp_keystone_admin_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_keystone_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_keystone_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_keystone_oslo_db_password.yaml b/type/skiff/secrets/passphrases/ucp_keystone_oslo_db_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_keystone_oslo_db_password.yaml rename to type/skiff/secrets/passphrases/ucp_keystone_oslo_db_password.yaml index a9cb15317..55d48d16f 100644 --- a/site/airskiff/secrets/passphrases/ucp_keystone_oslo_db_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_keystone_oslo_db_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_keystone_oslo_db_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_maas_admin_password.yaml b/type/skiff/secrets/passphrases/ucp_maas_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_maas_admin_password.yaml rename to type/skiff/secrets/passphrases/ucp_maas_admin_password.yaml index 402c1299b..7a0548534 100644 --- a/site/airskiff/secrets/passphrases/ucp_maas_admin_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_maas_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_maas_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_maas_postgres_password.yaml b/type/skiff/secrets/passphrases/ucp_maas_postgres_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_maas_postgres_password.yaml rename to type/skiff/secrets/passphrases/ucp_maas_postgres_password.yaml index 96ec5745c..a59cd8b48 100644 --- a/site/airskiff/secrets/passphrases/ucp_maas_postgres_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_maas_postgres_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_maas_postgres_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml similarity index 93% rename from site/airskiff/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml index b513af431..7e699d594 100644 --- a/site/airskiff/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_openstack_exporter_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_oslo_db_admin_password.yaml b/type/skiff/secrets/passphrases/ucp_oslo_db_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_oslo_db_admin_password.yaml rename to type/skiff/secrets/passphrases/ucp_oslo_db_admin_password.yaml index b3c132542..4aa313278 100644 --- a/site/airskiff/secrets/passphrases/ucp_oslo_db_admin_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_oslo_db_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_oslo_db_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_oslo_messaging_password.yaml b/type/skiff/secrets/passphrases/ucp_oslo_messaging_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_oslo_messaging_password.yaml rename to type/skiff/secrets/passphrases/ucp_oslo_messaging_password.yaml index 95d6c0e3c..2f31b5532 100644 --- a/site/airskiff/secrets/passphrases/ucp_oslo_messaging_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_oslo_messaging_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_oslo_messaging_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_postgres_admin_password.yaml b/type/skiff/secrets/passphrases/ucp_postgres_admin_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_postgres_admin_password.yaml rename to type/skiff/secrets/passphrases/ucp_postgres_admin_password.yaml index 546de05ba..24633530d 100644 --- a/site/airskiff/secrets/passphrases/ucp_postgres_admin_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_postgres_admin_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_postgres_admin_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_postgres_exporter_password.yaml b/type/skiff/secrets/passphrases/ucp_postgres_exporter_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_postgres_exporter_password.yaml rename to type/skiff/secrets/passphrases/ucp_postgres_exporter_password.yaml index abdaa5bc4..cd858bfe8 100644 --- a/site/airskiff/secrets/passphrases/ucp_postgres_exporter_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_postgres_exporter_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_postgres_exporter_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_postgres_replication_password.yaml b/type/skiff/secrets/passphrases/ucp_postgres_replication_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_postgres_replication_password.yaml rename to type/skiff/secrets/passphrases/ucp_postgres_replication_password.yaml index 2176e714f..45161017c 100644 --- a/site/airskiff/secrets/passphrases/ucp_postgres_replication_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_postgres_replication_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_postgres_replication_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_promenade_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_promenade_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_promenade_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_promenade_keystone_password.yaml index ac40d1ec5..948ff306f 100644 --- a/site/airskiff/secrets/passphrases/ucp_promenade_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_promenade_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_promenade_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml b/type/skiff/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml rename to type/skiff/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml index 6a2aef93e..d0ef66676 100644 --- a/site/airskiff/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml +++ b/type/skiff/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_rabbitmq_erlang_cookie layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_shipyard_keystone_password.yaml b/type/skiff/secrets/passphrases/ucp_shipyard_keystone_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_shipyard_keystone_password.yaml rename to type/skiff/secrets/passphrases/ucp_shipyard_keystone_password.yaml index 181a52a84..8ab3ea06d 100644 --- a/site/airskiff/secrets/passphrases/ucp_shipyard_keystone_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_shipyard_keystone_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_shipyard_keystone_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ... diff --git a/site/airskiff/secrets/passphrases/ucp_shipyard_postgres_password.yaml b/type/skiff/secrets/passphrases/ucp_shipyard_postgres_password.yaml similarity index 92% rename from site/airskiff/secrets/passphrases/ucp_shipyard_postgres_password.yaml rename to type/skiff/secrets/passphrases/ucp_shipyard_postgres_password.yaml index de0eed714..9c4316573 100644 --- a/site/airskiff/secrets/passphrases/ucp_shipyard_postgres_password.yaml +++ b/type/skiff/secrets/passphrases/ucp_shipyard_postgres_password.yaml @@ -5,7 +5,7 @@ metadata: name: ucp_shipyard_postgres_password layeringDefinition: abstract: false - layer: site + layer: type storagePolicy: cleartext data: password123 ...