From 0e1dec39d18d8b61701469c367e7a4bea1542fde Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Thu, 6 Dec 2018 08:26:33 -0600
Subject: [PATCH] Add heat to compute kit and apparmor jobs

This adds the deployment of heat to the compute kit and apparmor
job in order to provide a simple mechanism for booting vms to
validate a functional cloud deployment

Change-Id: I1a0b0fd4fd708a045e82781cfe3990e23d2af581
---
 tools/deployment/component/common/ingress.sh  |  3 +--
 tools/deployment/component/glance/glance.sh   |  1 -
 .../playbooks/osh-infra-setup-firewall.yaml   | 25 +++++++++++++++++++
 zuul.d/jobs-openstack-helm.yaml               |  8 ++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 tools/gate/playbooks/osh-infra-setup-firewall.yaml

diff --git a/tools/deployment/component/common/ingress.sh b/tools/deployment/component/common/ingress.sh
index d574fe176e..e7a2ca3bf5 100755
--- a/tools/deployment/component/common/ingress.sh
+++ b/tools/deployment/component/common/ingress.sh
@@ -18,11 +18,10 @@ set -xe
 
 #NOTE: Lint and package chart
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_EXTRA_HELM_ARGS:=""}
 make -C ${OSH_INFRA_PATH} ingress
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_EXTRA_HELM_ARGS:=""}
 tee /tmp/ingress-kube-system.yaml << EOF
 deployment:
   mode: cluster
diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh
index db92c6a8fd..a3c3f34cd4 100755
--- a/tools/deployment/component/glance/glance.sh
+++ b/tools/deployment/component/glance/glance.sh
@@ -45,7 +45,6 @@ fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --values=/tmp/glance.yaml \
-  --set manifests.network_policy=true \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
diff --git a/tools/gate/playbooks/osh-infra-setup-firewall.yaml b/tools/gate/playbooks/osh-infra-setup-firewall.yaml
new file mode 100644
index 0000000000..6387a50aa1
--- /dev/null
+++ b/tools/gate/playbooks/osh-infra-setup-firewall.yaml
@@ -0,0 +1,25 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# 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.
+
+- hosts: all
+  vars_files:
+    - vars.yaml
+  vars:
+    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
+  gather_facts: True
+  become: yes
+  roles:
+    - setup-firewall
+  tags:
+    - setup-firewall
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index b76e068aa8..c50ebd78b6 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -46,6 +46,7 @@
       osh_openstack_release: ocata
     pre-run:
       - tools/gate/playbooks/osh-infra-upgrade-host.yaml
+      - tools/gate/playbooks/osh-infra-setup-firewall.yaml
     post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
     required-projects:
       - openstack/openstack-helm-infra
@@ -147,10 +148,14 @@
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
         - ./tools/deployment/component/keystone/keystone.sh
+        - ./tools/deployment/component/heat/heat.sh
         - ./tools/deployment/component/glance/glance.sh
         - ./tools/deployment/component/compute-kit/openvswitch.sh
         - ./tools/deployment/component/compute-kit/libvirt.sh
         - ./tools/deployment/component/compute-kit/compute-kit.sh
+        - ./tools/deployment/developer/common/170-setup-gateway.sh
+        - ./tools/deployment/developer/common/900-use-it.sh
+
 - job:
     name: openstack-helm-apparmor
     parent: openstack-helm-chart-deploy
@@ -166,10 +171,13 @@
         - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
         - ./tools/deployment/component/keystone/keystone.sh
+        - ./tools/deployment/component/heat/heat.sh
         - ./tools/deployment/component/glance/glance.sh
         - ./tools/deployment/component/compute-kit/openvswitch.sh
         - ./tools/deployment/component/compute-kit/libvirt.sh
         - ./tools/deployment/apparmor/compute-kit.sh
+        - ./tools/deployment/developer/common/170-setup-gateway.sh
+        - ./tools/deployment/developer/common/900-use-it.sh
 
 - job:
     name: openstack-helm-multinode-temp