From bd5436f9dd58a343c74b718c3f4dfc0f71ba899f Mon Sep 17 00:00:00 2001 From: Naga Sugguna Date: Mon, 17 Sep 2018 23:04:23 -0400 Subject: [PATCH] Automatic OS Installation Successfully invoked RAID/BIOS scripts to update RAID/BIOS Settings Successfully invoked script to install OS on genesis node. hpgen10 modified and tested upto genesis Change-Id: I70d2ec41e2e4419a4931b9b5eaefffc716cebeeb Signed-off-by: Naga Sugguna --- dellgen10.yaml | 9 + site30.yaml => hpgen10.yaml | 49 +- scripts/jcopy.py | 11 +- scripts/update_bios_settings.py | 69 ++ site/common/profiles/genesis.yaml | 8 +- .../baremetal/bootaction-sriov-blacklist.yaml | 3 - .../baremetal/calico-ip-rules.yaml | 8 +- site/{site30 => hpgen10}/baremetal/promjoin.yaml | 2 - site/{site30 => hpgen10}/baremetal/rack.yaml | 69 +- .../deployment/deployment-configuration.yaml | 0 .../networks/common-addresses.yaml | 8 +- .../networks/physical/rack.yaml | 5 - site/{site30 => hpgen10}/pki/pki-catalog.yaml | 10 - site/{site30 => hpgen10}/profiles/genesis.yaml | 8 +- site/hpgen10/profiles/hardware/generic.yaml | 35 + .../profiles/host/compute-r01.yaml | 6 +- site/{site30 => hpgen10}/profiles/host/cp-r01.yaml | 37 +- site/{site30 => hpgen10}/profiles/region.yaml | 0 site/hpgen10/secrets/certificates/ingress.yaml | 128 +++ .../secrets/passphrases/ceph_fsid.yaml | 0 .../passphrases/ceph_swift_keystone_password.yaml | 0 .../secrets/passphrases/ipmi_admin_password.yaml | 2 +- .../secrets/passphrases/maas_region_secret.yaml | 0 .../passphrases/osh_barbican_oslo_db_password.yaml | 0 ...osh_barbican_oslo_messaging_admin_password.yaml | 0 .../osh_barbican_oslo_messaging_password.yaml | 0 .../secrets/passphrases/osh_barbican_password.yaml | 0 .../osh_barbican_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_cinder_oslo_db_password.yaml | 0 .../osh_cinder_oslo_messaging_admin_password.yaml | 0 .../osh_cinder_oslo_messaging_password.yaml | 0 .../secrets/passphrases/osh_cinder_password.yaml | 0 .../osh_cinder_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_glance_oslo_db_password.yaml | 0 .../osh_glance_oslo_messaging_admin_password.yaml | 0 .../osh_glance_oslo_messaging_password.yaml | 0 .../secrets/passphrases/osh_glance_password.yaml | 0 .../osh_glance_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_heat_oslo_db_password.yaml | 0 .../osh_heat_oslo_messaging_admin_password.yaml | 0 .../osh_heat_oslo_messaging_password.yaml | 0 .../secrets/passphrases/osh_heat_password.yaml | 0 .../osh_heat_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_heat_stack_user_password.yaml | 0 .../passphrases/osh_heat_trustee_password.yaml | 0 .../passphrases/osh_horizon_oslo_db_password.yaml | 0 .../osh_infra_addons_jenkins_password.yaml | 0 .../osh_infra_elasticsearch_admin_password.yaml | 0 .../osh_infra_grafana_admin_password.yaml | 0 .../osh_infra_grafana_oslo_db_password.yaml | 0 ...osh_infra_grafana_oslo_db_session_password.yaml | 0 .../osh_infra_kibana_admin_password.yaml | 0 .../osh_infra_nagios_admin_password.yaml | 0 .../osh_infra_openstack_exporter_password.yaml | 0 .../osh_infra_oslo_db_admin_password.yaml | 0 .../passphrases/osh_keystone_admin_password.yaml | 0 .../osh_keystone_ldap_mechid_password.yaml | 0 .../passphrases/osh_keystone_ldap_password.yaml | 0 .../passphrases/osh_keystone_oslo_db_password.yaml | 0 ...osh_keystone_oslo_messaging_admin_password.yaml | 0 .../osh_keystone_oslo_messaging_password.yaml | 0 .../osh_keystone_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_neutron_oslo_db_password.yaml | 0 .../osh_neutron_oslo_messaging_admin_password.yaml | 0 .../osh_neutron_oslo_messaging_password.yaml | 0 .../secrets/passphrases/osh_neutron_password.yaml | 0 .../osh_neutron_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_nova_oslo_db_password.yaml | 0 .../osh_nova_oslo_messaging_admin_password.yaml | 0 .../osh_nova_oslo_messaging_password.yaml | 0 .../secrets/passphrases/osh_nova_password.yaml | 0 .../osh_nova_rabbitmq_erlang_cookie.yaml | 0 .../passphrases/osh_oslo_cache_secret_key.yaml | 0 .../passphrases/osh_oslo_db_admin_password.yaml | 0 .../passphrases/osh_placement_password.yaml | 0 .../passphrases/ucp_airflow_postgres_password.yaml | 0 .../passphrases/ucp_armada_keystone_password.yaml | 0 .../ucp_barbican_keystone_password.yaml | 0 .../passphrases/ucp_barbican_oslo_db_password.yaml | 0 .../ucp_deckhand_keystone_password.yaml | 0 .../ucp_deckhand_postgres_password.yaml | 0 .../passphrases/ucp_drydock_keystone_password.yaml | 0 .../passphrases/ucp_drydock_postgres_password.yaml | 0 .../passphrases/ucp_keystone_admin_password.yaml | 0 .../passphrases/ucp_keystone_oslo_db_password.yaml | 0 .../passphrases/ucp_maas_admin_password.yaml | 0 .../passphrases/ucp_maas_postgres_password.yaml | 0 .../passphrases/ucp_oslo_db_admin_password.yaml | 0 .../passphrases/ucp_oslo_messaging_password.yaml | 0 .../passphrases/ucp_postgres_admin_password.yaml | 0 .../ucp_promenade_keystone_password.yaml | 0 .../passphrases/ucp_rabbitmq_erlang_cookie.yaml | 0 .../ucp_shipyard_keystone_password.yaml | 0 .../ucp_shipyard_postgres_password.yaml | 0 .../publickey/localadmin_ssh_public_key.yaml | 0 site/{site30 => hpgen10}/site-definition.yaml | 0 .../kubernetes/container-networking/calico.yaml | 0 .../kubernetes/container-networking/etcd.yaml | 3 +- .../software/charts/kubernetes/dns/coredns.yaml | 0 .../software/charts/kubernetes/etcd/etcd.yaml | 2 +- .../charts/kubernetes/ingress/ingress.yaml | 0 .../osh-infra/osh-infra-logging/elasticsearch.yaml | 16 + .../osh-infra-logging/fluent-logging.yaml | 16 + .../charts/osh/openstack-compute-kit/neutron.yaml | 2 +- .../charts/osh/openstack-compute-kit/nova.yaml | 52 ++ .../charts/ucp/ceph/ceph-client-update.yaml | 37 + .../software/charts/ucp/ceph/ceph-client.yaml | 37 + .../hpgen10/software/charts/ucp/ceph/ceph-osd.yaml | 86 +++ .../software/charts/ucp/ceph/ceph-update.yaml | 0 .../software/charts/ucp/ceph/ceph.yaml | 0 .../software/charts/ucp/divingbell/divingbell.yaml | 0 .../software/charts/ucp/drydock/maas.yaml | 0 .../software/charts/ucp/promenade/promenade.yaml | 0 .../software/config/common-software-config.yaml | 0 .../software/config/endpoints.yaml | 855 ++++++++++++++++----- .../software/config/service_accounts.yaml | 0 .../software/manifests/full-site.yaml | 11 +- .../charts/osh/openstack-compute-kit/nova.yaml | 54 -- tools/2genesis.sh | 7 + tools/generate_yamls.sh | 5 +- tools/j2/serverrc.j2 | 89 +++ tools/j2/serverrc_raid.j2 | 30 + tools/j2/set_site_env.sh | 2 + tools/pegleg.sh | 2 +- 124 files changed, 1405 insertions(+), 368 deletions(-) rename site30.yaml => hpgen10.yaml (88%) create mode 100644 scripts/update_bios_settings.py rename site/{site30 => hpgen10}/baremetal/bootaction-sriov-blacklist.yaml (88%) rename site/{site30 => hpgen10}/baremetal/calico-ip-rules.yaml (94%) rename site/{site30 => hpgen10}/baremetal/promjoin.yaml (98%) rename site/{site30 => hpgen10}/baremetal/rack.yaml (54%) rename site/{site30 => hpgen10}/deployment/deployment-configuration.yaml (100%) rename site/{site30 => hpgen10}/networks/common-addresses.yaml (93%) rename site/{site30 => hpgen10}/networks/physical/rack.yaml (97%) rename site/{site30 => hpgen10}/pki/pki-catalog.yaml (97%) rename site/{site30 => hpgen10}/profiles/genesis.yaml (93%) create mode 100644 site/hpgen10/profiles/hardware/generic.yaml rename site/{site30 => hpgen10}/profiles/host/compute-r01.yaml (97%) rename site/{site30 => hpgen10}/profiles/host/cp-r01.yaml (86%) rename site/{site30 => hpgen10}/profiles/region.yaml (100%) create mode 100644 site/hpgen10/secrets/certificates/ingress.yaml rename site/{site30 => hpgen10}/secrets/passphrases/ceph_fsid.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ceph_swift_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ipmi_admin_password.yaml (98%) rename site/{site30 => hpgen10}/secrets/passphrases/maas_region_secret.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_barbican_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_barbican_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_cinder_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_cinder_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_glance_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_glance_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_glance_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_stack_user_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_heat_trustee_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_horizon_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_addons_jenkins_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_grafana_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_kibana_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_nagios_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_openstack_exporter_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_ldap_mechid_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_ldap_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_neutron_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_neutron_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_nova_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_nova_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_nova_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_oslo_cache_secret_key.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_oslo_db_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/osh_placement_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_airflow_postgres_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_armada_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_barbican_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_barbican_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_deckhand_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_deckhand_postgres_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_drydock_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_drydock_postgres_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_keystone_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_keystone_oslo_db_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_maas_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_maas_postgres_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_oslo_db_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_oslo_messaging_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_postgres_admin_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_promenade_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_shipyard_keystone_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/passphrases/ucp_shipyard_postgres_password.yaml (100%) rename site/{site30 => hpgen10}/secrets/publickey/localadmin_ssh_public_key.yaml (100%) rename site/{site30 => hpgen10}/site-definition.yaml (100%) rename site/{site30 => hpgen10}/software/charts/kubernetes/container-networking/calico.yaml (100%) rename site/{site30 => hpgen10}/software/charts/kubernetes/container-networking/etcd.yaml (99%) rename site/{site30 => hpgen10}/software/charts/kubernetes/dns/coredns.yaml (100%) rename site/{site30 => hpgen10}/software/charts/kubernetes/etcd/etcd.yaml (100%) rename site/{site30 => hpgen10}/software/charts/kubernetes/ingress/ingress.yaml (100%) create mode 100644 site/hpgen10/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml create mode 100644 site/hpgen10/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml rename site/{site30 => hpgen10}/software/charts/osh/openstack-compute-kit/neutron.yaml (97%) create mode 100644 site/hpgen10/software/charts/osh/openstack-compute-kit/nova.yaml create mode 100644 site/hpgen10/software/charts/ucp/ceph/ceph-client-update.yaml create mode 100644 site/hpgen10/software/charts/ucp/ceph/ceph-client.yaml create mode 100644 site/hpgen10/software/charts/ucp/ceph/ceph-osd.yaml rename site/{site30 => hpgen10}/software/charts/ucp/ceph/ceph-update.yaml (100%) rename site/{site30 => hpgen10}/software/charts/ucp/ceph/ceph.yaml (100%) rename site/{site30 => hpgen10}/software/charts/ucp/divingbell/divingbell.yaml (100%) rename site/{site30 => hpgen10}/software/charts/ucp/drydock/maas.yaml (100%) rename site/{site30 => hpgen10}/software/charts/ucp/promenade/promenade.yaml (100%) rename site/{site30 => hpgen10}/software/config/common-software-config.yaml (100%) rename site/{site30 => hpgen10}/software/config/endpoints.yaml (51%) rename site/{site30 => hpgen10}/software/config/service_accounts.yaml (100%) rename site/{site30 => hpgen10}/software/manifests/full-site.yaml (92%) delete mode 100644 site/site30/software/charts/osh/openstack-compute-kit/nova.yaml create mode 100644 tools/j2/serverrc.j2 create mode 100644 tools/j2/serverrc_raid.j2 diff --git a/dellgen10.yaml b/dellgen10.yaml index 19eafe6..5e74284 100644 --- a/dellgen10.yaml +++ b/dellgen10.yaml @@ -42,6 +42,8 @@ networks: vlan: 41 interface: bond0.41 cidr: 192.168.2.0/24 + subnet: 192.168.2.0 + netmask: 255.255.255.0 routes: gateway: 192.168.2.200 ranges: @@ -85,6 +87,7 @@ networks: dns: domain: lab.akraino.org servers: '192.168.2.85 8.8.8.8 8.8.4.4' + inf: net4 ksn: vlan: 44 interface: bond0.44 @@ -219,6 +222,8 @@ genesis: pxe: 172.30.2.40 ksn: 172.29.1.40 neutron: 10.0.102.40 + root_password: smil3yfc + oem: Dell masters: - name : aknode41 oob: 192.168.41.41 @@ -227,6 +232,8 @@ masters: pxe: 172.30.2.41 ksn: 172.29.1.41 neutron: 10.0.102.41 + oob_user: root + oob_password: calvin - name : aknode42 oob: 192.168.41.42 host: 192.168.2.42 @@ -234,6 +241,8 @@ masters: pxe: 172.30.2.42 ksn: 172.29.1.42 neutron: 10.0.102.42 + oob_user: root + oob_password: calvin #workers: # - name : aknode43 # oob: 192.168.41.43 diff --git a/site30.yaml b/hpgen10.yaml similarity index 88% rename from site30.yaml rename to hpgen10.yaml index 889f0a6..4a784b9 100644 --- a/site30.yaml +++ b/hpgen10.yaml @@ -51,6 +51,9 @@ networks: static: start: 192.168.2.1 end: 192.168.2.83 + dns: + domain: lab.akraino.org + servers: '192.168.2.85 8.8.8.8 8.8.4.4' storage: vlan: 42 interface: bond0.42 @@ -76,6 +79,10 @@ networks: dhcp: start: 172.30.1.201 end: 172.30.1.254 + dns: + domain: lab.akraino.org + servers: '192.168.2.85 8.8.8.8 8.8.4.4' + inf: net4 ksn: vlan: 44 interface: bond0.44 @@ -101,6 +108,13 @@ networks: static: start: 10.0.101.2 end: 10.0.101.254 +dns: + upstream_servers: + - 192.168.2.85 + - 8.8.8.8 + - 8.8.8.8 + upstream_servers_joined: '192.168.2.85,8.8.8.8' + ingress_domain: hpgen10.akraino.org sriovnets: - physical: sriovnet1 interface: ens6f0 @@ -198,7 +212,7 @@ storage: total_osd_count: 24 genesis: name: aknode30 - oob: 192.168.41.30 + oob: 192.168.41.130 host: 192.168.2.30 storage: 172.31.1.30 pxe: 172.30.1.30 @@ -227,13 +241,13 @@ workers: pxe: 172.30.1.33 ksn: 172.29.1.33 neutron: 10.0.101.33 - - name : aknode34 - oob: 192.168.41.134 - host: 192.168.2.34 - storage: 172.31.1.34 - pxe: 172.30.1.34 - ksn: 172.29.1.34 - neutron: 10.0.101.34 +# - name : aknode34 +# oob: 192.168.41.134 +# host: 192.168.2.34 +# storage: 172.31.1.34 +# pxe: 172.30.1.34 +# ksn: 172.29.1.34 +# neutron: 10.0.101.34 hardware: vendor: HP generation: '10' @@ -258,6 +272,25 @@ disks: - name: cephj size: 300g mountpoint: /var/lib/ceph/journal +disks_compute: + - name : sdj + labels: + bootdrive: 'true' + partitions: + - name: root + size: 20g + mountpoint: / + - name: boot + size: 1g + mountpoint: /boot + - name: var + size: '>300g' + mountpoint: /var + - name : sdk + partitions: + - name: nova + size: '99%' + mountpoint: /var/lib/nova genesis_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/n4mNLAj3XKG2fcm+8eVe0NUlNH0g8DA8KJ53rSLKccm8gm4UgLmGOJyBfUloQZMuOpU6a+hexN4ECCliqI7+KUmgJgsvLkJ3OUMNTEVu9tDX5mdXeffsufaqFkAdmbJ/9PMPiPQ3/UqbbtyEcqoZAwUWf4ggAWSp00SGE1Okg+skPSbDzPVHb4810eXZT1yoIg29HAenJNNrsVxvnMT2kw2OYmLfxgEUh1Ev4c5LnUog4GXBDHQtHAwaIoTu9s/q8VIvGav62RJVFn3U1D0jkiwDLSIFn8ezORQ4YkSidwdSrtqsqa2TJ0E5w/n5h5IVGO9neY8YlXrgynLd4Y+7 root@pocnjrsv132" kubernetes: api_service_ip: 10.96.0.1 diff --git a/scripts/jcopy.py b/scripts/jcopy.py index b0d1db6..ac89508 100755 --- a/scripts/jcopy.py +++ b/scripts/jcopy.py @@ -55,22 +55,21 @@ def expand_files(target_dir, dir_name, files): print '{0} -> {1}'.format(source_path, target_path) total += 1 -def expand_file(target_dir, file): +def expand_file(target_file, file): global total - if not os.path.exists(target_dir): - os.makedirs(target_dir) + if not os.path.exists(os.path.dirname(target_file)): + os.makedirs(os.path.dirname(target_file)) env = jinja2.Environment() env.trim_blocks = True env.lstrip_blocks = True with open(file) as fd: template = env.from_string(fd.read()) data = template.render(yaml=yaml) - target_path = target_dir + '/' + os.path.basename(file) - fd2 = open(target_path,'w') + fd2 = open(target_file,'w') fd2.write(data) fd2.write("\n") fd2.close() - print '{0} -> {1}'.format(file, target_path) + print '{0} -> {1}'.format(file, target_file) total += 1 if len(sys.argv) != 4: diff --git a/scripts/update_bios_settings.py b/scripts/update_bios_settings.py new file mode 100644 index 0000000..d85d521 --- /dev/null +++ b/scripts/update_bios_settings.py @@ -0,0 +1,69 @@ +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +import os +import sys +import yaml +import jinja2 +import subprocess + +with open(sys.argv[1]) as f: + yaml = yaml.safe_load(f) + +def create_rc_genesis(source, target_suffix): + env = jinja2.Environment() + env.trim_blocks = True + env.lstrip_blocks = True + + with open(source) as fd: + template = env.from_string(fd.read()) + data = template.render(yaml=yaml) + target_file = yaml['genesis']['name']+target_suffix + fd2 = open(target_file,'w') + fd2.write(data) + fd2.write("\n") + fd2.close() + print '{0} -> {1}'.format(source, target_file) + +def create_rc_masters(source, target_suffix): + env = jinja2.Environment() + env.trim_blocks = True + env.lstrip_blocks = True + + for master in yaml['masters']: + with open(source) as fd: + template = env.from_string(fd.read()) + data = template.render(yaml=master) + target_file = "server-config/"+master['name']+target_suffix + print target_file + if not os.path.exists(os.path.dirname(target_file)): + os.makedirs(os.path.dirname(target_file)) + fd2 = open(target_file,'w') + fd2.write(data) + fd2.write("\n") + fd2.close() + print '{0} -> {1}'.format(source, target_file) + command = '/opt/akraino/redfish/apply_dellxml.sh --rc {0} --template dell_r740_g14_uefi_base.xml.template --no-confirm'.format(target_file) + print 'command: {0}'.format(command) + os.system(command) + +if len(sys.argv) != 2: + print 'usage: update_bios_settings.py ' + sys.exit(1) + +#create_rc_genesis("tools/j2/serverrc.j2", "rc") +create_rc_masters("tools/j2/serverrc_raid.j2", "rc.raid") + diff --git a/site/common/profiles/genesis.yaml b/site/common/profiles/genesis.yaml index 8f8c4d5..62b4d5a 100644 --- a/site/common/profiles/genesis.yaml +++ b/site/common/profiles/genesis.yaml @@ -50,8 +50,8 @@ data: - ucp-control-plane=enabled - maas-control-plane=enabled - ceph-osd-bootstrap=enabled -# - openstack-libvirt=kernel -# - openvswitch=enabled -# - openstack-control-plane=enabled -# - openstack-nova-compute=enabled + - openstack-libvirt=kernel + - openvswitch=enabled + - openstack-control-plane=enabled + - openstack-nova-compute=enabled ... diff --git a/site/site30/baremetal/bootaction-sriov-blacklist.yaml b/site/hpgen10/baremetal/bootaction-sriov-blacklist.yaml similarity index 88% rename from site/site30/baremetal/bootaction-sriov-blacklist.yaml rename to site/hpgen10/baremetal/bootaction-sriov-blacklist.yaml index 70b8e14..6ffb825 100644 --- a/site/site30/baremetal/bootaction-sriov-blacklist.yaml +++ b/site/hpgen10/baremetal/bootaction-sriov-blacklist.yaml @@ -15,9 +15,6 @@ data: filter_set_type: 'union' filter_set: - filter_type: 'union' - node_names: - - 'aknode33' - - 'aknode34' assets: - path: /etc/modprobe.d/sriov_blacklist.conf type: file diff --git a/site/site30/baremetal/calico-ip-rules.yaml b/site/hpgen10/baremetal/calico-ip-rules.yaml similarity index 94% rename from site/site30/baremetal/calico-ip-rules.yaml rename to site/hpgen10/baremetal/calico-ip-rules.yaml index c61b8b7..89c0e53 100644 --- a/site/site30/baremetal/calico-ip-rules.yaml +++ b/site/hpgen10/baremetal/calico-ip-rules.yaml @@ -46,12 +46,8 @@ data: [Service] Type=simple - #ExecStart=/opt/configure-ip-rules.sh -i bond1.2406 -c DH_SUB_POD_CIDR -o 10.34.0.0/15 -s 135.21.157.32/29 - #ExecStart=/opt/configure-ip-rules.sh -i bond0.44 -c DH_SUB_POD_CIDR -o 10.99.0.0/16 -s 172.29.1.0/24 ExecStart=/opt/configure-ip-rules.sh -g 172.29.1.1 -c 10.99.0.0/16 -s 172.29.1.136/29 - - [Install] WantedBy=multi-user.target data_pipeline: @@ -69,7 +65,7 @@ data: cat <&2 + echo "Missing pod CIDR, e.g -c 10.99.0.0/16" >&2 usage exit 1 fi diff --git a/site/site30/baremetal/promjoin.yaml b/site/hpgen10/baremetal/promjoin.yaml similarity index 98% rename from site/site30/baremetal/promjoin.yaml rename to site/hpgen10/baremetal/promjoin.yaml index 4ef7865..2ffcdef 100644 --- a/site/site30/baremetal/promjoin.yaml +++ b/site/hpgen10/baremetal/promjoin.yaml @@ -35,7 +35,6 @@ data: - 'aknode31' - 'aknode32' - 'aknode33' - - 'aknode34' # TODO(alanmeadows) move what is global about this document - everything except nodenames to global assets: - path: /opt/promjoin.sh @@ -45,7 +44,6 @@ data: # you should use to contact kubernetes in the case below, this is cab24_mgmt 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: -#originally rack06_calico - template data_pipeline: - utf8_decode diff --git a/site/site30/baremetal/rack.yaml b/site/hpgen10/baremetal/rack.yaml similarity index 54% rename from site/site30/baremetal/rack.yaml rename to site/hpgen10/baremetal/rack.yaml index 40c740b..843bfcd 100644 --- a/site/site30/baremetal/rack.yaml +++ b/site/hpgen10/baremetal/rack.yaml @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ############################################################################## - schema: 'drydock/BaremetalNode/v1' metadata: schema: 'metadata/Document/v1' @@ -24,11 +23,17 @@ metadata: layer: site storagePolicy: cleartext data: - host_profile: MyControlPlane_HP + host_profile: ControlPlane + # the hostname for a server, could be used in multiple DNS domains to + # represent different interfaces addressing: + # Which network the address applies to. If a network appears in addressing + # that isn't assigned to an interface, design validation will fail - network: oob address: 192.168.41.131 - network: pxe + # The address assigned. Either a explicit IPv4 or IPv6 address + # or dhcp or slaac address: 172.30.1.31 - network: oam address: 192.168.2.31 @@ -43,6 +48,21 @@ data: tags: - 'masters' --- +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## schema: 'drydock/BaremetalNode/v1' metadata: schema: 'metadata/Document/v1' @@ -52,12 +72,17 @@ metadata: layer: site storagePolicy: cleartext data: - host_profile: MyControlPlane_HP -#/new/notused/aic-clcp-manifests/site/clcp-seaworthy/profiles/host/cp_rack.yaml + host_profile: ControlPlane + # the hostname for a server, could be used in multiple DNS domains to + # represent different interfaces addressing: + # Which network the address applies to. If a network appears in addressing + # that isn't assigned to an interface, design validation will fail - network: oob address: 192.168.41.132 - network: pxe + # The address assigned. Either a explicit IPv4 or IPv6 address + # or dhcp or slaac address: 172.30.1.32 - network: oam address: 192.168.2.32 @@ -81,11 +106,17 @@ metadata: layer: site storagePolicy: cleartext data: - host_profile: MyComputePlane_HP + host_profile: ComputePlane + # the hostname for a server, could be used in multiple DNS domains to + # represent different interfaces addressing: + # Which network the address applies to. If a network appears in addressing + # that isn't assigned to an interface, design validation will fail - network: oob address: 192.168.41.133 - network: pxe + # The address assigned. Either a explicit IPv4 or IPv6 address + # or dhcp or slaac address: 172.30.1.33 - network: oam address: 192.168.2.33 @@ -99,32 +130,4 @@ data: rack: RACK01 tags: - 'workers' -#--- -#schema: 'drydock/BaremetalNode/v1' -#metadata: -# schema: 'metadata/Document/v1' -# name: aknode34 -# layeringDefinition: -# abstract: false -# layer: site -# storagePolicy: cleartext -#data: -# host_profile: MyComputePlane_HP -# addressing: -# - network: oob -# address: 192.168.41.134 -# - network: pxe -# address: 172.30.1.34 -# - network: oam -# address: 192.168.2.34 -# - network: storage -# address: 172.31.1.34 -# - network: overlay -# address: 10.0.101.34 -# - network: calico -# address: 172.29.1.34 -# metadata: -# rack: RACK01 -# tags: -# - 'workers' ... diff --git a/site/site30/deployment/deployment-configuration.yaml b/site/hpgen10/deployment/deployment-configuration.yaml similarity index 100% rename from site/site30/deployment/deployment-configuration.yaml rename to site/hpgen10/deployment/deployment-configuration.yaml diff --git a/site/site30/networks/common-addresses.yaml b/site/hpgen10/networks/common-addresses.yaml similarity index 93% rename from site/site30/networks/common-addresses.yaml rename to site/hpgen10/networks/common-addresses.yaml index e655e08..d8df072 100644 --- a/site/site30/networks/common-addresses.yaml +++ b/site/hpgen10/networks/common-addresses.yaml @@ -37,10 +37,9 @@ data: - 8.8.8.8 - 8.8.8.8 upstream_servers_joined: '192.168.2.85,8.8.8.8' - + ingress_domain: hpgen10.akraino.org genesis: hostname: aknode30 -# ip: 192.168.2.30 ip: 172.29.1.30 bootstrap: @@ -73,13 +72,14 @@ data: ntp: servers_joined: '0.ubuntu.pool.ntp.org,1.ubuntu.pool.ntp.org,2.ubuntu.pool.ntp.org' - # Used for FQDN setup/definition domain: url: hpgen10.lab.akraino.org ldap: + base_url: 'its-a-ldap.example.com' url: 'ldap://its-a-ldap.example.com' + auth_path: DC=test,DC=test,DC=com?sAMAccountName?sub?memberof=CN=test,OU=Application,OU=Groups,DC=test,DC=test,DC=com common_name: AP-NC_Test_Users subdomain: testitservices domain: example @@ -89,8 +89,6 @@ data: public_cidr: '172.31.1.0/24' cluster_cidr: '172.31.1.0/24' - # external: typically the floating IP subnet - # tunnel: overlay network for VM traffic neutron: tunnel_device: 'bond0.45' external_iface: 'bond0' diff --git a/site/site30/networks/physical/rack.yaml b/site/hpgen10/networks/physical/rack.yaml similarity index 97% rename from site/site30/networks/physical/rack.yaml rename to site/hpgen10/networks/physical/rack.yaml index fd58d2a..8348382 100644 --- a/site/site30/networks/physical/rack.yaml +++ b/site/hpgen10/networks/physical/rack.yaml @@ -107,7 +107,6 @@ data: schema: 'drydock/NetworkLink/v1' metadata: schema: 'metadata/Document/v1' -# name: gp name: bond0 layeringDefinition: abstract: false @@ -127,7 +126,6 @@ data: mode: 802.1q allowed_networks: - oam -# - public - storage - overlay - calico @@ -212,7 +210,4 @@ data: - type: static start: 172.29.1.5 end: 172.29.1.254 -# routes: -# - subnet: '172.29.140.64/26' -# gateway: 172.29.140.3 ... diff --git a/site/site30/pki/pki-catalog.yaml b/site/hpgen10/pki/pki-catalog.yaml similarity index 97% rename from site/site30/pki/pki-catalog.yaml rename to site/hpgen10/pki/pki-catalog.yaml index b7910a5..a0ea7ee 100644 --- a/site/site30/pki/pki-catalog.yaml +++ b/site/hpgen10/pki/pki-catalog.yaml @@ -82,15 +82,6 @@ data: - 172.30.1.33 groups: - system:nodes - - document_name: kubelet-aknode34 - common_name: system:node:aknode34 - hosts: - - aknode34 - - 192.168.2.34 - - 172.29.1.34 - - 172.30.1.34 - groups: - - system:nodes - document_name: scheduler description: Service certificate for Kubernetes scheduler common_name: system:kube-scheduler @@ -282,4 +273,3 @@ data: - name: service-account description: Service account signing key for use by Kubernetes controller-manager. ... - diff --git a/site/site30/profiles/genesis.yaml b/site/hpgen10/profiles/genesis.yaml similarity index 93% rename from site/site30/profiles/genesis.yaml rename to site/hpgen10/profiles/genesis.yaml index 8f8c4d5..62b4d5a 100644 --- a/site/site30/profiles/genesis.yaml +++ b/site/hpgen10/profiles/genesis.yaml @@ -50,8 +50,8 @@ data: - ucp-control-plane=enabled - maas-control-plane=enabled - ceph-osd-bootstrap=enabled -# - openstack-libvirt=kernel -# - openvswitch=enabled -# - openstack-control-plane=enabled -# - openstack-nova-compute=enabled + - openstack-libvirt=kernel + - openvswitch=enabled + - openstack-control-plane=enabled + - openstack-nova-compute=enabled ... diff --git a/site/hpgen10/profiles/hardware/generic.yaml b/site/hpgen10/profiles/hardware/generic.yaml new file mode 100644 index 0000000..3c03512 --- /dev/null +++ b/site/hpgen10/profiles/hardware/generic.yaml @@ -0,0 +1,35 @@ +--- +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +schema: 'drydock/HardwareProfile/v1' +metadata: + schema: 'metadata/Document/v1' + name: DELL_HP_Generic + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +data: + vendor: HP + generation: '10' + hw_version: '3' + bios_version: '2.8' + boot_mode: bios + bootstrap_protocol: pxe + pxe_interface: 0 + device_aliases: {} +... diff --git a/site/site30/profiles/host/compute-r01.yaml b/site/hpgen10/profiles/host/compute-r01.yaml similarity index 97% rename from site/site30/profiles/host/compute-r01.yaml rename to site/hpgen10/profiles/host/compute-r01.yaml index c860161..67b04d8 100644 --- a/site/site30/profiles/host/compute-r01.yaml +++ b/site/hpgen10/profiles/host/compute-r01.yaml @@ -18,10 +18,10 @@ schema: drydock/HostProfile/v1 metadata: schema: metadata/Document/v1 - name: MyComputePlane_HP + name: ComputePlane storagePolicy: cleartext labels: - hosttype: MyComputePlane_HP + hosttype: ComputePlane layeringDefinition: abstract: false layer: site @@ -77,7 +77,6 @@ data: partitions: - name: 'root' size: '20g' - bootable: true filesystem: mountpoint: '/' fstype: 'ext4' @@ -123,4 +122,3 @@ data: sriov: enabled beta.kubernetes.io/fluentd-ds-ready: 'true' ... - diff --git a/site/site30/profiles/host/cp-r01.yaml b/site/hpgen10/profiles/host/cp-r01.yaml similarity index 86% rename from site/site30/profiles/host/cp-r01.yaml rename to site/hpgen10/profiles/host/cp-r01.yaml index a557e5a..7caff3c 100644 --- a/site/site30/profiles/host/cp-r01.yaml +++ b/site/hpgen10/profiles/host/cp-r01.yaml @@ -18,10 +18,10 @@ schema: drydock/HostProfile/v1 metadata: schema: metadata/Document/v1 - name: MyControlPlane_HP + name: ControlPlane storagePolicy: cleartext labels: - hosttype: MyControlPlane_HP + hosttype: ControlPlane layeringDefinition: abstract: false layer: site @@ -38,7 +38,7 @@ data: network: 'oob' account: 'Administrator' primary_network: 'oam' - hardware_profile: DELL_HP_Generic + hardware_profile: DELL_HP_Generic interfaces: pxe: device_link: pxe @@ -56,6 +56,18 @@ data: - 'storage' - 'overlay' - 'calico' + p1p1: + slaves: + - 'sriov_nic01' + sriov: + vf_count: 32 # Currently ignored + trustedmode: false + p3p2: + slaves: + - 'sriov_nic02' + sriov: + vf_count: 32 # Currently ignored + trustedmode: false storage: physical_devices: sdj: @@ -64,7 +76,6 @@ data: partitions: - name: 'root' size: '20g' - bootable: true filesystem: mountpoint: '/' fstype: 'ext4' @@ -92,8 +103,16 @@ data: platform: image: 'xenial' kernel: 'hwe-16.04' -# kernel_params: -# console: 'ttyS1,115200n8' + kernel_params: + console: 'ttyS1,115200n8' + intel_iommu: 'on' + iommu: 'pt' + amd_iommu: 'on' + transparent_hugepage: 'never' + hugepagesz: 'hardwareprofile:hugepages.dpdk.size' + hugepages: 'hardwareprofile:hugepages.dpdk.count' + default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size' + isolcpus: 'hardwareprofile:cpuset.kvm' metadata: owner_data: control-plane: enabled @@ -113,11 +132,14 @@ data: openstack-cinder-control: enabled openstack-cinder-volume: control openstack-neutron: enabled + openstack-libvirt: kernel openvswitch: enabled + openstack-nova-compute: enabled sriov: enabled ucp-barbican: enabled ceph-bootstrap: enabled ceph-mon: enabled + ceph-mgr: enabled ceph-osd: enabled ceph-mds: enabled ceph-rgw: enabled @@ -149,8 +171,5 @@ data: postgresql: enabled kube-ingress: enabled sriov: enabled - openstack-nova-compute: enabled - openstack-libvirt: kernel beta.kubernetes.io/fluentd-ds-ready: 'true' ... - diff --git a/site/site30/profiles/region.yaml b/site/hpgen10/profiles/region.yaml similarity index 100% rename from site/site30/profiles/region.yaml rename to site/hpgen10/profiles/region.yaml diff --git a/site/hpgen10/secrets/certificates/ingress.yaml b/site/hpgen10/secrets/certificates/ingress.yaml new file mode 100644 index 0000000..3bd7a2e --- /dev/null +++ b/site/hpgen10/secrets/certificates/ingress.yaml @@ -0,0 +1,128 @@ +--- +# self-signed certifacte generated based on +# https://libvirt.org/remote.html#Remote_certificates +metadata: + layeringDefinition: + abstract: false + layer: site + name: ingress-crt + schema: metadata/Document/v1 + storagePolicy: cleartext +schema: deckhand/Certificate/v1 +data: | + -----BEGIN CERTIFICATE----- + MIIFKzCCA5OgAwIBAgIMW2h6FCcFdKeaw3vnMA0GCSqGSIb3DQEBCwUAMBIxEDAO + BgNVBAMTB0FpcnNoaXAwHhcNMTgwODA2MTY0MDUyWhcNMTkwODA2MTY0MDUyWjBJ + MTUwMwYDVQQDEyxpbmdyZXNzLmFpcnNoaXAtc2Vhd29ydGh5LmF0bGFudGFmb3Vu + ZHJ5LmNvbTEQMA4GA1UEChMHQWlyc2hpcDCCAaIwDQYJKoZIhvcNAQEBBQADggGP + ADCCAYoCggGBALvNHm/G/ylh6aPcvrhOcb4qz1BjcNtnxH8bzZng/rMeX3W2AzjC + r2JloJcDvOLBp/TkLOZPImnFW2/GCwktxPgXZuBTPzFV50g77KsPFw0fn3Si7+bs + F22tLhdOGk6MQj/WW4pKGHqdw1/VbPwOHBT+I4/scR1L2SZxYtSFIKGenHJH+PMV + bCdwnNOR80F8KRzK5iZs/r6S/QqVheieARSWWnk2+TtkM1BloGOhLSd+ZkWh9VO1 + eOnZowkaDAJwD/G6zoSr5n+beaXzDnEcoVXFSwd4FLoV+om77o92XmZ4rVw0vTMO + k6jVwmkdT+dM2K2hLUG/TXWoV2/Qms70gzDOs85RtAkTPe4Ohtdpr51Q0hd35TKG + YLKzX/OPblD68iYJYSBvMPpAVTbFYVPW1AQx8wWfannYbMoeL8XTEOKfkqm90YP9 + EhIdtmw4D7GZxlzG5FXXutmT9sqLfqlRu/RynAhBP8NQvw74WumhOe8r7GhCwgzC + gaPLGjeekoS6LQIDAQABo4IBSDCCAUQwDAYDVR0TAQH/BAIwADCBzQYDVR0RBIHF + MIHCgixpbmdyZXNzLmFpcnNoaXAtc2Vhd29ydGh5LmF0bGFudGFmb3VuZHJ5LmNv + bYIta2V5c3RvbmUuYWlyc2hpcC1zZWF3b3J0aHkuYXRsYW50YWZvdW5kcnkuY29t + gilub3ZhLmFpcnNoaXAtc2Vhd29ydGh5LmF0bGFudGFmb3VuZHJ5LmNvbYIsaG9y + aXpvbi5haXJzaGlwLXNlYXdvcnRoeS5hdGxhbnRhZm91bmRyeS5jb22HBAoXFQuH + BAoXFgswEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAwegADAdBgNV + HQ4EFgQUfTAjNgn/1U1Uh1MJDYT2m4dzhsYwHwYDVR0jBBgwFoAUJFuXPZo6RzfE + BlJjnnk5jhcP4wIwDQYJKoZIhvcNAQELBQADggGBAE2ISWmrxqrledJI3aLaS9Yw + WsZc8O8CnIyLoxrE85vUubFjuI9ixC/6dJxl2iB1n0H8JgmFREox32Q4+kDJI8V/ + X9x0PFpRzL7QEPrLZhW94Yis3sOphLW0rf0t06ZepdHHeodYJu1pVMDmLq6bKXdX + vo+/WwKnZBXC1qPbXJByv/CN9MtViXOnBGORFRTJPb6U8379LNWclJ/LW12yTwNk + JGIbZU61Vxu+2nLIabmmRoODH2jomgMOMMzLgjT3Hvw3whe8GrUoxDiPYQVTDGNm + ly6m+5B1Nx06fkZazonozeaOhSQ7RblUSbo+w8TJmLRzD9ft7p4vpjBGxRADMcuF + DOjATgdZeisBUHTGEO0P6wJOBQuCFMX9AVl+u8ZpcuRaRaN+pBE6/BqcHBB6qV/N + w2DdNtP8BrJ3kJVNEDIo5oTbH5SToxgA4hWBV42M1rB+5vIMDKN3rwVDdNKWYhYc + VZpU3V9V6JzSW1O2w4Wu9PdbWJD9oSvC0qJgnjOXzg== + -----END CERTIFICATE----- +... +--- +metadata: + layeringDefinition: + abstract: false + layer: site + name: ingress-ca + schema: metadata/Document/v1 + storagePolicy: cleartext +schema: deckhand/CertificateAuthority/v1 +data: | + -----BEGIN CERTIFICATE----- + MIID7TCCAlWgAwIBAgIMW2h3tgSwie0Ypx8eMA0GCSqGSIb3DQEBCwUAMBIxEDAO + BgNVBAMTB0FpcnNoaXAwHhcNMTgwODA2MTYzMDQ2WhcNMTkwODA2MTYzMDQ2WjAS + MRAwDgYDVQQDEwdBaXJzaGlwMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKC + AYEAny0Nqu9U2tXdCCTNzD2T62htMmBLg3CmzWajfbfFl7ALqzo3HgbbY3PxTHDE + OJ/lwdm0HkEaGfEDXhJd06WZsa8+fKGqhKXvZXwXx5mJ8LCGxz6xiaxwo9lnKe6V + o3YX7bJ5YIVxQ2jhvZo+dY8Z/buloi2Tp2HbqTejKULH9+qdiQTDXAnyR0NLqzJ0 + YQ4v4yU3zix3nBi8z29lQekGO9quNEka3nw2n0Gxmq5z1bNALGCF5F759mVkB0uT + fPGF+zm9eqlqAgduYg7R+JYUumVHvIoRY454GtAdZHTJHJZP0gQSGJsLff8ROFpI + GVYsOZhJXU9Ihc5VBC5PMErbmCn0YkuxAWNOYBstZ8l+uY6YiPoFV5Ulc/8M0If+ + T6jbqzWoFC+4ysgY95RKOw53S4o/T6AFwiIKIw0xp3UfHCf6kr5Y0+XdDn5CXpJB + d1KK3PoUWzPSsxcUMXvgKWT4x1vsCId21dn1SmVSOEBhM08VZfjd5bvL9Xjt/E0j + mUqDAgMBAAGjQzBBMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0PAQH/BAUDAwcEADAd + BgNVHQ4EFgQUJFuXPZo6RzfEBlJjnnk5jhcP4wIwDQYJKoZIhvcNAQELBQADggGB + AJaoEtnDoWUUs4nSSqIGcoCfpIO0oqVp8DvkBOcxz5Rz8vMVJSC24/UnuCD2Wknx + 2V/E3edXIeRo7duhPtNCT7c8OKY/pJsZQTgOczn4rphoD1pmAIPZmpG6ssPadPiM + EP8xWJHZt8NXG7D5kJX2COvBvgNeWXL6MF7Tv8+t5xzt59Vitdb/7lm9Z6jjpvN+ + zoG0pKx3XYESsnLAVAf00F+kWwds/3x3gQywUAQUDER0jliYUE5id+sojp357Cl9 + XtY+8zSnTduuP8CfMhwv5p6j9xbqacfT7AzpQ6cy4xcQ7MA6JBQcxbaq4NtvIf6+ + d/5N9d8LGnfXdCd9iwNy9Qk23Ea0SNhnk9F/NqGBPakU4TbHh4iTYMC/+hDGInpO + TIRelTidNBFNaIBg3Z0vsh0lDwbt/xhpXip+ZVBqKMTtktEceiVGru9cYUQA2tKI + XNoc5s0uQGMpdFzgED4lXZf+n7yGVMKohvi7Yn96HqujGIrVH6qThsI6m7pUSz40 + +g== + -----END CERTIFICATE----- +... +--- +metadata: + layeringDefinition: + abstract: false + layer: site + name: ingress-key + schema: metadata/Document/v1 + storagePolicy: cleartext +schema: deckhand/CertificateKey/v1 +data: | + -----BEGIN RSA PRIVATE KEY----- + MIIG4wIBAAKCAYEAu80eb8b/KWHpo9y+uE5xvirPUGNw22fEfxvNmeD+sx5fdbYD + OMKvYmWglwO84sGn9OQs5k8iacVbb8YLCS3E+Bdm4FM/MVXnSDvsqw8XDR+fdKLv + 5uwXba0uF04aToxCP9ZbikoYep3DX9Vs/A4cFP4jj+xxHUvZJnFi1IUgoZ6cckf4 + 8xVsJ3Cc05HzQXwpHMrmJmz+vpL9CpWF6J4BFJZaeTb5O2QzUGWgY6EtJ35mRaH1 + U7V46dmjCRoMAnAP8brOhKvmf5t5pfMOcRyhVcVLB3gUuhX6ibvuj3ZeZnitXDS9 + Mw6TqNXCaR1P50zYraEtQb9NdahXb9CazvSDMM6zzlG0CRM97g6G12mvnVDSF3fl + MoZgsrNf849uUPryJglhIG8w+kBVNsVhU9bUBDHzBZ9qedhsyh4vxdMQ4p+Sqb3R + g/0SEh22bDgPsZnGXMbkVde62ZP2yot+qVG79HKcCEE/w1C/Dvha6aE57yvsaELC + DMKBo8saN56ShLotAgMBAAECggGAYzZDhA1+sx/0zApL/xYB5NK83t0Ju/8fwX6w + qUBBjeLXz1mubgf7m2HQ6ragzLI9xpPcXHcl2PbYDT50ig7R5baHNK8FzUxyeKif + qOa56Mbx+C4zyqyi2+AHX2x1XVWfkhXuGip2sCA0HKalgqr5juWLZ/ci8rUlLLft + 3BPQX1FpmL4I+HIyxsspLmQGPGwZVAqkd1xRX+BLKZJAQdlm/LdJaIvwMr4Glcx6 + ZOe68QhHgzXCYsyV6gR9qstF2OvVuLa2mUc7EzYInFIFhXUdAAwmDqkuuLRdRQhf + Ur8nqQW33T0cG0GBUzgBI5YmSPJvTSzcPmeSyNVx2/Yb0pkuXtCw67oDcAsN4nW8 + uls49E2RaiLJYsy5vPsX5aJNcAxw/CWLdadQ3ukviD/MDJbpTl4F52GOVYL6K4XH + g5TJjj7xzjmK3ldR/Kscg7HpCitQLGUYdgIsAFdspXf4aSIa68IjDrc5NsJZuMzc + PbVHrw7QYNfHY7VNdUlOVqH5lS3BAoHBANRqKrQXtnJmM006TCEJXdcN/5M685jz + +L4Ox0Rhrq8ROgcN5q/hjKb6kP/MccQ9voGQOl9TKEyinGNdTtyc/fuH7RNlQwpS + HT+vEzVEcrSe8UFs8c6oJnHFO72ylFcibFf56LvbI3L8BZXp7gPSPQkp5f1NWEZk + X5bUL4UNiOm0diltba/ofxywF0M9WGD00eqi0Q29JRlvun+355j06CENxRoonNZC + wk1evIxhhckP9zLjI2Ykb1hV6yzwPWtmyQKBwQDiVgru/B396KhzDhLl5AL+pBWA + GsfiCbmPLh6W6V5VzldB4+GlMRrJ4zSjZQ3/nvX5KepqjMn1N6LQpZQUI/YShCKE + mW0XMiAfbp2d23MRMjLD8L/bIoBHQOPkCaMjbmyDOlCagWakEvHJO/TieVgTmYk6 + mtEYVjJFWI9OCNMAHdl8ovWr3p+8YbVZ8LLv5ZO/V1cIjczoNQ6p8LG/pPMTDLXM + ScN9a8z3f8LQLBHBlu0155xvt95PQLAon/x21kUCgcAvPVk36hoiQQZhw3hQ1JNx + E2TmanLobkHAiurYE11VA+DC1t2Z+fBc5la+/MnEWfL3P4srzgOlX3imRIcYWzXE + 7crUyG1ray2kDxyXeRyFfN+srDzut8is/q81lfSVmEs+GY8f0DGHDfN0Dq1nXidC + 1XWXqs7aANKdaZ0T2xm61+57ciG1wGAckjDqPEdecLQKmaEijBEnIgj5BH5WLwk8 + 6KIQGj4fDIPHzyzhj4LAX3ObdpZVzf6RR7JgsSEHtLkCgcBROW2dDC87MqZY++D+ + TVBhz8LDgVjgHntQDc3+fGtVQcKAq+YLYU7qyrXWOWrHpGVDcK5mZHYJoVi1peY5 + QBqL1I2KpoDGxT9P6GN6BgoKTsh3FsvTOVNtvrTJ3keEbJlWkrPgbrXGBeJtRC4C + pGdeSUg9FtgY8r4BsuFisLoAHbYyC008y5zpfusVBtNAUlQuY4qhUDoLzxafF/jB + /NEasgH/+SzFss0QuPHRwS7yGVaxdJfoY8TNDjrpqVhx0T0CgcEAvKG4UoWvT8gJ + pIeeAxxnv9yrMxgpntu4RXPDHgfX5tva6EaM3r3nLXjd9FVtlQ4cNBMhp9HNhS3a + dK+oEDcBysVxxfltlS2Bx0+gQf3WxgBCJwayKe3i/XCDza92EENgxTPmqB1LHiq5 + 2b5aOl2Y5fP0eX6UryxRc443c/ejMHw4lGwnno0qpRk9M9Ucqv5J96QCfAlBSQQS + gOG9cypL0kBWzCejn9W4av8HkM8Noqd7Tqul1onv/46OBaX51kt3 + -----END RSA PRIVATE KEY----- +... diff --git a/site/site30/secrets/passphrases/ceph_fsid.yaml b/site/hpgen10/secrets/passphrases/ceph_fsid.yaml similarity index 100% rename from site/site30/secrets/passphrases/ceph_fsid.yaml rename to site/hpgen10/secrets/passphrases/ceph_fsid.yaml diff --git a/site/site30/secrets/passphrases/ceph_swift_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ceph_swift_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ceph_swift_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ceph_swift_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ipmi_admin_password.yaml b/site/hpgen10/secrets/passphrases/ipmi_admin_password.yaml similarity index 98% rename from site/site30/secrets/passphrases/ipmi_admin_password.yaml rename to site/hpgen10/secrets/passphrases/ipmi_admin_password.yaml index ba74e7d..523484d 100644 --- a/site/site30/secrets/passphrases/ipmi_admin_password.yaml +++ b/site/hpgen10/secrets/passphrases/ipmi_admin_password.yaml @@ -23,5 +23,5 @@ metadata: abstract: false layer: site storagePolicy: cleartext -data: Admin123 +data: calvin ... diff --git a/site/site30/secrets/passphrases/maas_region_secret.yaml b/site/hpgen10/secrets/passphrases/maas_region_secret.yaml similarity index 100% rename from site/site30/secrets/passphrases/maas_region_secret.yaml rename to site/hpgen10/secrets/passphrases/maas_region_secret.yaml diff --git a/site/site30/secrets/passphrases/osh_barbican_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_barbican_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_barbican_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_barbican_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_barbican_password.yaml b/site/hpgen10/secrets/passphrases/osh_barbican_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_barbican_password.yaml rename to site/hpgen10/secrets/passphrases/osh_barbican_password.yaml diff --git a/site/site30/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_cinder_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_cinder_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_cinder_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_cinder_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_cinder_password.yaml b/site/hpgen10/secrets/passphrases/osh_cinder_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_cinder_password.yaml rename to site/hpgen10/secrets/passphrases/osh_cinder_password.yaml diff --git a/site/site30/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_glance_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_glance_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_glance_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_glance_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_glance_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_glance_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_glance_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_glance_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_glance_password.yaml b/site/hpgen10/secrets/passphrases/osh_glance_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_glance_password.yaml rename to site/hpgen10/secrets/passphrases/osh_glance_password.yaml diff --git a/site/site30/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_heat_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_heat_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_password.yaml b/site/hpgen10/secrets/passphrases/osh_heat_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_password.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_password.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_stack_user_password.yaml b/site/hpgen10/secrets/passphrases/osh_heat_stack_user_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_stack_user_password.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_stack_user_password.yaml diff --git a/site/site30/secrets/passphrases/osh_heat_trustee_password.yaml b/site/hpgen10/secrets/passphrases/osh_heat_trustee_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_heat_trustee_password.yaml rename to site/hpgen10/secrets/passphrases/osh_heat_trustee_password.yaml diff --git a/site/site30/secrets/passphrases/osh_horizon_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_horizon_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_horizon_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_horizon_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_addons_jenkins_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_addons_jenkins_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_addons_jenkins_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_addons_jenkins_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_grafana_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_grafana_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_grafana_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_grafana_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_kibana_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_kibana_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_kibana_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_kibana_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_nagios_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_nagios_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_nagios_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_nagios_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_openstack_exporter_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_openstack_exporter_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_openstack_exporter_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_openstack_exporter_password.yaml diff --git a/site/site30/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_ldap_mechid_password.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_ldap_mechid_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_ldap_mechid_password.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_ldap_mechid_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_ldap_password.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_ldap_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_ldap_password.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_ldap_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_neutron_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_neutron_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_neutron_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_neutron_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_neutron_password.yaml b/site/hpgen10/secrets/passphrases/osh_neutron_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_neutron_password.yaml rename to site/hpgen10/secrets/passphrases/osh_neutron_password.yaml diff --git a/site/site30/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_nova_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/osh_nova_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_nova_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/osh_nova_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_nova_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/osh_nova_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_nova_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/osh_nova_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/osh_nova_password.yaml b/site/hpgen10/secrets/passphrases/osh_nova_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_nova_password.yaml rename to site/hpgen10/secrets/passphrases/osh_nova_password.yaml diff --git a/site/site30/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/osh_oslo_cache_secret_key.yaml b/site/hpgen10/secrets/passphrases/osh_oslo_cache_secret_key.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_oslo_cache_secret_key.yaml rename to site/hpgen10/secrets/passphrases/osh_oslo_cache_secret_key.yaml diff --git a/site/site30/secrets/passphrases/osh_oslo_db_admin_password.yaml b/site/hpgen10/secrets/passphrases/osh_oslo_db_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_oslo_db_admin_password.yaml rename to site/hpgen10/secrets/passphrases/osh_oslo_db_admin_password.yaml diff --git a/site/site30/secrets/passphrases/osh_placement_password.yaml b/site/hpgen10/secrets/passphrases/osh_placement_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/osh_placement_password.yaml rename to site/hpgen10/secrets/passphrases/osh_placement_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_airflow_postgres_password.yaml b/site/hpgen10/secrets/passphrases/ucp_airflow_postgres_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_airflow_postgres_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_airflow_postgres_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_armada_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ucp_armada_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_armada_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_armada_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_barbican_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ucp_barbican_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_barbican_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_barbican_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_barbican_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/ucp_barbican_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_barbican_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_barbican_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_deckhand_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ucp_deckhand_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_deckhand_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_deckhand_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_deckhand_postgres_password.yaml b/site/hpgen10/secrets/passphrases/ucp_deckhand_postgres_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_deckhand_postgres_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_deckhand_postgres_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_drydock_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ucp_drydock_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_drydock_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_drydock_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_drydock_postgres_password.yaml b/site/hpgen10/secrets/passphrases/ucp_drydock_postgres_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_drydock_postgres_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_drydock_postgres_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_keystone_admin_password.yaml b/site/hpgen10/secrets/passphrases/ucp_keystone_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_keystone_admin_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_keystone_admin_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_keystone_oslo_db_password.yaml b/site/hpgen10/secrets/passphrases/ucp_keystone_oslo_db_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_keystone_oslo_db_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_keystone_oslo_db_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_maas_admin_password.yaml b/site/hpgen10/secrets/passphrases/ucp_maas_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_maas_admin_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_maas_admin_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_maas_postgres_password.yaml b/site/hpgen10/secrets/passphrases/ucp_maas_postgres_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_maas_postgres_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_maas_postgres_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_oslo_db_admin_password.yaml b/site/hpgen10/secrets/passphrases/ucp_oslo_db_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_oslo_db_admin_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_oslo_db_admin_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_oslo_messaging_password.yaml b/site/hpgen10/secrets/passphrases/ucp_oslo_messaging_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_oslo_messaging_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_oslo_messaging_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_postgres_admin_password.yaml b/site/hpgen10/secrets/passphrases/ucp_postgres_admin_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_postgres_admin_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_postgres_admin_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_promenade_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ucp_promenade_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_promenade_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_promenade_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml b/site/hpgen10/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml rename to site/hpgen10/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml diff --git a/site/site30/secrets/passphrases/ucp_shipyard_keystone_password.yaml b/site/hpgen10/secrets/passphrases/ucp_shipyard_keystone_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_shipyard_keystone_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_shipyard_keystone_password.yaml diff --git a/site/site30/secrets/passphrases/ucp_shipyard_postgres_password.yaml b/site/hpgen10/secrets/passphrases/ucp_shipyard_postgres_password.yaml similarity index 100% rename from site/site30/secrets/passphrases/ucp_shipyard_postgres_password.yaml rename to site/hpgen10/secrets/passphrases/ucp_shipyard_postgres_password.yaml diff --git a/site/site30/secrets/publickey/localadmin_ssh_public_key.yaml b/site/hpgen10/secrets/publickey/localadmin_ssh_public_key.yaml similarity index 100% rename from site/site30/secrets/publickey/localadmin_ssh_public_key.yaml rename to site/hpgen10/secrets/publickey/localadmin_ssh_public_key.yaml diff --git a/site/site30/site-definition.yaml b/site/hpgen10/site-definition.yaml similarity index 100% rename from site/site30/site-definition.yaml rename to site/hpgen10/site-definition.yaml diff --git a/site/site30/software/charts/kubernetes/container-networking/calico.yaml b/site/hpgen10/software/charts/kubernetes/container-networking/calico.yaml similarity index 100% rename from site/site30/software/charts/kubernetes/container-networking/calico.yaml rename to site/hpgen10/software/charts/kubernetes/container-networking/calico.yaml diff --git a/site/site30/software/charts/kubernetes/container-networking/etcd.yaml b/site/hpgen10/software/charts/kubernetes/container-networking/etcd.yaml similarity index 99% rename from site/site30/software/charts/kubernetes/container-networking/etcd.yaml rename to site/hpgen10/software/charts/kubernetes/container-networking/etcd.yaml index 9080481..4322487 100644 --- a/site/site30/software/charts/kubernetes/container-networking/etcd.yaml +++ b/site/hpgen10/software/charts/kubernetes/container-networking/etcd.yaml @@ -157,6 +157,7 @@ metadata: path: . dest: path: .values.nodes[1].tls.peer.key + # NOTE(mb874d): Be sure we generate these certs for genesis. - src: schema: deckhand/Certificate/v1 @@ -183,7 +184,5 @@ metadata: dest: path: .values.nodes[2].tls.peer.key - data: {} - ... diff --git a/site/site30/software/charts/kubernetes/dns/coredns.yaml b/site/hpgen10/software/charts/kubernetes/dns/coredns.yaml similarity index 100% rename from site/site30/software/charts/kubernetes/dns/coredns.yaml rename to site/hpgen10/software/charts/kubernetes/dns/coredns.yaml diff --git a/site/site30/software/charts/kubernetes/etcd/etcd.yaml b/site/hpgen10/software/charts/kubernetes/etcd/etcd.yaml similarity index 100% rename from site/site30/software/charts/kubernetes/etcd/etcd.yaml rename to site/hpgen10/software/charts/kubernetes/etcd/etcd.yaml index cad142c..525d40c 100644 --- a/site/site30/software/charts/kubernetes/etcd/etcd.yaml +++ b/site/hpgen10/software/charts/kubernetes/etcd/etcd.yaml @@ -100,7 +100,6 @@ metadata: path: .masters[1].hostname dest: path: .values.nodes[1].name - - src: schema: pegleg/CommonAddresses/v1 name: common-addresses @@ -157,6 +156,7 @@ metadata: path: . dest: path: .values.nodes[1].tls.peer.key + # Genesis node - src: schema: deckhand/Certificate/v1 diff --git a/site/site30/software/charts/kubernetes/ingress/ingress.yaml b/site/hpgen10/software/charts/kubernetes/ingress/ingress.yaml similarity index 100% rename from site/site30/software/charts/kubernetes/ingress/ingress.yaml rename to site/hpgen10/software/charts/kubernetes/ingress/ingress.yaml diff --git a/site/hpgen10/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/site/hpgen10/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml new file mode 100644 index 0000000..6d379e8 --- /dev/null +++ b/site/hpgen10/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml @@ -0,0 +1,16 @@ +--- +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/hpgen10/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml b/site/hpgen10/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml new file mode 100644 index 0000000..71e330a --- /dev/null +++ b/site/hpgen10/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml @@ -0,0 +1,16 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: fluent-logging + layeringDefinition: + abstract: false + layer: site + parentSelector: + hosttype: fluent-logging-global + actions: + - method: merge + path: . + storagePolicy: cleartext +data: {} +... diff --git a/site/site30/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/hpgen10/software/charts/osh/openstack-compute-kit/neutron.yaml similarity index 97% rename from site/site30/software/charts/osh/openstack-compute-kit/neutron.yaml rename to site/hpgen10/software/charts/osh/openstack-compute-kit/neutron.yaml index 7d19dcd..5df293e 100644 --- a/site/site30/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/site/hpgen10/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -60,7 +60,7 @@ data: firewall_driver: neutron.agent.firewall.NoopFirewallDriver sriov_nic: exclude_devices: null - physical_device_mappings: sriovnet1:ens6f0,sriovnet2:ens6f1 + physical_device_mappings: 'sriovnet1:ens6f0,sriovnet2:ens6f1' ml2_conf: ml2: mechanism_drivers: l2population,openvswitch,sriovnicswitch diff --git a/site/hpgen10/software/charts/osh/openstack-compute-kit/nova.yaml b/site/hpgen10/software/charts/osh/openstack-compute-kit/nova.yaml new file mode 100644 index 0000000..5cd0e3e --- /dev/null +++ b/site/hpgen10/software/charts/osh/openstack-compute-kit/nova.yaml @@ -0,0 +1,52 @@ +--- +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: nova + labels: + component: nova + layeringDefinition: + abstract: false + layer: site + parentSelector: + name: nova-global + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + values: + network: + backend: + - openvswitch + - sriov + conf: + nova: + filter_scheduler: + enabled_filters: "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, PciPassthroughFilter, NUMATopologyFilter, DifferentHostFilter, SameHostFilter" + libvirt: + virt_type: kvm + DEFAULT: + vcpu_pin_set: "4-21,26-43,48-65,72-87" + vif_plugging_is_fatal: False + vif_plugging_timeout: 30 + pci: + alias: '{ "vendor_id":"10de", "product_id":"1db4", "name":"V100", "device_type":"type-PCI" }' + passthrough_whitelist: '{"vendor_id": "10de", "product_id": "1db4"}' +... diff --git a/site/hpgen10/software/charts/ucp/ceph/ceph-client-update.yaml b/site/hpgen10/software/charts/ucp/ceph/ceph-client-update.yaml new file mode 100644 index 0000000..9dda132 --- /dev/null +++ b/site/hpgen10/software/charts/ucp/ceph/ceph-client-update.yaml @@ -0,0 +1,37 @@ +--- +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +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: + osd: 24 +... diff --git a/site/hpgen10/software/charts/ucp/ceph/ceph-client.yaml b/site/hpgen10/software/charts/ucp/ceph/ceph-client.yaml new file mode 100644 index 0000000..6abdfbf --- /dev/null +++ b/site/hpgen10/software/charts/ucp/ceph/ceph-client.yaml @@ -0,0 +1,37 @@ +--- +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +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: + osd: 8 +... diff --git a/site/hpgen10/software/charts/ucp/ceph/ceph-osd.yaml b/site/hpgen10/software/charts/ucp/ceph/ceph-osd.yaml new file mode 100644 index 0000000..65c871d --- /dev/null +++ b/site/hpgen10/software/charts/ucp/ceph/ceph-osd.yaml @@ -0,0 +1,86 @@ +--- +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: ucp-ceph-osd + layeringDefinition: + abstract: false + layer: site + parentSelector: + name: ucp-ceph-osd-global + actions: + - method: replace + path: .values.conf.storage.osd + - method: merge + path: . + storagePolicy: cleartext +data: + values: + conf: + storage: + osd: + - data: + type: block-logical + location: /dev/sdb + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdb + - data: + type: block-logical + location: /dev/sdc + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdc + - data: + type: block-logical + location: /dev/sdd + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdd + - data: + type: block-logical + location: /dev/sde + journal: + type: directory + location: /var/lib/ceph/journal/journal-sde + - data: + type: block-logical + location: /dev/sdf + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdf + - data: + type: block-logical + location: /dev/sdg + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdg + - data: + type: block-logical + location: /dev/sdh + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdh + - data: + type: block-logical + location: /dev/sdi + journal: + type: directory + location: /var/lib/ceph/journal/journal-sdi +... diff --git a/site/site30/software/charts/ucp/ceph/ceph-update.yaml b/site/hpgen10/software/charts/ucp/ceph/ceph-update.yaml similarity index 100% rename from site/site30/software/charts/ucp/ceph/ceph-update.yaml rename to site/hpgen10/software/charts/ucp/ceph/ceph-update.yaml diff --git a/site/site30/software/charts/ucp/ceph/ceph.yaml b/site/hpgen10/software/charts/ucp/ceph/ceph.yaml similarity index 100% rename from site/site30/software/charts/ucp/ceph/ceph.yaml rename to site/hpgen10/software/charts/ucp/ceph/ceph.yaml diff --git a/site/site30/software/charts/ucp/divingbell/divingbell.yaml b/site/hpgen10/software/charts/ucp/divingbell/divingbell.yaml similarity index 100% rename from site/site30/software/charts/ucp/divingbell/divingbell.yaml rename to site/hpgen10/software/charts/ucp/divingbell/divingbell.yaml diff --git a/site/site30/software/charts/ucp/drydock/maas.yaml b/site/hpgen10/software/charts/ucp/drydock/maas.yaml similarity index 100% rename from site/site30/software/charts/ucp/drydock/maas.yaml rename to site/hpgen10/software/charts/ucp/drydock/maas.yaml diff --git a/site/site30/software/charts/ucp/promenade/promenade.yaml b/site/hpgen10/software/charts/ucp/promenade/promenade.yaml similarity index 100% rename from site/site30/software/charts/ucp/promenade/promenade.yaml rename to site/hpgen10/software/charts/ucp/promenade/promenade.yaml diff --git a/site/site30/software/config/common-software-config.yaml b/site/hpgen10/software/config/common-software-config.yaml similarity index 100% rename from site/site30/software/config/common-software-config.yaml rename to site/hpgen10/software/config/common-software-config.yaml diff --git a/site/site30/software/config/endpoints.yaml b/site/hpgen10/software/config/endpoints.yaml similarity index 51% rename from site/site30/software/config/endpoints.yaml rename to site/hpgen10/software/config/endpoints.yaml index 866de27..0f0324c 100644 --- a/site/site30/software/config/endpoints.yaml +++ b/site/hpgen10/software/config/endpoints.yaml @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ############################################################################## - schema: pegleg/EndpointCatalogue/v1 metadata: schema: metadata/Document/v1 @@ -23,21 +22,107 @@ metadata: abstract: false layer: site storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .ucp.identity.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .ucp.shipyard.host_fqdn_override.public - pattern: DOMAIN + # substitutions: + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .ucp.identity.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .ucp.shipyard.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .ceph.object_store.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .ceph.ceph_object_store.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .ceph.object_store.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .ceph.object_store.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .ceph.object_store.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .ucp.identity.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .ucp.identity.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .ucp.identity.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .ucp.shipyard.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .ucp.shipyard.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .ucp.shipyard.host_fqdn_override.public.tls.key data: ucp: identity: @@ -48,16 +133,19 @@ data: public: keystone host_fqdn_override: default: null - public: iam.DOMAIN + # public: + # host: iam.DOMAIN path: default: /v3 scheme: default: http + # public: https port: admin: default: 35357 api: default: 80 + public: 80 armada: name: armada hosts: @@ -210,9 +298,11 @@ data: default: /api/v1.0 scheme: default: http + # public: https host_fqdn_override: default: null - public: shipyard.DOMAIN + # public: + # host: shipyard.DOMAIN airflow_web: name: airflow-web hosts: @@ -246,15 +336,39 @@ data: namespace: ceph hosts: default: ceph-rgw + public: radosgw host_fqdn_override: default: null + # public: + # host: object-store.DOMAIN path: default: /swift/v1 scheme: default: http + # public: "https" + port: + api: + default: 8088 + # public: 443 + ceph_object_store: + name: radosgw + namespace: ceph + hosts: + default: ceph-rgw + public: radosgw + host_fqdn_override: + default: null + # public: + # host: object-store.DOMAIN + path: + default: /auth/v1.0 + scheme: + default: "http" + # public: "https" port: api: default: 8088 + # public: 443 ceph_mon: namespace: ceph hosts: @@ -286,84 +400,357 @@ metadata: abstract: false layer: site storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.image.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.cloudformation.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.orchestration.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.compute.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.compute_novnc_proxy.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.network.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.identity.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.dashboard.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.volume.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.volumev2.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh.volumev3.host_fqdn_override.public - pattern: DOMAIN + # substitutions: + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.object_store.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.object_store.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.object_store.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.object_store.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.tls.key + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.image.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.orchestration.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.compute.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.placement.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.network.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.identity.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.dashboard.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.volume.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.volumev2.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.volumev3.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.identity.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.identity.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.identity.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.orchestration.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.orchestration.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.orchestration.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.dashboard.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.dashboard.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.dashboard.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.image.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.image.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.image.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.volume.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.volume.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.volume.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.volumev2.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.volumev2.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.volumev2.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.volumev3.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.volumev3.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.volumev3.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.compute.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.compute.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.compute.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.placement.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.placement.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.placement.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.network.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.network.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.network.host_fqdn_override.public.tls.key data: osh: object_store: @@ -374,17 +761,36 @@ data: public: radosgw host_fqdn_override: default: null - public: - host: object-store.DOMAIN + # public: + # host: object-store.DOMAIN path: default: /swift/v1/KEY_$(tenant_id)s scheme: default: http - public: "https" + # public: "https" port: api: default: 8088 - public: 443 + # public: 443 + ceph_object_store: + name: radosgw + namespace: ceph + hosts: + default: ceph-rgw + public: radosgw + host_fqdn_override: + default: null + # public: + # host: object-store.DOMAIN + path: + default: /auth/v1.0 + scheme: + default: "http" + # public: "https" + port: + api: + default: 8088 + # public: 443 oslo_db: hosts: default: mariadb @@ -441,16 +847,19 @@ data: public: keystone host_fqdn_override: default: null - public: keystone.DOMAIN + # public: + # host: identity.DOMAIN path: default: /v3 scheme: default: "http" + # public: "https" port: admin: default: 35357 api: default: 80 + # public: 443 glance_oslo_messaging: namespace: openstack hosts: @@ -484,15 +893,17 @@ data: public: glance host_fqdn_override: default: null - public: image.DOMAIN + # public: + # host: image.DOMAIN path: default: null scheme: default: "http" + # public: "https" port: api: default: 9292 - public: 80 + # public: 443 image_registry: name: glance-registry hosts: @@ -541,15 +952,17 @@ data: public: cinder host_fqdn_override: default: null - public: volume.DOMAIN + # public: + # host: volume.DOMAIN path: default: "/v1/%(tenant_id)s" scheme: default: "http" + # public: "https" port: api: default: 8776 - public: 80 + # public: 443 volumev2: name: cinderv2 hosts: @@ -557,15 +970,17 @@ data: public: cinder host_fqdn_override: default: null - public: volume.DOMAIN + # public: + # host: volume.DOMAIN path: default: "/v2/%(tenant_id)s" scheme: default: "http" + # public: "https" port: api: default: 8776 - public: 80 + # public: 443 volumev3: name: cinderv3 hosts: @@ -573,29 +988,17 @@ data: public: cinder host_fqdn_override: default: null - public: volume.DOMAIN + # public: + # host: volume.DOMAIN path: default: "/v3/%(tenant_id)s" scheme: default: "http" + # public: "https" port: api: default: 8776 - public: 80 - ceph_object_store: - name: radosgw - namespace: ceph - hosts: - default: ceph-rgw - host_fqdn_override: - default: null - path: - default: /auth/v1.0 - scheme: - default: "http" - port: - api: - default: 8088 + # public: 443 heat_oslo_messaging: namespace: openstack hosts: @@ -629,15 +1032,17 @@ data: public: heat host_fqdn_override: default: null - public: orchestration.DOMAIN + # public: + # host: orchestration.DOMAIN path: default: "/v1/%(project_id)s" scheme: default: "http" + # public: "https" port: api: default: 8004 - public: 80 + # public: 443 cloudformation: name: heat-cfn hosts: @@ -645,15 +1050,17 @@ data: public: cloudformation host_fqdn_override: default: null - public: cloudformation.DOMAIN + # public: + # host: cloudformation.DOMAIN path: default: /v1 scheme: default: "http" + # public: "https" port: api: default: 8000 - public: 80 + # public: 443 cloudwatch: name: heat-cloudwatch hosts: @@ -703,15 +1110,17 @@ data: public: neutron host_fqdn_override: default: null - public: network.DOMAIN + # public: + # host: network.DOMAIN path: default: null scheme: default: "http" + # public: "https" port: api: default: 9696 - public: 80 + # public: 443 nova_oslo_messaging: namespace: openstack hosts: @@ -745,17 +1154,19 @@ data: public: nova host_fqdn_override: default: null - public: compute.DOMAIN + # public: + # host: compute.DOMAIN path: default: "/v2/%(tenant_id)s" scheme: default: "http" + # public: "https" port: api: default: 8774 - public: 80 + # public: 443 novncproxy: - default: 6080 + default: 443 compute_metadata: name: nova hosts: @@ -778,14 +1189,17 @@ data: public: novncproxy host_fqdn_override: default: null - public: nova-novncproxy.DOMAIN + # public: + # host: nova-novncproxy.DOMAIN path: default: /vnc_auto.html scheme: default: "http" + # public: "https" port: novnc_proxy: default: 6080 + # public: 443 compute_spice_proxy: name: nova hosts: @@ -806,14 +1220,17 @@ data: public: placement host_fqdn_override: default: null + # public: + # host: placement.DOMAIN path: default: / scheme: default: "http" + # public: "https" port: api: default: 8778 - public: 80 + # public: 443 dashboard: name: horizon hosts: @@ -821,55 +1238,17 @@ data: public: horizon host_fqdn_override: default: null - public: dashboard.DOMAIN + # public: + # host: dashboard.DOMAIN path: default: null scheme: default: "http" + # public: "https" port: web: default: 80 - barbican_oslo_messaging: - namespace: openstack - hosts: - default: barbican-rabbitmq - host_fqdn_override: - default: null - path: /barbican - scheme: rabbit - port: - amqp: - default: 5672 - http: - default: 15672 - barbican_rabbitmq_exporter: - namespace: openstack - hosts: - default: barbican-rabbitmq-exporter - host_fqdn_override: - default: null - path: - default: /metrics - scheme: - default: "http" - port: - metrics: - default: 9095 - key_manager: - name: barbican - hosts: - default: barbican-api - public: barbican - host_fqdn_override: - default: null - path: - default: /v1 - scheme: - default: "http" - port: - api: - default: 9311 - public: 80 + # public: 443 ... --- schema: pegleg/EndpointCatalogue/v1 @@ -880,21 +1259,97 @@ metadata: abstract: false layer: site storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh_infra.kibana.host_fqdn_override.public - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .domain.url - dest: - path: .osh_infra.grafana.host_fqdn_override.public - pattern: DOMAIN + # substitutions: + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.tls.key + # path: .osh_infra.nagios.host_fqdn_override.public.tls.key + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .ldap.base_url + # dest: + # path: .osh_infra.ldap.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .ldap.auth_path + # dest: + # path: .osh_infra.ldap.path.default + # pattern: AUTH_PATH data: osh_infra: elasticsearch: @@ -975,14 +1430,17 @@ data: public: grafana host_fqdn_override: default: null - public: grafana.DOMAIN + # public: + # host: grafana.DOMAIN path: default: null scheme: default: "http" + # public: "https" port: grafana: default: 3000 + # public: 443 monitoring: name: prometheus namespace: osh-infra @@ -1007,14 +1465,17 @@ data: public: kibana host_fqdn_override: default: null - public: kibana.DOMAIN + # public: + # host: kibana.DOMAIN path: default: null scheme: default: "http" + # public: "https" port: kibana: default: 5601 + # public: 443 alerts: name: alertmanager namespace: osh-infra @@ -1093,17 +1554,17 @@ data: public: nagios host_fqdn_override: default: null - public: - host: nagios.DOMAIN + # public: + # host: nagios.DOMAIN path: default: null scheme: default: http - public: https + # public: https port: http: default: 80 - public: 443 + # public: 443 ldap: hosts: default: ldap diff --git a/site/site30/software/config/service_accounts.yaml b/site/hpgen10/software/config/service_accounts.yaml similarity index 100% rename from site/site30/software/config/service_accounts.yaml rename to site/hpgen10/software/config/service_accounts.yaml diff --git a/site/site30/software/manifests/full-site.yaml b/site/hpgen10/software/manifests/full-site.yaml similarity index 92% rename from site/site30/software/manifests/full-site.yaml rename to site/hpgen10/software/manifests/full-site.yaml index fa6ac23..0bf3dd6 100644 --- a/site/site30/software/manifests/full-site.yaml +++ b/site/hpgen10/software/manifests/full-site.yaml @@ -29,7 +29,7 @@ metadata: path: . storagePolicy: cleartext data: - release_prefix: clcp + release_prefix: airship chart_groups: - kubernetes-proxy - kubernetes-container-networking @@ -48,10 +48,6 @@ data: - ucp-drydock - ucp-promenade - ucp-shipyard -# - artifactory-ceph-config -# - artifactory-mariadb -# - artifactory-webapp -# - jenkins - osh-infra-ingress-controller - osh-infra-ceph-config - osh-infra-logging @@ -62,15 +58,12 @@ data: - openstack-ceph-config - openstack-mariadb - openstack-memcached - - openstack-compute-services - openstack-keystone - - openstack-glance - openstack-radosgw + - openstack-glance - openstack-cinder - openstack-compute-kit - openstack-heat - osh-infra-prometheus-openstack-exporter - openstack-horizon - - openstack-barbican - ... diff --git a/site/site30/software/charts/osh/openstack-compute-kit/nova.yaml b/site/site30/software/charts/osh/openstack-compute-kit/nova.yaml deleted file mode 100644 index d7e7756..0000000 --- a/site/site30/software/charts/osh/openstack-compute-kit/nova.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -############################################################################## -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. # -# # -# You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################## - -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: nova - labels: - component: nova - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: nova-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - network: - backend: - - openvswitch - - sriov - conf: - nova: - filter_scheduler: - enabled_filters: "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, PciPassthroughFilter, NUMATopologyFilter, DifferentHostFilter, SameHostFilter" - libvirt: - virt_type: kvm - DEFAULT: - debug: True - vcpu_pin_set: "4-21,26-43,48-65,72-87" - vif_plugging_is_fatal: False - vif_plugging_timeout: 30 - pci: - alias: '{"name": "numa0", "capability_type": "pci", "product_id": "154c", "vendor_id": "8086", "device_type": "type-PCI", "numa_policy": "required"}' - passthrough_whitelist: | - [{"address": "0000:af:02.0", "physical_network": "sriovnet1"},{"address": "0000:af:02.1", "physical_network": "sriovnet1"},{"address": "0000:af:02.2", "physical_network": "sriovnet1"},{"address": "0000:af:02.3", "physical_network": "sriovnet1"},{"address": "0000:af:02.4", "physical_network": "sriovnet1"},{"address": "0000:af:02.5", "physical_network": "sriovnet1"},{"address": "0000:af:02.6", "physical_network": "sriovnet1"},{"address": "0000:af:02.7", "physical_network": "sriovnet1"},{"address": "0000:af:03.0", "physical_network": "sriovnet1"},{"address": "0000:af:03.1", "physical_network": "sriovnet1"},{"address": "0000:af:03.2", "physical_network": "sriovnet1"},{"address": "0000:af:03.3", "physical_network": "sriovnet1"},{"address": "0000:af:03.4", "physical_network": "sriovnet1"},{"address": "0000:af:03.5", "physical_network": "sriovnet1"},{"address": "0000:af:03.6", "physical_network": "sriovnet1"},{"address": "0000:af:03.7", "physical_network": "sriovnet1"},{"address": "0000:af:04.0", "physical_network": "sriovnet1"},{"address": "0000:af:04.1", "physical_network": "sriovnet1"},{"address": "0000:af:04.2", "physical_network": "sriovnet1"},{"address": "0000:af:04.3", "physical_network": "sriovnet1"},{"address": "0000:af:04.4", "physical_network": "sriovnet1"},{"address": "0000:af:04.5", "physical_network": "sriovnet1"},{"address": "0000:af:04.6", "physical_network": "sriovnet1"},{"address": "0000:af:04.7", "physical_network": "sriovnet1"},{"address": "0000:af:05.0", "physical_network": "sriovnet1"},{"address": "0000:af:05.1", "physical_network": "sriovnet1"},{"address": "0000:af:05.2", "physical_network": "sriovnet1"},{"address": "0000:af:05.3", "physical_network": "sriovnet1"},{"address": "0000:af:05.4", "physical_network": "sriovnet1"},{"address": "0000:af:05.5", "physical_network": "sriovnet1"},{"address": "0000:af:05.6", "physical_network": "sriovnet1"},{"address": "0000:af:05.7", "physical_network": "sriovnet1"},{"address": "0000:af:0a.0", "physical_network": "sriovnet2"},{"address": "0000:af:0a.1", "physical_network": "sriovnet2"},{"address": "0000:af:0a.2", "physical_network": "sriovnet2"},{"address": "0000:af:0a.3", "physical_network": "sriovnet2"},{"address": "0000:af:0a.4", "physical_network": "sriovnet2"},{"address": "0000:af:0a.5", "physical_network": "sriovnet2"},{"address": "0000:af:0a.6", "physical_network": "sriovnet2"},{"address": "0000:af:0a.7", "physical_network": "sriovnet2"},{"address": "0000:af:0b.0", "physical_network": "sriovnet2"},{"address": "0000:af:0b.1", "physical_network": "sriovnet2"},{"address": "0000:af:0b.2", "physical_network": "sriovnet2"},{"address": "0000:af:0b.3", "physical_network": "sriovnet2"},{"address": "0000:af:0b.4", "physical_network": "sriovnet2"},{"address": "0000:af:0b.5", "physical_network": "sriovnet2"},{"address": "0000:af:0b.6", "physical_network": "sriovnet2"},{"address": "0000:af:0b.7", "physical_network": "sriovnet2"},{"address": "0000:af:0c.0", "physical_network": "sriovnet2"},{"address": "0000:af:0c.1", "physical_network": "sriovnet2"},{"address": "0000:af:0c.2", "physical_network": "sriovnet2"},{"address": "0000:af:0c.3", "physical_network": "sriovnet2"},{"address": "0000:af:0c.4", "physical_network": "sriovnet2"},{"address": "0000:af:0c.5", "physical_network": "sriovnet2"},{"address": "0000:af:0c.6", "physical_network": "sriovnet2"},{"address": "0000:af:0c.7", "physical_network": "sriovnet2"},{"address": "0000:af:0d.0", "physical_network": "sriovnet2"},{"address": "0000:af:0d.1", "physical_network": "sriovnet2"},{"address": "0000:af:0d.2", "physical_network": "sriovnet2"},{"address": "0000:af:0d.3", "physical_network": "sriovnet2"},{"address": "0000:af:0d.4", "physical_network": "sriovnet2"},{"address": "0000:af:0d.5", "physical_network": "sriovnet2"},{"address": "0000:af:0d.6", "physical_network": "sriovnet2"},{"address": "0000:af:0d.7", "physical_network": "sriovnet2"}] -... diff --git a/tools/2genesis.sh b/tools/2genesis.sh index 07b6c7e..79aa546 100644 --- a/tools/2genesis.sh +++ b/tools/2genesis.sh @@ -36,6 +36,13 @@ fi source $(dirname $0)/env_$SITE.sh +cd $YAML_BUILDS +# Update BIOS Setting +python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml +# Install OS on Genesis +python $YAML_BUILDS/scripts/jcopy.py $SITE.yaml $YAML_BUILDS/tools/j2/serverrc.j2 $YAML_BUILDS/tools/"$GENESIS_NAME"rc +/opt/akraino/redfish/install_server_os.sh --rc /opt/akraino/yaml_builds/tools/"$GENESIS_NAME"rc --skip-confirm + scp $YAML_BUILDS/tars/promenade-bundle-$SITE.tar $GENESIS_HOST:/tmp/ ssh $GENESIS_HOST << EOF mkdir -p /root/akraino diff --git a/tools/generate_yamls.sh b/tools/generate_yamls.sh index b692e97..d258b56 100644 --- a/tools/generate_yamls.sh +++ b/tools/generate_yamls.sh @@ -35,7 +35,6 @@ else fi cd $YAML_BUILDS -cp -r site/common/* site/$SITE/ python ./scripts/jcopy.py $SITE.yaml ./templates $YAML_BUILDS/site/$SITE -python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools -mv ./tools/set_site_env.sh ./tools/env_$SITE.sh +python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools/env_$SITE.sh +cp -r site/common/* site/$SITE/ diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2 new file mode 100644 index 0000000..465d549 --- /dev/null +++ b/tools/j2/serverrc.j2 @@ -0,0 +1,89 @@ +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +# Add proxy settings if required for your environment +# export http_proxy=http://your.proxy.com:8080/ +# export https_proxy=http://your.proxy.com:8080/ +# + +# host name for server +SRV_NAME={{yaml.genesis.name}} + +# server oem - Dell or HPE (case sensitive) +SRV_OEM={{yaml.genesis.oem}} + +# out of band interface information for server (idrac/ilo/etc) +SRV_OOB_IP={{yaml.genesis.oob}} +SRV_OOB_USR={{yaml.ipmi_admin.username}} +SRV_OOB_PWD={{yaml.ipmi_admin.password}} + +# mac address of server to be used during the build - not required for Dell servers +# SRV_MAC=3c:fd:fe:b8:10:60 + +# name of network interface used during build when ipxe.efi is booted and when os is booted +# ipxe numbers ports from 0-n in pci bus order. +# the netx value will depend on how many nics are in the server +# and which pci device number is assigned to the slot +SRV_IPXE_INF={{yaml.networks.pxe.inf}} + +# the build interface is the nic used by the Ubuntu installed to load the OS +SRV_BLD_INF={{yaml.networks.slaves[0].name}} + +# the boot device is the device name on which the OS will be loaded +SRV_BOOT_DEVICE={{yaml.disks[0].name}} + +# ipxe script to use - based on the os version and kernel to install +# valid options are script-hwe-16.04.4-amd64.ipxe or script-16.04.4-amd64.ipxe +SRV_BLD_SCRIPT=script-hwe-16.04.5-amd64.ipxe + +# template xml file to set bios and raid configuration settings +SRV_BIOS_TEMPLATE=dell_r740_g14_uefi_base.xml.template +SRV_BOOT_TEMPLATE=dell_r740_g14_uefi_httpboot.xml.template +SRV_HTTP_BOOT_DEV=NIC.Slot.7-1-1 + +# tempalte to run to configure OS after first boot +# current options are: firstboot.sh.template, firstboot-genesis.sh.tempate or firstboot-airship-iab.sh.template +SRV_FIRSTBOOT_TEMPLATE=firstboot-genesis.sh.template + +# VLAN to use during build and for final network configuration +SRV_VLAN={{yaml.networks.host.vlan}} +SRV_STORAGE_VLAN={{yaml.networks.storage.vlan}} +SRV_CALICO_VLAN={{yaml.networks.ksn.vlan}} +SRV_NEUTRON_VLAN={{yaml.networks.neutron.vlan}} + +# basic network information for dhcp config and final server network settings +SRV_MTU=9000 +SRV_IP={{yaml.genesis.host}} +SRV_STORAGE_IP={{yaml.genesis.storage}} +SRV_CALICO_IP={{yaml.genesis.ksn}} +SRV_NEUTRON_IP={{yaml.genesis.neutron}} +SRV_SUBNET={{yaml.networks.host.subnet}} +SRV_NETMASK={{yaml.networks.host.netmask}} +SRV_GATEWAY={{yaml.networks.host.routes.gateway}} +#SRV_DNS={{yaml.networks.host.dns.servers | first}} +SRV_DNS=192.168.2.85 +SRV_DOMAIN={{yaml.networks.host.dns.domain}} +SRV_DNSSEARCH={{yaml.networks.host.dns.domain}} +SRV_NTP=ntp.ubuntu.org + +# root password for server being built +SRV_PWD={{yaml.genesis.root_password}} + +# network bond information +SRV_BOND={{yaml.networks.primary}} +{% for slave in yaml.networks.slaves %} +SRV_SLAVE{{loop.index}}={{slave.name}} +{% endfor %} diff --git a/tools/j2/serverrc_raid.j2 b/tools/j2/serverrc_raid.j2 new file mode 100644 index 0000000..f7d2975 --- /dev/null +++ b/tools/j2/serverrc_raid.j2 @@ -0,0 +1,30 @@ +############################################################################## +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +# Add proxy settings if required for your environment +# export http_proxy=http://your.proxy.com:8080/ +# export https_proxy=http://your.proxy.com:8080/ +# +# Set the ip and port to use when creating the web server +BUILD_WEBIP=192.168.2.5 + +# host name for server +SRV_NAME={{yaml.name}} + +# out of band interface information for server (idrac/ilo/etc) +SRV_OOB_IP={{yaml.oob}} +SRV_OOB_USR={{yaml.oob_user}} +SRV_OOB_PWD={{yaml.oob_password}} diff --git a/tools/j2/set_site_env.sh b/tools/j2/set_site_env.sh index dfcea66..1639808 100644 --- a/tools/j2/set_site_env.sh +++ b/tools/j2/set_site_env.sh @@ -21,3 +21,5 @@ export PXE_INTERFACE={{yaml.networks.pxe.interface}} echo PXE_INTERFACE=$PXE_INTERFACE export HOST_INTERFACE={{yaml.networks.host.interface}} echo HOST_INTERFACE=$HOST_INTERFACE +export GENESIS_NAME={{yaml.genesis.name}} +echo GENESIS_NAME=$GENESIS_NAME diff --git a/tools/pegleg.sh b/tools/pegleg.sh index d81e588..b0fb2f6 100755 --- a/tools/pegleg.sh +++ b/tools/pegleg.sh @@ -17,7 +17,7 @@ set -x -PEGLEG_IMAGE=${PEGLEG_IMAGE:-quay.io/airshipit/pegleg:master} +PEGLEG_IMAGE=${PEGLEG_IMAGE:-quay.io/airshipit/pegleg:09d85465827f1468d3469e5bbcf6b48f25338e7c} echo echo "== NOTE: Workspace $WORKSPACE is available as /workspace in container context ==" -- 2.16.6