+++ /dev/null
-A copy of the files generated for each site will be stored in this directory.
-
-The actual files used to generate the genesis script and promenade bundle are
-under the site_type/<blueprint site_type>/treasuremap/site/<site name>/
-
-For example: site_type/sriov-a13/treasuremap/site/MTN2/
- ceph-bootstrap=enabled
- tenant-ceph-control-plane=enabled
- tenant-ceph-mon=enabled
+ - tenant-ceph-osd=enabled
- tenant-ceph-rgw=enabled
- tenant-ceph-mgr=enabled
- kube-dns=enabled
ucp-maas: enabled
openstack-nova-compute: enabled
openstack-libvirt: kernel
+ openstack-neutron: enabled
+ openvswitch: enabled
sriov: enabled
...
+++ /dev/null
----
-schema: armada/Chart/v1
-metadata:
- schema: metadata/Document/v1
- name: kubernetes-calico
- replacement: true
- #labels:
- # name: kubernetes-calico-global
- # component: kubernetes-calico
- layeringDefinition:
- abstract: false
- layer: site
- parentSelector:
- name: kubernetes-calico-global
- actions:
- - method: merge
- path: .
- storagePolicy: cleartext
- substitutions:
- - src:
- schema: pegleg/CommonAddresses/v1
- name: common-addresses
- path: .calico.bgp.ipv4.public_service_cidr
- dest:
- path: .values.networking.bgp.ipv4.additional_cidrs[0]
-
-data:
- values:
- networking:
- mtu: 1500
- settings:
-{% if ('peers' in yaml.networks.ksn and yaml.networks.ksn.peers is not none and yaml.networks.ksn.peers is iterable ) %}
- mesh: "off"
- ippool:
- ipip:
- enabled: "false"
-{% else %}
- mesh: "on"
- ippool:
- ipip:
- enabled: "true"
- mode: "Always"
- nat_outgoing: "true"
- disabled: "false"
-{% endif %}
- bgp:
- asnumber: {{yaml.networks.ksn.local_asnumber}}
- ipv4:
- additional_cidrs:
-{% for add_cidr in yaml.networks.ksn.additional_cidrs %}
- - {{add_cidr}}
-{% endfor %}
-{% if ('peers' in yaml.networks.ksn and yaml.networks.ksn.peers is not none and yaml.networks.ksn.peers is iterable ) %}
- peers:
-{% for peer in yaml.networks.ksn.peers %}
- - apiVersion: projectcalico.org/v3
- kind: BGPPeer
- metadata:
- name: peer-{{loop.index-1}}
- spec:
- peerIP: {{peer.ip}}
- asnumber: {{peer.asnumber}}
-{% endfor %}
-{% endif %}
-...
# 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
- name: neutron
- replacement: true
- labels:
- component: neutron
+ name: neutron-fixme
layeringDefinition:
abstract: false
layer: site
- method: merge
path: .
storagePolicy: cleartext
-
-data:
- values:
- labels:
- agent:
- sriov:
- node_selector_key: sriov
- node_selector_value: enabled
- network:
- backend:
- - openvswitch
- - sriov
- interface:
- tunnel_device: '{{yaml.networks.neutron.interface}}'
- sriov:
-{% for sriovnet in yaml.sriov.nets %}
- - device: {{sriovnet.interface}}
- num_vfs: 32
- mtu: 9000
- promisc: false
-{% endfor %}
- # auto_bridge_add:
- # br-ex: {{yaml.networks.neutron.interface}}
- conf:
- plugins:
- openvswitch_agent:
- ovs:
- bridge_mappings: "bond0:br-ex"
- sriov_agent:
- securitygroup:
- firewall_driver: neutron.agent.firewall.NoopFirewallDriver
- sriov_nic:
- exclude_devices: ""
- physical_device_mappings: '
-{%- for sriovnet in yaml.sriov.nets -%}
-{%- if loop.index > 1 -%},{%- endif -%}
-{{sriovnet.physical}}:{{sriovnet.interface}}
-{%- endfor -%}'
- ml2_conf:
- ml2:
- mechanism_drivers: openvswitch,l2population,sriovnicswitch
- # type_drivers: flat,vlan
- # tenant_network_types: vlan
- ml2_type_vlan:
- network_vlan_ranges: bond0:46:300
-{%- for sriovnet in yaml.sriov.nets -%}
-,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
-{%- endfor %}
-
- # ml2_type_flat:
- # flat_networks: public
- ml2_conf_sriov: null
- paste:
- app:neutronversions:
- paste.app_factory: neutron.pecan_wsgi.app:versions_factory
- dependencies:
- - openstack-neutron-helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
- schema: metadata/Document/v1
- name: openstack-neutron-helm-toolkit
- layeringDefinition:
- abstract: false
- layer: global
- storagePolicy: cleartext
- substitutions:
- - src:
- schema: pegleg/SoftwareVersions/v1
- name: software-versions
- path: .charts.osh.neutron-htk
- dest:
- path: .source
-data:
- chart_name: openstack-neutron-helm-toolkit
- release: openstack-neutron-helm-toolkit
- namespace: helm-toolkit
- values: {}
- dependencies: []
+data: {}
+#data:
+# values:
+# labels:
+# agent:
+# sriov:
+# node_selector_key: sriov
+# node_selector_value: enabled
+# network:
+# backend:
+# - openvswitch
+# - sriov
+# interface:
+# tunnel_device: '{{yaml.networks.neutron.interface}}'
+# sriov:
+#{% for sriovnet in yaml.sriov.nets %}
+# - device: {{sriovnet.interface}}
+# num_vfs: 32
+# mtu: 9000
+# promisc: false
+#{% endfor %}
+# # auto_bridge_add:
+# # br-ex: {{yaml.networks.neutron.interface}}
+# conf:
+# plugins:
+# openvswitch_agent:
+# ovs:
+# bridge_mappings: "bond0:br-ex"
+# sriov_agent:
+# securitygroup:
+# firewall_driver: neutron.agent.firewall.NoopFirewallDriver
+# sriov_nic:
+# exclude_devices: ""
+# physical_device_mappings: '
+#{%- for sriovnet in yaml.sriov.nets -%}
+#{%- if loop.index > 1 -%},{%- endif -%}
+#{{sriovnet.physical}}:{{sriovnet.interface}}
+#{%- endfor -%}'
+# ml2_conf:
+# ml2:
+# mechanism_drivers: openvswitch,l2population,sriovnicswitch
+# # type_drivers: flat,vlan
+# # tenant_network_types: vlan
+# ml2_type_vlan:
+# network_vlan_ranges: bond0:46:300
+#{%- for sriovnet in yaml.sriov.nets -%}
+#,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
+#{%- endfor %}
+#
+# # ml2_type_flat:
+# # flat_networks: public
+# ml2_conf_sriov: null
+# paste:
+# app:neutronversions:
+# paste.app_factory: neutron.pecan_wsgi.app:versions_factory
+# dependencies:
+# - openstack-neutron-helm-toolkit
...
metadata:
schema: metadata/Document/v1
name: nova
- labels:
- component: nova
layeringDefinition:
abstract: false
layer: site
- method: merge
path: .
storagePolicy: cleartext
-data:
- values:
- network:
- backend:
- - openvswitch
-{% if 'sriov' in yaml %}
- - sriov
-{% endif %}
- 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: {% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}"{{yaml.platform.vcpu_pin_set}}"
-{% else %}"4-21,26-43,48-65,72-87"
-{% endif %}
- vif_plugging_is_fatal: False
- vif_plugging_timeout: 30
- pci:
-{% if 'gpu' in yaml or 'sriov' in yaml %}
- alias: |
- {% if 'sriov' in yaml and 'alias' in yaml.sriov %}
- {% for alias in yaml.sriov.alias %}
- '{"name": "{{alias.name}}", "vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}", "capability_type": "pci", "device_type": "type-PCI", "numa_policy": "required"}'
- {% endfor %}
- {% endif %}
- {% if 'gpu' in yaml and 'alias' in yaml.gpu %}
- {% for alias in yaml.gpu.alias %}
- '{"name":"{{alias.name}}", "vendor_id":"{{alias.vendor_id}}", "product_id":"{{alias.product_id}}", "device_type":"type-PCI"}'
- {% endfor %}
- {% endif %}
- passthrough_whitelist: |
- [
- {%- if 'sriov' in yaml and 'nets' in yaml.sriov %}
- {% for sriovnet in yaml.sriov.nets %}
- {%- for vf in sriovnet.whitelists -%}{"address":"{{vf["address"]}}","physical_network":"{{sriovnet.physical}}"}{{',' if not loop.last else ''}}{% endfor %}{{',' if not loop.last else '' -}}
- {%- endfor -%}
- {%- if 'gpu' in yaml and 'sriov' in yaml %},{% endif -%}
- {%- for alias in yaml.gpu.alias %}{"vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}"}{{',' if not loop.last else ''}}{% endfor -%}
- ]
- {% endif %}
-{% endif %}
+data: {}
+#data:
+# values:
+# network:
+# backend:
+# - openvswitch
+#{% if 'sriov' in yaml %}
+# - sriov
+#{% endif %}
+# 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: {% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}"{{yaml.platform.vcpu_pin_set}}"
+#{% else %}"4-21,26-43,48-65,72-87"
+#{% endif %}
+# vif_plugging_is_fatal: False
+# vif_plugging_timeout: 30
+# pci:
+#{% if 'gpu' in yaml or 'sriov' in yaml %}
+# alias: |
+# {% if 'sriov' in yaml and 'alias' in yaml.sriov %}
+# {% for alias in yaml.sriov.alias %}
+# '{"name": "{{alias.name}}", "vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}", "capability_type": "pci", "device_type": "type-PCI", "numa_policy": "required"}'
+# {% endfor %}
+# {% endif %}
+# {% if 'gpu' in yaml and 'alias' in yaml.gpu %}
+# {% for alias in yaml.gpu.alias %}
+# '{"name":"{{alias.name}}", "vendor_id":"{{alias.vendor_id}}", "product_id":"{{alias.product_id}}", "device_type":"type-PCI"}'
+# {% endfor %}
+# {% endif %}
+# passthrough_whitelist: |
+# [
+# {%- if 'sriov' in yaml and 'nets' in yaml.sriov %}
+# {% for sriovnet in yaml.sriov.nets %}
+# {%- for vf in sriovnet.whitelists -%}{"address":"{{vf["address"]}}","physical_network":"{{sriovnet.physical}}"}{{',' if not loop.last else ''}}{% endfor %}{{',' if not loop.last else '' -}}
+# {%- endfor -%}
+# {%- if 'gpu' in yaml and 'sriov' in yaml %},{% endif -%}
+# {%- for alias in yaml.gpu.alias %}{"vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}"}{{',' if not loop.last else ''}}{% endfor -%}
+# ]
+# {% endif %}
+#{% endif %}
...
+++ /dev/null
----
-##############################################################################
-# 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: openvswitch
- replacement: true
- labels:
- name: openvswitch-global
- layeringDefinition:
- abstract: false
- layer: site
- parentSelector:
- name: openvswitch-global
- actions:
- - method: merge
- path: .
- storagePolicy: cleartext
-
-data:
- values:
- pod:
- resources:
- enabled: true
-{% if 'dpdk' in yaml %}
- ovs:
- vswitchd:
- requests:
- memory: "8Gi"
- cpu: "4000m"
- limits:
- memory: "8Gi"
- cpu: "4000m"
- hugepages-1Gi: "8Gi"
- conf:
- ovs_dpdk:
- enabled: true
- hugepages_mountpath: /dev/hugepages_1G
- socket_memory: '4096,4096'
- pmd_cpu_mask: '0xF'
- vhostuser_socket_dir: vhostuser
-{% endif %}
- dependencies:
- - openstack-openvswitch-helm-toolkit
-...
----
-schema: armada/Chart/v1
-metadata:
- schema: metadata/Document/v1
- name: openstack-openvswitch-helm-toolkit
- layeringDefinition:
- abstract: false
- layer: global
- storagePolicy: cleartext
- substitutions:
- # Chart source
- - src:
- schema: pegleg/SoftwareVersions/v1
- name: software-versions
- path: .charts.osh.openvswitch-htk
- dest:
- path: .source
-
-data:
- chart_name: openstack-openvswitch-helm-toolkit
- release: openstack-openvswitch-helm-toolkit
- namespace: helm-toolkit
- values: {}
- dependencies: []
-...
+++ /dev/null
----
-schema: pegleg/SoftwareVersions/v1
-metadata:
- schema: metadata/Document/v1
- replacement: true
- name: software-versions
- layeringDefinition:
- abstract: false
- layer: site
- parentSelector:
- name: software-versions-global
- actions:
- - method: merge
- path: .
- storagePolicy: cleartext
-data:
- charts:
- osh:
- neutron:
- location: https://opendev.org/openstack/openstack-helm
- reference: 05bff26162cc05286ba563d6e8cec82a36031b7d
- subpath: neutron
- type: git
- neutron-htk:
- location: https://opendev.org/openstack/openstack-helm-infra
- reference: d0b32ed88ad652d9c2226466a13bac8b28038399
- subpath: helm-toolkit
- type: git
- nova:
- location: https://opendev.org/openstack/openstack-helm
- reference: d2abe39d498f48c4721e26aca19e81189bc8891b
- subpath: nova
- type: git
- nova-htk:
- location: https://opendev.org/openstack/openstack-helm-infra
- reference: d0b32ed88ad652d9c2226466a13bac8b28038399
- subpath: helm-toolkit
- type: git
- openvswitch:
- location: https://opendev.org/openstack/openstack-helm-infra
- reference: e4538f714a5dfd8a6b6bf2910d2b56f257f9889c
- subpath: openvswitch
- type: git
- openvswitch-htk:
- location: https://opendev.org/openstack/openstack-helm-infra
- reference: d0b32ed88ad652d9c2226466a13bac8b28038399
- subpath: helm-toolkit
- type: git
- images_refs:
- images:
- dep_check: &dep_check quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
- heat: &heat docker.io/openstackhelm/heat:rocky-ubuntu_bionic
- neutron: &neutron docker.io/openstackhelm/neutron:rocky-ubuntu_bionic
- horizon: &horizon docker.io/openstackhelm/horizon:rocky-ubuntu_bionic
- cinder: &cinder docker.io/openstackhelm/cinder:rocky-ubuntu_bionic
- keystone: &keystone docker.io/openstackhelm/keystone:rocky-ubuntu_bionic
- nova: &nova docker.io/openstackhelm/nova:rocky-ubuntu_bionic
- glance: &glance docker.io/openstackhelm/glance:rocky-ubuntu_bionic
- openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:latest-ubuntu_bionic
- os_barbican: &os_barbican docker.io/openstackhelm/barbican:rocky-ubuntu_bionic
- libvirt: &libvirt docker.io/openstackhelm/libvirt:latest-ubuntu_bionic
- images:
- osh:
- openvswitch:
- openvswitch_db_server: "docker.io/openstackhelm/openvswitch:latest-ubuntu_bionic"
- openvswitch_vswitchd: "docker.io/openstackhelm/openvswitch:latest-ubuntu_bionic"
- neutron:
- bootstrap: *heat
- db_init: *heat
- neutron_db_sync: *neutron
- db_drop: *heat
- ks_user: *heat
- ks_service: *heat
- ks_endpoints: *heat
- neutron_server: *neutron
- neutron_dhcp: *neutron
- neutron_metadata: *neutron
- neutron_l3: *neutron
- neutron_l2gw: *neutron
- neutron_openvswitch_agent: *neutron
- neutron_linuxbridge_agent: *neutron
- neutron_bagpipe_bgp: *neutron
- nova:
- bootstrap: *heat
- db_drop: *heat
- db_init: *heat
- ks_user: *heat
- ks_service: *heat
- ks_endpoints: *heat
- nova_api: *nova
- nova_cell_setup: *nova
- nova_cell_setup_init: *heat
- nova_compute: *nova
- nova_compute_ssh: *nova
- nova_conductor: *nova
- nova_consoleauth: *nova
- nova_db_sync: *nova
- nova_novncproxy: *nova
- nova_novncproxy_assets: *nova
- nova_placement: *nova
- nova_scheduler: *nova
- nova_spiceproxy: *nova
- nova_spiceproxy_assets: *nova
- nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
- openvswitch:
- openvswitch_db_server: *openvswitch
- openvswitch_vswitchd: *openvswitch
-...
Code Review / yaml_builds.git / commitdiff