Deploy ingress in osh-infra dev and multinode gates

This deploys the ingress chart in the openstack-helm-infra dev
and multinode gates, which allows for enabling ingresses in the
charts where defined

Change-Id: I055c7b02d9af68f6e3c5eda33d69dd0b8b1b70ca

doc/source/install/developer.rst

@@ -15,10 +15,10 @@ Alternatively, this step can be performed by running the script directly:
 
   ./tools/deployment/developer/010-deploy-docker-registry.sh
 
-Deploy NFS Provisioner for LMA Services
+Deploy Cluster and Namespace Ingress Controllers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/020-lma-nfs-provisioner.sh
+.. literalinclude:: ../../../tools/deployment/developer/020-ingress.sh
     :language: shell
     :lines: 1,17-
 
@@ -26,12 +26,25 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/020-lma-nfs-provisioner.sh
+  ./tools/deployment/developer/020-ingress.sh
+
+Deploy NFS Provisioner for LMA Services
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. literalinclude:: ../../../tools/deployment/developer/030-lma-nfs-provisioner.sh
+    :language: shell
+    :lines: 1,17-
+
+Alternatively, this step can be performed by running the script directly:
+
+.. code-block:: shell
+
+  ./tools/deployment/developer/030-lma-nfs-provisioner.sh
 
 Deploy LDAP
 ^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/030-ldap.sh
+.. literalinclude:: ../../../tools/deployment/developer/040-ldap.sh
     :language: shell
     :lines: 1,17-
 
@@ -39,12 +52,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/030-ldap.sh
+  ./tools/deployment/developer/040-ldap.sh
 
 Deploy Prometheus
 ^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/040-prometheus.sh
+.. literalinclude:: ../../../tools/deployment/developer/050-prometheus.sh
     :language: shell
     :lines: 1,17-
 
@@ -52,12 +65,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/040-prometheus.sh
+  ./tools/deployment/developer/050-prometheus.sh
 
 Deploy Alertmanager
 ^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/050-alertmanager.sh
+.. literalinclude:: ../../../tools/deployment/developer/060-alertmanager.sh
     :language: shell
     :lines: 1,17-
 
@@ -65,12 +78,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/050-alertmanager.sh
+  ./tools/deployment/developer/060-alertmanager.sh
 
 Deploy Kube-State-Metrics
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/060-kube-state-metrics.sh
+.. literalinclude:: ../../../tools/deployment/developer/070-kube-state-metrics.sh
     :language: shell
     :lines: 1,17-
 
@@ -78,12 +91,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/060-kube-state-metrics.sh
+  ./tools/deployment/developer/070-kube-state-metrics.sh
 
 Deploy Node Exporter
 ^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/070-node-exporter.sh
+.. literalinclude:: ../../../tools/deployment/developer/080-node-exporter.sh
     :language: shell
     :lines: 1,17-
 
@@ -91,12 +104,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/070-node-exporter.sh
+  ./tools/deployment/developer/080-node-exporter.sh
 
 Deploy OpenStack Exporter
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/080-openstack-exporter.sh
+.. literalinclude:: ../../../tools/deployment/developer/090-openstack-exporter.sh
     :language: shell
     :lines: 1,17-
 
@@ -104,12 +117,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/080-openstack-exporter.sh
+  ./tools/deployment/developer/090-openstack-exporter.sh
 
 Deploy Grafana
 ^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/090-grafana.sh
+.. literalinclude:: ../../../tools/deployment/developer/100-grafana.sh
     :language: shell
     :lines: 1,17-
 
@@ -117,12 +130,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/090-grafana.sh
+  ./tools/deployment/developer/100-grafana.sh
 
 Deploy Nagios
 ^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/100-nagios.sh
+.. literalinclude:: ../../../tools/deployment/developer/110-nagios.sh
     :language: shell
     :lines: 1,17-
 
@@ -130,12 +143,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/100-nagios.sh
+  ./tools/deployment/developer/110-nagios.sh
 
 Deploy Elasticsearch
 ^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/110-elasticsearch.sh
+.. literalinclude:: ../../../tools/deployment/developer/120-elasticsearch.sh
     :language: shell
     :lines: 1,17-
 
@@ -143,12 +156,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/110-elasticsearch.sh
+  ./tools/deployment/developer/120-elasticsearch.sh
 
 Deploy Fluent-Logging
 ^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/120-fluent-logging.sh
+.. literalinclude:: ../../../tools/deployment/developer/130-fluent-logging.sh
     :language: shell
     :lines: 1,17-
 
@@ -156,12 +169,12 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/120-fluent-logging.sh
+  ./tools/deployment/developer/130-fluent-logging.sh
 
 Deploy Kibana
 ^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/developer/130-kibana.sh
+.. literalinclude:: ../../../tools/deployment/developer/140-kibana.sh
     :language: shell
     :lines: 1,17-
 
@@ -169,4 +182,4 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/130-kibana.sh
+  ./tools/deployment/developer/140-kibana.sh

doc/source/install/multinode.rst

@@ -15,158 +15,171 @@ Alternatively, this step can be performed by running the script directly:
 
   ./tools/deployment/multinode/010-deploy-docker-registry.sh
 
-Deploy NFS Provisioner for LMA Services
+  Deploy Cluster and Namespace Ingress Controllers
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/020-lma-nfs-provisioner.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/020-ingress.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/020-lma-nfs-provisioner.sh
+    ./tools/deployment/multinode/020-ingress.sh
 
-Deploy LDAP
+  Deploy NFS Provisioner for LMA Services
-^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/030-ldap.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/030-lma-nfs-provisioner.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/030-ldap.sh
+    ./tools/deployment/multinode/030-lma-nfs-provisioner.sh
 
-Deploy Prometheus
+  Deploy LDAP
-^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/040-prometheus.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/040-ldap.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/040-prometheus.sh
+    ./tools/deployment/multinode/040-ldap.sh
 
-Deploy Alertmanager
+  Deploy Prometheus
-^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/050-alertmanager.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/050-prometheus.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/050-alertmanager.sh
+    ./tools/deployment/multinode/050-prometheus.sh
 
-Deploy Kube-State-Metrics
+  Deploy Alertmanager
-^^^^^^^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/060-kube-state-metrics.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/060-alertmanager.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/060-kube-state-metrics.sh
+    ./tools/deployment/multinode/060-alertmanager.sh
 
-Deploy Node Exporter
+  Deploy Kube-State-Metrics
-^^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/070-node-exporter.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/070-kube-state-metrics.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/070-node-exporter.sh
+    ./tools/deployment/multinode/070-kube-state-metrics.sh
 
-Deploy OpenStack Exporter
+  Deploy Node Exporter
-^^^^^^^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/080-openstack-exporter.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/080-node-exporter.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/080-openstack-exporter.sh
+    ./tools/deployment/multinode/080-node-exporter.sh
 
-Deploy Grafana
+  Deploy OpenStack Exporter
-^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/090-grafana.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/090-openstack-exporter.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/090-grafana.sh
+    ./tools/deployment/multinode/090-openstack-exporter.sh
 
-Deploy Nagios
+  Deploy Grafana
-^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/100-nagios.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/100-grafana.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/100-nagios.sh
+    ./tools/deployment/multinode/100-grafana.sh
 
-Deploy Elasticsearch
+  Deploy Nagios
-^^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/110-elasticsearch.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/110-nagios.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/110-elasticsearch.sh
+    ./tools/deployment/multinode/110-nagios.sh
 
-Deploy Fluent-Logging
+  Deploy Elasticsearch
-^^^^^^^^^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/120-fluent-logging.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/120-elasticsearch.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/120-fluent-logging.sh
+    ./tools/deployment/multinode/120-elasticsearch.sh
 
-Deploy Kibana
+  Deploy Fluent-Logging
-^^^^^^^^^^^^^
+  ^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../tools/deployment/multinode/130-kibana.sh
+  .. literalinclude:: ../../../tools/deployment/multinode/130-fluent-logging.sh
-    :language: shell
+      :language: shell
-    :lines: 1,17-
+      :lines: 1,17-
 
-Alternatively, this step can be performed by running the script directly:
+  Alternatively, this step can be performed by running the script directly:
 
-.. code-block:: shell
+  .. code-block:: shell
 
-  ./tools/deployment/multinode/130-kibana.sh
+    ./tools/deployment/multinode/130-fluent-logging.sh
+
+  Deploy Kibana
+  ^^^^^^^^^^^^^
+
+  .. literalinclude:: ../../../tools/deployment/multinode/140-kibana.sh
+      :language: shell
+      :lines: 1,17-
+
+  Alternatively, this step can be performed by running the script directly:
+
+  .. code-block:: shell
+
+    ./tools/deployment/multinode/140-kibana.sh

playbooks/osh-infra-dev-deploy.yaml

@@ -36,81 +36,87 @@
         ./tools/deployment/developer/010-deploy-docker-registry.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Cluster and Namespace Ingress
+      shell: |
+        set -xe;
+        ./tools/deployment/developer/020-ingress.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy NFS for Logging, Monitoring and Alerting Components
       shell: |
         set -xe;
-        ./tools/deployment/developer/020-lma-nfs-provisioner.sh
+        ./tools/deployment/developer/030-lma-nfs-provisioner.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy LDAP
       shell: |
         set -xe;
-        ./tools/deployment/developer/030-ldap.sh
+        ./tools/deployment/developer/040-ldap.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Prometheus
       shell: |
         set -xe;
-        ./tools/deployment/developer/040-prometheus.sh
+        ./tools/deployment/developer/050-prometheus.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Alertmanager
       shell: |
         set -xe;
-        ./tools/deployment/developer/050-alertmanager.sh
+        ./tools/deployment/developer/060-alertmanager.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Kube-State-Metrics
       shell: |
         set -xe;
-        ./tools/deployment/developer/060-kube-state-metrics.sh
+        ./tools/deployment/developer/070-kube-state-metrics.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Node Exporter
       shell: |
         set -xe;
-        ./tools/deployment/developer/070-node-exporter.sh
+        ./tools/deployment/developer/080-node-exporter.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Prometheus OpenStack Exporter
       shell: |
         set -xe;
-        ./tools/deployment/developer/080-openstack-exporter.sh
+        ./tools/deployment/developer/090-openstack-exporter.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Grafana
       shell: |
         set -xe;
-        ./tools/deployment/developer/090-grafana.sh
+        ./tools/deployment/developer/100-grafana.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Nagios
       shell: |
         set -xe;
-        ./tools/deployment/developer/100-nagios.sh
+        ./tools/deployment/developer/110-nagios.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Elasticsearch
       shell: |
         set -xe;
-        ./tools/deployment/developer/110-elasticsearch.sh
+        ./tools/deployment/developer/120-elasticsearch.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Test LDAP Auth for Elasticsearch
       shell: |
         set -xe;
-        ./tools/deployment/developer/115-elasticsearch-ldap.sh
+        ./tools/deployment/developer/125-elasticsearch-ldap.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Fluent-Logging
       shell: |
         set -xe;
-        ./tools/deployment/developer/120-fluent-logging.sh
+        ./tools/deployment/developer/130-fluent-logging.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Kibana
       shell: |
         set -xe;
-        ./tools/deployment/developer/130-kibana.sh
+        ./tools/deployment/developer/140-kibana.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"

playbooks/osh-infra-multinode-deploy.yaml

@@ -20,81 +20,87 @@
         ./tools/deployment/developer/010-deploy-docker-registry.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Cluster and Namespace Ingress
+      shell: |
+        set -xe;
+        ./tools/deployment/developer/020-ingress.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy NFS for Logging, Monitoring and Alerting Components
       shell: |
         set -xe;
-        ./tools/deployment/developer/020-lma-nfs-provisioner.sh
+        ./tools/deployment/developer/030-lma-nfs-provisioner.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy LDAP
       shell: |
         set -xe;
-        ./tools/deployment/multinode/030-ldap.sh
+        ./tools/deployment/multinode/040-ldap.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Prometheus
       shell: |
         set -xe;
-        ./tools/deployment/multinode/040-prometheus.sh
+        ./tools/deployment/multinode/050-prometheus.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Alertmanager
       shell: |
         set -xe;
-        ./tools/deployment/multinode/050-alertmanager.sh
+        ./tools/deployment/multinode/060-alertmanager.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Kube-State-Metrics
       shell: |
         set -xe;
-        ./tools/deployment/multinode/060-kube-state-metrics.sh
+        ./tools/deployment/multinode/070-kube-state-metrics.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Node Exporter
       shell: |
         set -xe;
-        ./tools/deployment/multinode/070-node-exporter.sh
+        ./tools/deployment/multinode/080-node-exporter.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Prometheus OpenStack Exporter
       shell: |
         set -xe;
-        ./tools/deployment/multinode/080-openstack-exporter.sh
+        ./tools/deployment/multinode/090-openstack-exporter.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Grafana
       shell: |
         set -xe;
-        ./tools/deployment/multinode/090-grafana.sh
+        ./tools/deployment/multinode/100-grafana.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Nagios
       shell: |
         set -xe;
-        ./tools/deployment/multinode/100-nagios.sh
+        ./tools/deployment/multinode/110-nagios.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Elasticsearch
       shell: |
         set -xe;
-        ./tools/deployment/multinode/110-elasticsearch.sh
+        ./tools/deployment/multinode/120-elasticsearch.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Test LDAP Auth for Elasticsearch
       shell: |
         set -xe;
-        ./tools/deployment/multinode/115-elasticsearch-ldap.sh
+        ./tools/deployment/multinode/125-elasticsearch-ldap.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Fluent-Logging
       shell: |
         set -xe;
-        ./tools/deployment/multinode/120-fluent-logging.sh
+        ./tools/deployment/multinode/130-fluent-logging.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Kibana
       shell: |
         set -xe;
-        ./tools/deployment/multinode/130-kibana.sh
+        ./tools/deployment/multinode/140-kibana.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"

tools/deployment/common/140-kibana.sh

@@ -21,9 +21,7 @@ make kibana
 
 #NOTE: Deploy command
 helm upgrade --install kibana ./kibana \
-    --namespace=openstack \
+    --namespace=openstack
-    --set network.kibana.node_port.enabled=true \
-    --set network.kibana.ingress.public=false
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/020-ingress.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# 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.
+
+set -xe
+
+#NOTE: Deploy global ingress
+tee /tmp/ingress-kube-system.yaml << EOF
+deployment:
+  mode: cluster
+  type: DaemonSet
+network:
+  host_namespace: true
+EOF
+helm upgrade --install ingress-kube-system ./ingress \
+  --namespace=kube-system \
+  --values=/tmp/ingress-kube-system.yaml
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh kube-system
+
+#NOTE: Display info
+helm status ingress-kube-system
+
+#NOTE: Deploy namespace ingress controllers
+helm upgrade --install ingress-openstack ./ingress \
+  --namespace=openstack
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Display info
+helm status ingress-openstack

tools/deployment/developer/020-lma-nfs-provisioner.sh

@@ -1 +0,0 @@
-../common/020-lma-nfs-provisioner.sh

tools/deployment/developer/030-ldap.sh

@@ -1 +0,0 @@
-../common/030-ldap.sh

tools/deployment/developer/030-lma-nfs-provisioner.sh

@@ -0,0 +1 @@
+../common/030-lma-nfs-provisioner.sh

tools/deployment/developer/040-ldap.sh

@@ -0,0 +1 @@
+../common/040-ldap.sh

tools/deployment/developer/050-prometheus.sh

@@ -20,19 +20,9 @@ set -xe
 make prometheus
 
 #NOTE: Deploy command
-tee /tmp/prometheus.yaml << EOF
-storage:
-  storage_class: openstack-helm-lma-nfs
-network:
-  prometheus:
-    ingress:
-      public: false
-    node_port:
-      enabled: true
-EOF
 helm upgrade --install prometheus ./prometheus \
     --namespace=openstack \
-    --values=/tmp/prometheus.yaml
+    --set storage.storage_class=openstack-helm-lma-nfs
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/060-alertmanager.sh

@@ -20,22 +20,10 @@ set -xe
 make alertmanager
 
 #NOTE: Deploy command
-tee /tmp/prometheus-alertmanager.yaml << EOF
-pod:
-  replicas:
-    alertmanager: 1
-storage:
-  storage_class: openstack-helm-lma-nfs
-network:
-  alertmanager:
-    ingress:
-      public: false
-    node_port:
-      enabled: true
-EOF
 helm upgrade --install prometheus-alertmanager ./prometheus-alertmanager \
     --namespace=openstack \
-    --values=/tmp/prometheus-alertmanager.yaml
+    --set pod.replicas.alertmanager=1 \
+    --set storage.storage_class=openstack-helm-lma-nfs
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/060-kube-state-metrics.sh

@@ -1 +0,0 @@
-../common/060-kube-state-metrics.sh

tools/deployment/developer/070-kube-state-metrics.sh

@@ -0,0 +1 @@
+../common/070-kube-state-metrics.sh

tools/deployment/developer/070-node-exporter.sh

@@ -1 +0,0 @@
-../common/070-node-exporter.sh

tools/deployment/developer/080-node-exporter.sh

@@ -0,0 +1 @@
+../common/080-node-exporter.sh

tools/deployment/developer/080-openstack-exporter.sh

@@ -1 +0,0 @@
-../common/080-openstack-exporter.sh

tools/deployment/developer/090-openstack-exporter.sh

@@ -0,0 +1 @@
+../common/090-openstack-exporter.sh

tools/deployment/developer/100-grafana.sh

@@ -27,7 +27,6 @@ dependencies:
       jobs: null
       services: null
 manifests:
-  ingress: false
   job_db_init: false
   job_db_init_session: false
   job_db_session_sync: false
@@ -41,12 +40,6 @@ conf:
     session:
       provider: file
       provider_config: sessions
-network:
-  grafana:
-    ingress:
-      public: false
-    node_port:
-      enabled: true
 EOF
 helm upgrade --install grafana ./grafana \
     --namespace=openstack \

tools/deployment/developer/110-nagios.sh

@@ -21,9 +21,7 @@ make nagios
 
 #NOTE: Deploy command
 helm upgrade --install nagios ./nagios \
-    --namespace=openstack \
+    --namespace=openstack
-    --set network.nagios.ingress.public=false \
-    --set network.nagios.node_port.enabled=true
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/115-elasticsearch-ldap.sh

@@ -1 +0,0 @@
-../common/115-elasticsearch-ldap.sh

tools/deployment/developer/125-elasticsearch-ldap.sh

@@ -0,0 +1 @@
+../common/125-elasticsearch-ldap.sh

tools/deployment/developer/130-kibana.sh

@@ -1 +0,0 @@
-../common/130-kibana.sh

tools/deployment/developer/140-kibana.sh

@@ -0,0 +1 @@
+../common/140-kibana.sh

tools/deployment/multinode/020-ingress.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# 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.
+
+set -xe
+
+#NOTE: Deploy global ingress
+tee /tmp/ingress-kube-system.yaml << EOF
+pod:
+  replicas:
+    error_page: 2
+deployment:
+  mode: cluster
+  type: DaemonSet
+network:
+  host_namespace: true
+EOF
+helm upgrade --install ingress-kube-system ./ingress \
+  --namespace=kube-system \
+  --values=/tmp/ingress-kube-system.yaml
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh kube-system
+
+#NOTE: Display info
+helm status ingress-kube-system
+
+#NOTE: Deploy namespace ingress controllers
+tee /tmp/ingress-openstack.yaml << EOF
+pod:
+  replicas:
+    ingress: 2
+    error_page: 2
+EOF
+helm upgrade --install ingress-openstack ./ingress \
+  --namespace=openstack \
+  --values=/tmp/ingress-openstack.yaml
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Display info
+helm status ingress-openstack

tools/deployment/multinode/020-lma-nfs-provisioner.sh

@@ -1 +0,0 @@
-../common/020-lma-nfs-provisioner.sh

tools/deployment/multinode/030-ldap.sh

@@ -1 +0,0 @@
-../common/030-ldap.sh

tools/deployment/multinode/030-lma-nfs-provisioner.sh

@@ -0,0 +1 @@
+../common/030-lma-nfs-provisioner.sh

tools/deployment/multinode/040-ldap.sh

@@ -0,0 +1 @@
+../common/040-ldap.sh

tools/deployment/multinode/060-kube-state-metrics.sh

@@ -1 +0,0 @@
-../common/060-kube-state-metrics.sh

tools/deployment/multinode/070-kube-state-metrics.sh

@@ -0,0 +1 @@
+../common/070-kube-state-metrics.sh

tools/deployment/multinode/070-node-exporter.sh

@@ -1 +0,0 @@
-../common/070-node-exporter.sh

tools/deployment/multinode/080-node-exporter.sh

@@ -0,0 +1 @@
+../common/080-node-exporter.sh

tools/deployment/multinode/080-openstack-exporter.sh

@@ -1 +0,0 @@
-../common/080-openstack-exporter.sh

tools/deployment/multinode/090-openstack-exporter.sh

@@ -0,0 +1 @@
+../common/090-openstack-exporter.sh

tools/deployment/multinode/110-nagios.sh

@@ -22,7 +22,6 @@ make nagios
 #NOTE: Deploy command
 helm upgrade --install nagios ./nagios \
     --namespace=openstack \
-    --set network.nagios.ingress.public=false \
     --set pod.replicas.nagios=3
 
 #NOTE: Wait for deploy

tools/deployment/multinode/115-elasticsearch-ldap.sh

@@ -1 +0,0 @@
-../common/115-elasticsearch-ldap.sh

tools/deployment/multinode/125-elasticsearch-ldap.sh

@@ -0,0 +1 @@
+../common/125-elasticsearch-ldap.sh

tools/deployment/multinode/130-kibana.sh

@@ -1 +0,0 @@
-../common/130-kibana.sh

tools/deployment/multinode/140-kibana.sh

@@ -0,0 +1 @@
+../common/140-kibana.sh