From 8e892d26880d3d13f0295e6eb8fbb5447b832706 Mon Sep 17 00:00:00 2001
From: Mingyuan Qi <mingyuan.qi@intel.com>
Date: Mon, 15 Apr 2019 14:16:00 +0800
Subject: [PATCH] Add ironic manifest to stx-openstack

Add ironic chart to stx-openstack manifest. Ironic services are
enabled when label openstack-ironic=enabled is set. A nova service
nova-compute-ironic within nova chart is referring to this label as
well. Nova-compute-ironic is configured to use ironic driver for
creating/scheduling instance to ironic node through nova service/CLI.

Ironic chart group enablement will be added by ironic meta overrides.

Story: 2004760
Task: 28869
Depends-On: https://review.opendev.org/#/c/653914/
Change-Id: I5728586c69689e32afc948009c2b8c9e2bff84e0
Signed-off-by: Mingyuan Qi <mingyuan.qi@intel.com>
---
 .../manifests/manifest.yaml                   | 106 +++++++++++++++++-
 1 file changed, 104 insertions(+), 2 deletions(-)

diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
index 6da5651059..7a8fbfc6fc 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
@@ -796,13 +796,14 @@ data:
       service_ingress_osapi: false
       cron_job_cell_setup: false
       cron_job_service_cleaner: false
+      statefulset_compute_ironic: false
     labels:
       agent:
         compute:
           node_selector_key: openstack-compute-node
           node_selector_value: enabled
         compute_ironic:
-          node_selector_key: openstack-compute-node
+          node_selector_key: openstack-ironic
           node_selector_value: enabled
       api_metadata:
         node_selector_key: openstack-control-plane
@@ -961,7 +962,6 @@ data:
             - ServerGroupAffinityFilter
             - ServerGroupAntiAffinityFilter
             - PciPassthroughFilter
-            - DiskFilter
           io_ops_weight_multiplier: -5.0
           pci_weight_multiplier: 0.0
           ram_weight_multiplier: 0.0
@@ -1222,6 +1222,108 @@ data:
     - helm-toolkit
 ---
 schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-ironic
+data:
+  chart_name: ironic
+  release: openstack-ironic
+  namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-ironic
+  test:
+    enabled: false
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+    pre:
+      delete:
+        - type: job
+          labels:
+            release_group: osh-openstack-ironic
+  values:
+    pod:
+      replicas:
+        api: 2
+        conductor: 2
+      user:
+        ironic:
+          uid: 0
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
+    labels:
+      api:
+        node_selector_key: openstack-ironic
+        node_selector_value: enabled
+      conductor:
+        node_selector_key: openstack-ironic
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-ironic
+        node_selector_value: enabled
+    images:
+      tags:
+        ironic_manage_cleaning_network: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        ironic_retrive_cleaning_network: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        ironic_retrive_swift_config: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        bootstrap: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        db_drop: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        db_init: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        ironic_db_sync: docker.io/starlingx/stx-ironic:master-centos-stable-latest
+        ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
+        ironic_api: docker.io/starlingx/stx-ironic:master-centos-stable-latest
+        ironic_conductor: docker.io/starlingx/stx-ironic:master-centos-stable-latest
+        ironic_pxe: docker.io/starlingx/stx-ironic:master-centos-stable-latest
+        ironic_pxe_init: docker.io/starlingx/stx-ironic:master-centos-stable-latest
+        ironic_pxe_http: docker.io/nginx:1.13.3
+    conf:
+      ironic:
+        DEFAULT:
+          # enabled_drivers is deprecated in stein
+          enabled_drivers: ''
+          enabled_hardware_types: ipmi
+          enabled_bios_interfaces: no-bios
+          enabled_boot_interfaces: pxe,ipxe
+          enabled_console_interfaces: ipmitool-socat
+          enabled_deploy_interfaces: iscsi,direct
+          enabled_inspect_interfaces: no-inspect
+          enabled_management_interfaces: ipmitool
+          enabled_network_interfaces: flat,noop
+          enabled_power_interfaces: ipmitool
+          enabled_raid_interfaces: no-raid
+          enabled_storage_interfaces: cinder,noop
+          enabled_vendor_interfaces: ipmitool,no-vendor
+        api:
+          port: 6385
+        pxe:
+          pxe_append_params: "nofb nomodeset vga=normal console=ttyS0,115200n8"
+        dhcp:
+          dhcp_provider: neutron
+    # Disable ipa image downloading during bootstrap
+    bootstrap:
+      image:
+        enabled: false
+    endpoints:
+      baremetal:
+        port:
+          pxe_http:
+            default: 28080
+  source:
+    type: tar
+    location: http://172.17.0.1/helm_charts/starlingx/ironic-0.1.0.tgz
+    subpath: ironic
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-heat