Merge pull request #81 from dhellmann/merge-upstream-20200702

Merge changes from upstream as of 2020-07-02
openshift · Jul 9, 2020 · dd55fdf · dd55fdf
2 parents 4ce920a + 62b58f7
commit dd55fdf
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 569 deletions.
diff --git a/deploy/bmo-capm3/README.md b/deploy/bmo-capm3/README.md
diff --git a/deploy/bmo-capm3/ironic_bmo_configmap.env b/deploy/bmo-capm3/ironic_bmo_configmap.env
diff --git a/deploy/bmo-capm3/kustomization.yaml b/deploy/bmo-capm3/kustomization.yaml
diff --git a/deploy/ironic-keepalived-config/image_patch.yaml b/deploy/ironic-keepalived-config/image_patch.yaml
diff --git a/deploy/ironic-keepalived-config/ironic_bmo_configmap.env b/deploy/ironic-keepalived-config/ironic_bmo_configmap.env
diff --git a/deploy/ironic-keepalived-config/kustomization.yaml b/deploy/ironic-keepalived-config/kustomization.yaml
diff --git a/deploy/ironic-outside-config/ironic_bmo_configmap.env b/deploy/ironic-outside-config/ironic_bmo_configmap.env
diff --git a/deploy/ironic-outside-config/kustomization.yaml b/deploy/ironic-outside-config/kustomization.yaml
diff --git a/deploy/operator/ironic/kustomization.yaml b/deploy/operator/ironic/kustomization.yaml
diff --git a/deploy/operator/ironic/operator_ironic.yaml b/deploy/operator/ironic/operator_ironic.yaml
diff --git a/deploy/operator/ironic_keepalived/kustomization.yaml b/deploy/operator/ironic_keepalived/kustomization.yaml
diff --git a/deploy/operator/ironic_keepalived/operator_ironic_keepalived.yaml b/deploy/operator/ironic_keepalived/operator_ironic_keepalived.yaml
diff --git a/deploy/operator/no_ironic/kustomization.yaml b/deploy/operator/no_ironic/kustomization.yaml