From c700639e5a29b1907976519918969b752d5be1e7 Mon Sep 17 00:00:00 2001 From: James Gu Date: Wed, 30 Sep 2020 16:06:14 -0700 Subject: Upgrade intel pod 15 to Airship 1.8 Depends: https://gerrit.opnfv.org/gerrit/c/airship/+/70158 Change-Id: Ic9b8a56de430d02f2f21e053a40c9c29ab40433f Signed-off-by: James Gu --- .../kubernetes/container-networking/etcd.yaml | 127 ------------------- .../kubernetes/container-networking/policies.yaml | 135 +++++++++++++++++++++ .../software/charts/kubernetes/etcd/etcd.yaml | 131 -------------------- .../software/charts/osh-infra/fluentbit.yaml | 22 ---- .../software/charts/osh-infra/fluentd.yaml | 22 ---- .../software/charts/osh-infra/grafana.yaml | 23 ---- .../software/charts/osh-infra/ingress.yaml | 24 ---- .../software/charts/osh-infra/mariadb.yaml | 24 ---- .../software/charts/osh-infra/prometheus.yaml | 35 ------ .../charts/osh/openstack-compute-kit/libvirt.yaml | 22 ---- .../charts/osh/openstack-compute-kit/neutron.yaml | 60 +-------- .../charts/osh/openstack-compute-kit/nova.yaml | 47 ------- .../charts/ucp/ceph/ceph-client-update.yaml | 26 ---- .../software/charts/ucp/ceph/ceph-client.yaml | 100 --------------- .../software/charts/ucp/ceph/ceph-osd.yaml | 30 ----- .../software/charts/ucp/divingbell/divingbell.yaml | 31 ++--- .../software/config/common-software-config.yaml | 3 + site/intel-pod15/software/config/corridor.yaml | 26 ++++ 18 files changed, 177 insertions(+), 711 deletions(-) delete mode 100644 site/intel-pod15/software/charts/kubernetes/container-networking/etcd.yaml create mode 100644 site/intel-pod15/software/charts/kubernetes/container-networking/policies.yaml delete mode 100644 site/intel-pod15/software/charts/kubernetes/etcd/etcd.yaml delete mode 100644 site/intel-pod15/software/charts/osh-infra/fluentbit.yaml delete mode 100644 site/intel-pod15/software/charts/osh-infra/fluentd.yaml delete mode 100644 site/intel-pod15/software/charts/osh-infra/grafana.yaml delete mode 100644 site/intel-pod15/software/charts/osh-infra/ingress.yaml delete mode 100644 site/intel-pod15/software/charts/osh-infra/mariadb.yaml delete mode 100644 site/intel-pod15/software/charts/osh-infra/prometheus.yaml delete mode 100644 site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml delete mode 100644 site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml delete mode 100644 site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml delete mode 100644 site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml delete mode 100644 site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml create mode 100644 site/intel-pod15/software/config/corridor.yaml (limited to 'site/intel-pod15/software') diff --git a/site/intel-pod15/software/charts/kubernetes/container-networking/etcd.yaml b/site/intel-pod15/software/charts/kubernetes/container-networking/etcd.yaml deleted file mode 100644 index 4776953..0000000 --- a/site/intel-pod15/software/charts/kubernetes/container-networking/etcd.yaml +++ /dev/null @@ -1,127 +0,0 @@ ---- -# The purpose of this file is to build the list of calico etcd nodes and the -# calico etcd certs for those nodes in the environment. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kubernetes-calico-etcd - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: kubernetes-calico-etcd-global - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - # Generate a list of control plane nodes (i.e. genesis node + master node - # list) on which calico etcd will run and will need certs. It is assumed - # that Airship sites will have 3 control plane nodes, so this should not need to - # change for a new site. - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .genesis.hostname - dest: - path: .values.nodes[0].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[0].hostname - dest: - path: .values.nodes[1].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[1].hostname - dest: - path: .values.nodes[2].name - - # Certificate substitutions for the node names assembled on the above list. - # NEWSITE-CHANGEME: Per above, the number of substitutions should not need - # to change with a standard Airship deployment. However, the names of each - # deckhand certficiate should be updated with the correct hostnames for your - # environment. The ordering is important (Genesis is index 0, then master - # nodes in the order they are specified in common-addresses). - - # Genesis hostname - pod15-node1 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-pod15-node1 - path: . - dest: - path: .values.nodes[0].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-pod15-node1 - path: . - dest: - path: .values.nodes[0].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-pod15-node1-peer - path: . - dest: - path: .values.nodes[0].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-pod15-node1-peer - path: . - dest: - path: .values.nodes[0].tls.peer.key - - # master node 1 hostname - pod15-node2 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-pod15-node2 - path: . - dest: - path: .values.nodes[1].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-pod15-node2 - path: . - dest: - path: .values.nodes[1].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-pod15-node2-peer - path: . - dest: - path: .values.nodes[1].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-pod15-node2-peer - path: . - dest: - path: .values.nodes[1].tls.peer.key - - # master node 2 hostname - pod15-node3 - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-pod15-node3 - path: . - dest: - path: .values.nodes[2].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-pod15-node3 - path: . - dest: - path: .values.nodes[2].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: calico-etcd-pod15-node3-peer - path: . - dest: - path: .values.nodes[2].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: calico-etcd-pod15-node3-peer - path: . - dest: - path: .values.nodes[2].tls.peer.key - -data: {} -... diff --git a/site/intel-pod15/software/charts/kubernetes/container-networking/policies.yaml b/site/intel-pod15/software/charts/kubernetes/container-networking/policies.yaml new file mode 100644 index 0000000..c6a4f85 --- /dev/null +++ b/site/intel-pod15/software/charts/kubernetes/container-networking/policies.yaml @@ -0,0 +1,135 @@ +--- +schema: nc/Policy/v1 +metadata: + schema: metadata/Document/v1 + name: site-policy + labels: + name: site-policy + layeringDefinition: + abstract: false + layer: site + parentSelector: + name: type-policy + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + policy: + sitelevel: + priority: 5 + rules: [] + hostendpoints: + priority: 9 + rules: + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node1-oam + labels: + host: nc-control + intf-alias: oam + spec: + interfaceName: dmz.150 + node: pod15-node1 + expectedIPs: + - 10.10.150.21 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node1-ksn + labels: + host: nc-control + intf-alias: ksn + spec: + interfaceName: data1.152 + node: pod15-node1 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node2-oam + labels: + host: nc-control + intf-alias: oam + spec: + interfaceName: dmz.150 + node: pod15-node2 + expectedIPs: + - 10.10.150.22 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node2-ksn + labels: + host: nc-control + intf-alias: ksn + spec: + interfaceName: data1.152 + node: pod15-node2 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node3-oam + labels: + host: nc-control + intf-alias: oam + spec: + interfaceName: dmz.150 + node: pod15-node3 + expectedIPs: + - 10.10.150.23 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node3-ksn + labels: + host: nc-control + intf-alias: ksn + spec: + interfaceName: data1.152 + node: pod15-node3 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node4-oam + labels: + host: nc-compute + intf-alias: oam + spec: + interfaceName: dmz.150 + node: pod15-node4 + expectedIPs: + - 10.10.150.24 + - apiVersion: projectcalico.org/v3 + kind: HostEndpoint + metadata: + name: pod15-node4-ksn + labels: + host: nc-compute + intf-alias: ksn + spec: + interfaceName: data1.152 + node: pod15-node4 +# - apiVersion: projectcalico.org/v3 +# kind: HostEndpoint +# metadata: +# name: pod15-node5-oam +# labels: +# host: nc-compute +# intf-alias: oam +# spec: +# interfaceName: dmz.150 +# node: pod15-node5 +# expectedIPs: +# - 10.10.150.25 +# - apiVersion: projectcalico.org/v3 +# kind: HostEndpoint +# metadata: +# name: pod15-node5-ksn +# labels: +# host: nc-compute +# intf-alias: ksn +# spec: +# interfaceName: data1.152 +# node: pod15-node5 +... diff --git a/site/intel-pod15/software/charts/kubernetes/etcd/etcd.yaml b/site/intel-pod15/software/charts/kubernetes/etcd/etcd.yaml deleted file mode 100644 index a0dda4c..0000000 --- a/site/intel-pod15/software/charts/kubernetes/etcd/etcd.yaml +++ /dev/null @@ -1,131 +0,0 @@ ---- -# The purpose of this file is to build the list of k8s etcd nodes and the -# k8s etcd certs for those nodes in the environment. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kubernetes-etcd - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: kubernetes-etcd-global - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - # Generate a list of control plane nodes (i.e. genesis node + master node - # list) on which k8s etcd will run and will need certs. It is assumed - # that Airship sites will have 3 control plane nodes, so this should not need to - # change for a new site. - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .genesis.hostname - dest: - path: .values.nodes[0].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[0].hostname - dest: - path: .values.nodes[1].name - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .masters[1].hostname - dest: - path: .values.nodes[2].name - - # Certificate substitutions for the node names assembled on the above list. - # NEWSITE-CHANGEME: Per above, the number of substitutions should not need - # to change with a standard Airship deployment. However, the names of each - # deckhand certficiate should be updated with the correct hostnames for your - # environment. The ordering is important (Genesis is index 0, then master - # nodes in the order they are specified in common-addresses). - - # Genesis Exception* - # *NOTE: This is an exception in that `genesis` is not the hostname of the - # genesis node, but `genesis` is reference here in the certificate names - # because of certain Promenade assumptions that may be addressed in the - # future. Therefore `genesis` is used instead of `pod15-node1` here. - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-genesis - path: . - dest: - path: .values.nodes[0].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-genesis - path: . - dest: - path: .values.nodes[0].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-genesis-peer - path: . - dest: - path: .values.nodes[0].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-genesis-peer - path: . - dest: - path: .values.nodes[0].tls.peer.key - - # master node 1 hostname - pod15-node2 - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-pod15-node2 - path: . - dest: - path: .values.nodes[1].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-pod15-node2 - path: . - dest: - path: .values.nodes[1].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-pod15-node2-peer - path: . - dest: - path: .values.nodes[1].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-pod15-node2-peer - path: . - dest: - path: .values.nodes[1].tls.peer.key - - # master node 2 hostname - pod15-node3 - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-pod15-node3 - path: . - dest: - path: .values.nodes[2].tls.client.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-pod15-node3 - path: . - dest: - path: .values.nodes[2].tls.client.key - - src: - schema: deckhand/Certificate/v1 - name: kubernetes-etcd-pod15-node3-peer - path: . - dest: - path: .values.nodes[2].tls.peer.cert - - src: - schema: deckhand/CertificateKey/v1 - name: kubernetes-etcd-pod15-node3-peer - path: $ - dest: - path: .values.nodes[2].tls.peer.key - -data: {} -... diff --git a/site/intel-pod15/software/charts/osh-infra/fluentbit.yaml b/site/intel-pod15/software/charts/osh-infra/fluentbit.yaml deleted file mode 100644 index 5d2f287..0000000 --- a/site/intel-pod15/software/charts/osh-infra/fluentbit.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: fluentbit - labels: - name: fluentbit-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: fluentbit-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - fluentd: 1 -... diff --git a/site/intel-pod15/software/charts/osh-infra/fluentd.yaml b/site/intel-pod15/software/charts/osh-infra/fluentd.yaml deleted file mode 100644 index 3652a3e..0000000 --- a/site/intel-pod15/software/charts/osh-infra/fluentd.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: fluentd - labels: - name: fluentd-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: fluentd-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - fluentd: 1 -... diff --git a/site/intel-pod15/software/charts/osh-infra/grafana.yaml b/site/intel-pod15/software/charts/osh-infra/grafana.yaml deleted file mode 100644 index b35614f..0000000 --- a/site/intel-pod15/software/charts/osh-infra/grafana.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: grafana - labels: - name: grafana-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: grafana-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - grafana: 1 -... diff --git a/site/intel-pod15/software/charts/osh-infra/ingress.yaml b/site/intel-pod15/software/charts/osh-infra/ingress.yaml deleted file mode 100644 index d449881..0000000 --- a/site/intel-pod15/software/charts/osh-infra/ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: osh-infra-ingress-controller - labels: - name: osh-infra-ingress-controller-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: osh-infra-ingress-controller-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - ingress: 1 - error_page: 1 -... diff --git a/site/intel-pod15/software/charts/osh-infra/mariadb.yaml b/site/intel-pod15/software/charts/osh-infra/mariadb.yaml deleted file mode 100644 index 335d4e9..0000000 --- a/site/intel-pod15/software/charts/osh-infra/mariadb.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: osh-infra-mariadb - labels: - name: osh-infra-mariadb-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: osh-infra-mariadb-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - server: 1 - ingress: 1 -... diff --git a/site/intel-pod15/software/charts/osh-infra/prometheus.yaml b/site/intel-pod15/software/charts/osh-infra/prometheus.yaml deleted file mode 100644 index d00e96a..0000000 --- a/site/intel-pod15/software/charts/osh-infra/prometheus.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: prometheus - labels: - name: prometheus-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: prometheus-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - prometheus: 1 - resources: - enabled: true - prometheus: - limits: - memory: "4Gi" - cpu: "2000m" - requests: - memory: "2Gi" - cpu: "1000m" - storage: - requests: - storage: 20Gi -... diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml deleted file mode 100644 index 85ec726..0000000 --- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: libvirt - replacement: true - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: libvirt-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - network: - backend: - - openvswitch - # - sriov -... diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml index 824c03d..fcbac5b 100644 --- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -1,11 +1,4 @@ --- -# This file defines hardware-specific settings for neutron. If you use the same -# hardware profile as this environment, you should not need to change this file. -# Otherwise, you should review the settings here and adjust for your hardware. -# In particular: -# 1. logical network interface names -# 2. physical device mappigns -# TODO: Should move to global layer and become tied to the hardware profile schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 @@ -15,60 +8,19 @@ metadata: abstract: false layer: site parentSelector: - name: neutron-type + name: neutron-cruiserlite + component: neutron actions: - method: merge path: . storagePolicy: cleartext data: - wait: - timeout: 1800 - test: - timeout: 900 values: - labels: - sriov: - node_selector_key: sriov - node_selector_value: enabled - pod: - security_context: - neutron_sriov_agent: - pod: - runAsUser: 42424 - container: - neutron_sriov_agent_init: - privileged: true - runAsUser: 0 - readOnlyRootFilesystem: false - neutron_sriov_agent: - readOnlyRootFilesystem: true - privileged: true - network: - interface: - sriov: - - device: ens785f0 - num_vfs: 32 - promisc: false - backend: - - openvswitch - - sriov + ## NOTE: "besteffort" helps prevent sriov init script from failing due to the network + ## card on pod 15 servers (Intel 82599ES) does not support vf true promiscious mode + ## setting. The "besteffort" flag was originally designed for dev environment and is + ## not suitable for production environment as it silents all errors during sriov init. conf: sriov_init: - besteffort - plugins: - ml2_conf: - ml2: - mechanism_drivers: l2population,openvswitch,sriovnicswitch - ml2_type_vlan: - ## NOTE: Must have at least 1 sriov network defined - network_vlan_ranges: external,sriovnet1:100:4000 - sriov_agent: - securitygroup: - firewall_driver: neutron.agent.firewall.NoopFirewallDriver - sriov_nic: - ## NOTE: Must have at least 1 sriov network to physical device - ## mapping, otherwise sriov agent readiness check - ## will fail. - physical_device_mappings: sriovnet1:ens785f0 - exclude_devices: "" ... diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml deleted file mode 100644 index 9761a25..0000000 --- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -# This file defines hardware-specific settings for nova. If you use the same -# hardware profile as this environment, you should not need to change this file. -# Otherwise, you should review the settings here and adjust for your hardware. -# In particular: -# 1. vcpu_pin_set will change if the number of logical CPUs on the hardware -# changes. -# 2. pci alias / passthrough_whitelist could change if the NIC type or NIC -# slotting changes. -# TODO: Should move to global layer and become tied to the hardware profile -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: nova - replacement: true - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: nova-cntt - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - - src: - schema: drydock/HardwareProfile/v1 - name: intel-pod15 - path: .cpu_sets.kvm - dest: - path: .values.conf.nova.DEFAULT.vcpu_pin_set -data: - values: - network: - backend: - - openvswitch - # - sriov - conf: - nova: - filter_scheduler: - available_filters: "nova.scheduler.filters.all_filters" - enabled_filters: "RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AggregateCoreFilter,AggregateRamFilter,AggregateMultiTenancyIsolation,JsonFilter,IoOpsFilter,AggregateDiskFilter,AllHostsFilter,IsolatedHostsFilter,AggregateImagePropertiesIsolation,PciPassthroughFilter,AggregateIoOpsFilter,NumInstancesFilter,AggregateNumInstancesFilter,MetricsFilter,SimpleCIDRAffinityFilter,AggregateTypeAffinityFilter,NUMATopologyFilter,ComputeCapabilitiesFilter,DifferentHostFilter,SameHostFilter" - pci: - alias: '{"name": "numa0", "capability_type": "pci", "product_id": "154c", "vendor_id": "8086", "device_type": "type-PCI"}' - passthrough_whitelist: | - [{"address": "0000:05:06.*", "physical_network": "sriovnet1"},{"address": "0000:05:07.*", "physical_network": "sriovnet1"},{"address": "0000:05:08.*", "physical_network": "sriovnet1"},{"address": "0000:05:09.*", "physical_network": "sriovnet1"}] -... diff --git a/site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml b/site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml deleted file mode 100644 index eb921b8..0000000 --- a/site/intel-pod15/software/charts/ucp/ceph/ceph-client-update.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# The purpose of this file is to define environment-specific parameters for ceph -# client update -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-ceph-client-update - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-ceph-client-update-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - pool: - target: - # NEWSITE-CHANGEME: Total number of OSDs. Does not need to change if - # your HW matches this site's HW. Verify for your environment. - # 8 OSDs per node x 3 nodes = 24 - osd: 3 -... diff --git a/site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml b/site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml deleted file mode 100644 index e1e8ecf..0000000 --- a/site/intel-pod15/software/charts/ucp/ceph/ceph-client.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# The purpose of this file is to define envrionment-specific parameters for the -# ceph client -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-ceph-client - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-ceph-client-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - pool: - target: - # NEWSITE-CHANGEME: The number of OSDs per ceph node. Does not need to - # change if your deployment HW matches this site's HW. - osd: 1 - spec: - # RBD pool - - name: rbd - application: rbd - replication: 1 - percent_total_data: 40 - - name: cephfs_metadata - application: cephfs - replication: 1 - percent_total_data: 5 - - name: cephfs_data - application: cephfs - replication: 1 - percent_total_data: 10 - # RadosGW pools - - name: .rgw.root - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.control - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.data.root - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.gc - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.log - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.intent-log - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.meta - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.usage - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.keys - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.email - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.swift - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.users.uid - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.buckets.extra - application: rgw - replication: 1 - percent_total_data: 0.1 - - name: default.rgw.buckets.index - application: rgw - replication: 1 - percent_total_data: 3 - - name: default.rgw.buckets.data - application: rgw - replication: 1 - percent_total_data: 34.8 -... diff --git a/site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml b/site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml deleted file mode 100644 index 25297d9..0000000 --- a/site/intel-pod15/software/charts/ucp/ceph/ceph-osd.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# The purpose of this file is to define environment-specific parameters for -# ceph-osd -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-ceph-osd - layeringDefinition: - abstract: false - layer: site - parentSelector: - name: ucp-ceph-osd-global - actions: - - method: replace - path: .values.conf.storage.osd - - method: merge - path: . - storagePolicy: cleartext -data: - values: - conf: - storage: - osd: - - data: - type: directory - location: /var/lib/ceph/osd/osd-one - journal: - type: directory - location: /var/lib/ceph/journal/osd-one -... diff --git a/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml b/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml index 7e5adb0..bfab525 100644 --- a/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml +++ b/site/intel-pod15/software/charts/ucp/divingbell/divingbell.yaml @@ -8,6 +8,7 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 + replacement: true name: ucp-divingbell layeringDefinition: abstract: false @@ -25,31 +26,19 @@ metadata: path: .values.conf.uamlite.users[0].user_sshkeys[0] src: schema: deckhand/PublicKey/v1 - name: opnfv_ssh_public_key + name: jenkins_ssh_public_key path: . - dest: path: .values.conf.uamlite.users[1].user_sshkeys[0] src: schema: deckhand/PublicKey/v1 - name: sridhar_ssh_public_key - path: . - - dest: - path: .values.conf.uamlite.users[1].user_crypt_passwd - src: - schema: deckhand/Passphrase/v1 - name: sridhar_crypt_password + name: jamesg_ssh_public_key path: . - dest: path: .values.conf.uamlite.users[2].user_sshkeys[0] src: schema: deckhand/PublicKey/v1 - name: mfix_ssh_public_key - path: . - - dest: - path: .values.conf.uamlite.users[2].user_crypt_passwd - src: - schema: deckhand/Passphrase/v1 - name: mfix_crypt_password + name: sridhar_ssh_public_key path: . - dest: path: .values.conf.uamlite.users[3].user_sshkeys[0] @@ -57,24 +46,18 @@ metadata: schema: deckhand/PublicKey/v1 name: cedric_ssh_public_key path: . - - dest: - path: .values.conf.uamlite.users[3].user_crypt_passwd - src: - schema: deckhand/Passphrase/v1 - name: cedric_crypt_password - path: . data: values: conf: uamlite: users: - - user_name: opnfv + - user_name: jenkins user_sudo: true user_sshkeys: [] - - user_name: sridhar + - user_name: jamesg user_sudo: true user_sshkeys: [] - - user_name: mfix + - user_name: sridhar user_sudo: true user_sshkeys: [] - user_name: cedric diff --git a/site/intel-pod15/software/config/common-software-config.yaml b/site/intel-pod15/software/config/common-software-config.yaml index b85499b..7ac7a83 100644 --- a/site/intel-pod15/software/config/common-software-config.yaml +++ b/site/intel-pod15/software/config/common-software-config.yaml @@ -13,4 +13,7 @@ data: osh: # NEWSITE-CHANGEME: Replace with the site name region_name: intel-pod15 + location: + # NEWSITE-CHANGEME: Replace with the site's corridor (c1 - Dev, c2 - IST, c3 - SIL, prod - PROD) + location_corridor: c15 ... diff --git a/site/intel-pod15/software/config/corridor.yaml b/site/intel-pod15/software/config/corridor.yaml new file mode 100644 index 0000000..a29bfa2 --- /dev/null +++ b/site/intel-pod15/software/config/corridor.yaml @@ -0,0 +1,26 @@ +--- +schema: nc/CorridorConfig/v1 +metadata: + schema: metadata/Document/v1 + name: corridor-config + layeringDefinition: + abstract: false + layer: site + parentSelector: + corridor: '1' + region: 'global' + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + corridor: 'c15' + infrastructure: + dns: + upstream_servers: + - 10.10.150.20 + - 10.10.151.20 + # Repeat the same values as above, but formatted as a common separated + # string + upstream_servers_joined: 10.10.150.20, 10.10.151.20 +... -- cgit 1.2.3-korg