diff --git a/doc/source/install/developer.rst b/doc/source/install/developer.rst index c230d9dfb..f6e650cc2 100644 --- a/doc/source/install/developer.rst +++ b/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 diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index c2eb2f44f..704ef4f71 100644 --- a/doc/source/install/multinode.rst +++ b/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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/020-ingress.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/030-lma-nfs-provisioner.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/040-ldap.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/050-prometheus.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/060-alertmanager.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/070-kube-state-metrics.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/080-node-exporter.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/090-openstack-exporter.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/100-grafana.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/110-nagios.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/120-elasticsearch.sh + :language: shell + :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 - :language: shell - :lines: 1,17- + .. literalinclude:: ../../../tools/deployment/multinode/130-fluent-logging.sh + :language: shell + :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 diff --git a/playbooks/osh-infra-dev-deploy.yaml b/playbooks/osh-infra-dev-deploy.yaml index 45a16c21a..4bc0d27ab 100644 --- a/playbooks/osh-infra-dev-deploy.yaml +++ b/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 }}" diff --git a/playbooks/osh-infra-multinode-deploy.yaml b/playbooks/osh-infra-multinode-deploy.yaml index d82bccc70..22d9dc81d 100644 --- a/playbooks/osh-infra-multinode-deploy.yaml +++ b/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 }}" diff --git a/tools/deployment/common/020-lma-nfs-provisioner.sh b/tools/deployment/common/030-lma-nfs-provisioner.sh similarity index 100% rename from tools/deployment/common/020-lma-nfs-provisioner.sh rename to tools/deployment/common/030-lma-nfs-provisioner.sh diff --git a/tools/deployment/common/030-ldap.sh b/tools/deployment/common/040-ldap.sh similarity index 100% rename from tools/deployment/common/030-ldap.sh rename to tools/deployment/common/040-ldap.sh diff --git a/tools/deployment/common/060-kube-state-metrics.sh b/tools/deployment/common/070-kube-state-metrics.sh similarity index 100% rename from tools/deployment/common/060-kube-state-metrics.sh rename to tools/deployment/common/070-kube-state-metrics.sh diff --git a/tools/deployment/common/070-node-exporter.sh b/tools/deployment/common/080-node-exporter.sh similarity index 100% rename from tools/deployment/common/070-node-exporter.sh rename to tools/deployment/common/080-node-exporter.sh diff --git a/tools/deployment/common/080-openstack-exporter.sh b/tools/deployment/common/090-openstack-exporter.sh similarity index 100% rename from tools/deployment/common/080-openstack-exporter.sh rename to tools/deployment/common/090-openstack-exporter.sh diff --git a/tools/deployment/common/115-elasticsearch-ldap.sh b/tools/deployment/common/125-elasticsearch-ldap.sh similarity index 100% rename from tools/deployment/common/115-elasticsearch-ldap.sh rename to tools/deployment/common/125-elasticsearch-ldap.sh diff --git a/tools/deployment/common/130-kibana.sh b/tools/deployment/common/140-kibana.sh similarity index 87% rename from tools/deployment/common/130-kibana.sh rename to tools/deployment/common/140-kibana.sh index 68b1985c9..e8f39b1f7 100755 --- a/tools/deployment/common/130-kibana.sh +++ b/tools/deployment/common/140-kibana.sh @@ -21,9 +21,7 @@ make kibana #NOTE: Deploy command helm upgrade --install kibana ./kibana \ - --namespace=openstack \ - --set network.kibana.node_port.enabled=true \ - --set network.kibana.ingress.public=false + --namespace=openstack #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/developer/020-ingress.sh b/tools/deployment/developer/020-ingress.sh new file mode 100755 index 000000000..e5a7f42d2 --- /dev/null +++ b/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 diff --git a/tools/deployment/developer/020-lma-nfs-provisioner.sh b/tools/deployment/developer/020-lma-nfs-provisioner.sh deleted file mode 120000 index afcbfbe42..000000000 --- a/tools/deployment/developer/020-lma-nfs-provisioner.sh +++ /dev/null @@ -1 +0,0 @@ -../common/020-lma-nfs-provisioner.sh \ No newline at end of file diff --git a/tools/deployment/developer/030-ldap.sh b/tools/deployment/developer/030-ldap.sh deleted file mode 120000 index 6ffe1c65a..000000000 --- a/tools/deployment/developer/030-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../common/030-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/030-lma-nfs-provisioner.sh b/tools/deployment/developer/030-lma-nfs-provisioner.sh new file mode 120000 index 000000000..508e82dcb --- /dev/null +++ b/tools/deployment/developer/030-lma-nfs-provisioner.sh @@ -0,0 +1 @@ +../common/030-lma-nfs-provisioner.sh \ No newline at end of file diff --git a/tools/deployment/developer/040-ldap.sh b/tools/deployment/developer/040-ldap.sh new file mode 120000 index 000000000..4ed4b9d4b --- /dev/null +++ b/tools/deployment/developer/040-ldap.sh @@ -0,0 +1 @@ +../common/040-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/040-prometheus.sh b/tools/deployment/developer/050-prometheus.sh similarity index 81% rename from tools/deployment/developer/040-prometheus.sh rename to tools/deployment/developer/050-prometheus.sh index cb9baa690..32d661822 100755 --- a/tools/deployment/developer/040-prometheus.sh +++ b/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 diff --git a/tools/deployment/developer/050-alertmanager.sh b/tools/deployment/developer/060-alertmanager.sh similarity index 77% rename from tools/deployment/developer/050-alertmanager.sh rename to tools/deployment/developer/060-alertmanager.sh index 74519a95d..e56616ecc 100755 --- a/tools/deployment/developer/050-alertmanager.sh +++ b/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 diff --git a/tools/deployment/developer/060-kube-state-metrics.sh b/tools/deployment/developer/060-kube-state-metrics.sh deleted file mode 120000 index 337fdf944..000000000 --- a/tools/deployment/developer/060-kube-state-metrics.sh +++ /dev/null @@ -1 +0,0 @@ -../common/060-kube-state-metrics.sh \ No newline at end of file diff --git a/tools/deployment/developer/070-kube-state-metrics.sh b/tools/deployment/developer/070-kube-state-metrics.sh new file mode 120000 index 000000000..2a18ebb8b --- /dev/null +++ b/tools/deployment/developer/070-kube-state-metrics.sh @@ -0,0 +1 @@ +../common/070-kube-state-metrics.sh \ No newline at end of file diff --git a/tools/deployment/developer/070-node-exporter.sh b/tools/deployment/developer/070-node-exporter.sh deleted file mode 120000 index 7d1d767f5..000000000 --- a/tools/deployment/developer/070-node-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../common/070-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/080-node-exporter.sh b/tools/deployment/developer/080-node-exporter.sh new file mode 120000 index 000000000..412748a74 --- /dev/null +++ b/tools/deployment/developer/080-node-exporter.sh @@ -0,0 +1 @@ +../common/080-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/080-openstack-exporter.sh b/tools/deployment/developer/080-openstack-exporter.sh deleted file mode 120000 index 52ddfb6eb..000000000 --- a/tools/deployment/developer/080-openstack-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../common/080-openstack-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/090-openstack-exporter.sh b/tools/deployment/developer/090-openstack-exporter.sh new file mode 120000 index 000000000..514a6a5c7 --- /dev/null +++ b/tools/deployment/developer/090-openstack-exporter.sh @@ -0,0 +1 @@ +../common/090-openstack-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/090-grafana.sh b/tools/deployment/developer/100-grafana.sh similarity index 92% rename from tools/deployment/developer/090-grafana.sh rename to tools/deployment/developer/100-grafana.sh index 5ec2e88f9..8a78a2ad5 100755 --- a/tools/deployment/developer/090-grafana.sh +++ b/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 \ diff --git a/tools/deployment/developer/100-nagios.sh b/tools/deployment/developer/110-nagios.sh similarity index 87% rename from tools/deployment/developer/100-nagios.sh rename to tools/deployment/developer/110-nagios.sh index d75c476a8..446568e2b 100755 --- a/tools/deployment/developer/100-nagios.sh +++ b/tools/deployment/developer/110-nagios.sh @@ -21,9 +21,7 @@ make nagios #NOTE: Deploy command helm upgrade --install nagios ./nagios \ - --namespace=openstack \ - --set network.nagios.ingress.public=false \ - --set network.nagios.node_port.enabled=true + --namespace=openstack #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/developer/115-elasticsearch-ldap.sh b/tools/deployment/developer/115-elasticsearch-ldap.sh deleted file mode 120000 index 554cc7f26..000000000 --- a/tools/deployment/developer/115-elasticsearch-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../common/115-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/110-elasticsearch.sh b/tools/deployment/developer/120-elasticsearch.sh similarity index 100% rename from tools/deployment/developer/110-elasticsearch.sh rename to tools/deployment/developer/120-elasticsearch.sh diff --git a/tools/deployment/developer/125-elasticsearch-ldap.sh b/tools/deployment/developer/125-elasticsearch-ldap.sh new file mode 120000 index 000000000..f49334085 --- /dev/null +++ b/tools/deployment/developer/125-elasticsearch-ldap.sh @@ -0,0 +1 @@ +../common/125-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/120-fluent-logging.sh b/tools/deployment/developer/130-fluent-logging.sh similarity index 100% rename from tools/deployment/developer/120-fluent-logging.sh rename to tools/deployment/developer/130-fluent-logging.sh diff --git a/tools/deployment/developer/130-kibana.sh b/tools/deployment/developer/130-kibana.sh deleted file mode 120000 index 65eac6c6f..000000000 --- a/tools/deployment/developer/130-kibana.sh +++ /dev/null @@ -1 +0,0 @@ -../common/130-kibana.sh \ No newline at end of file diff --git a/tools/deployment/developer/140-kibana.sh b/tools/deployment/developer/140-kibana.sh new file mode 120000 index 000000000..938b38606 --- /dev/null +++ b/tools/deployment/developer/140-kibana.sh @@ -0,0 +1 @@ +../common/140-kibana.sh \ No newline at end of file diff --git a/tools/deployment/multinode/020-ingress.sh b/tools/deployment/multinode/020-ingress.sh new file mode 100755 index 000000000..cf689d1d1 --- /dev/null +++ b/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 diff --git a/tools/deployment/multinode/020-lma-nfs-provisioner.sh b/tools/deployment/multinode/020-lma-nfs-provisioner.sh deleted file mode 120000 index afcbfbe42..000000000 --- a/tools/deployment/multinode/020-lma-nfs-provisioner.sh +++ /dev/null @@ -1 +0,0 @@ -../common/020-lma-nfs-provisioner.sh \ No newline at end of file diff --git a/tools/deployment/multinode/030-ldap.sh b/tools/deployment/multinode/030-ldap.sh deleted file mode 120000 index 6ffe1c65a..000000000 --- a/tools/deployment/multinode/030-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../common/030-ldap.sh \ No newline at end of file diff --git a/tools/deployment/multinode/030-lma-nfs-provisioner.sh b/tools/deployment/multinode/030-lma-nfs-provisioner.sh new file mode 120000 index 000000000..508e82dcb --- /dev/null +++ b/tools/deployment/multinode/030-lma-nfs-provisioner.sh @@ -0,0 +1 @@ +../common/030-lma-nfs-provisioner.sh \ No newline at end of file diff --git a/tools/deployment/multinode/040-ldap.sh b/tools/deployment/multinode/040-ldap.sh new file mode 120000 index 000000000..4ed4b9d4b --- /dev/null +++ b/tools/deployment/multinode/040-ldap.sh @@ -0,0 +1 @@ +../common/040-ldap.sh \ No newline at end of file diff --git a/tools/deployment/multinode/040-prometheus.sh b/tools/deployment/multinode/050-prometheus.sh similarity index 100% rename from tools/deployment/multinode/040-prometheus.sh rename to tools/deployment/multinode/050-prometheus.sh diff --git a/tools/deployment/multinode/050-alertmanager.sh b/tools/deployment/multinode/060-alertmanager.sh similarity index 100% rename from tools/deployment/multinode/050-alertmanager.sh rename to tools/deployment/multinode/060-alertmanager.sh diff --git a/tools/deployment/multinode/060-kube-state-metrics.sh b/tools/deployment/multinode/060-kube-state-metrics.sh deleted file mode 120000 index 337fdf944..000000000 --- a/tools/deployment/multinode/060-kube-state-metrics.sh +++ /dev/null @@ -1 +0,0 @@ -../common/060-kube-state-metrics.sh \ No newline at end of file diff --git a/tools/deployment/multinode/070-kube-state-metrics.sh b/tools/deployment/multinode/070-kube-state-metrics.sh new file mode 120000 index 000000000..2a18ebb8b --- /dev/null +++ b/tools/deployment/multinode/070-kube-state-metrics.sh @@ -0,0 +1 @@ +../common/070-kube-state-metrics.sh \ No newline at end of file diff --git a/tools/deployment/multinode/070-node-exporter.sh b/tools/deployment/multinode/070-node-exporter.sh deleted file mode 120000 index 7d1d767f5..000000000 --- a/tools/deployment/multinode/070-node-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../common/070-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/multinode/080-node-exporter.sh b/tools/deployment/multinode/080-node-exporter.sh new file mode 120000 index 000000000..412748a74 --- /dev/null +++ b/tools/deployment/multinode/080-node-exporter.sh @@ -0,0 +1 @@ +../common/080-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/multinode/080-openstack-exporter.sh b/tools/deployment/multinode/080-openstack-exporter.sh deleted file mode 120000 index 52ddfb6eb..000000000 --- a/tools/deployment/multinode/080-openstack-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../common/080-openstack-exporter.sh \ No newline at end of file diff --git a/tools/deployment/multinode/090-openstack-exporter.sh b/tools/deployment/multinode/090-openstack-exporter.sh new file mode 120000 index 000000000..514a6a5c7 --- /dev/null +++ b/tools/deployment/multinode/090-openstack-exporter.sh @@ -0,0 +1 @@ +../common/090-openstack-exporter.sh \ No newline at end of file diff --git a/tools/deployment/multinode/090-grafana.sh b/tools/deployment/multinode/100-grafana.sh similarity index 100% rename from tools/deployment/multinode/090-grafana.sh rename to tools/deployment/multinode/100-grafana.sh diff --git a/tools/deployment/multinode/100-nagios.sh b/tools/deployment/multinode/110-nagios.sh similarity index 95% rename from tools/deployment/multinode/100-nagios.sh rename to tools/deployment/multinode/110-nagios.sh index 75100b966..89193de2f 100755 --- a/tools/deployment/multinode/100-nagios.sh +++ b/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 diff --git a/tools/deployment/multinode/115-elasticsearch-ldap.sh b/tools/deployment/multinode/115-elasticsearch-ldap.sh deleted file mode 120000 index 554cc7f26..000000000 --- a/tools/deployment/multinode/115-elasticsearch-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../common/115-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/multinode/110-elasticsearch.sh b/tools/deployment/multinode/120-elasticsearch.sh similarity index 100% rename from tools/deployment/multinode/110-elasticsearch.sh rename to tools/deployment/multinode/120-elasticsearch.sh diff --git a/tools/deployment/multinode/125-elasticsearch-ldap.sh b/tools/deployment/multinode/125-elasticsearch-ldap.sh new file mode 120000 index 000000000..f49334085 --- /dev/null +++ b/tools/deployment/multinode/125-elasticsearch-ldap.sh @@ -0,0 +1 @@ +../common/125-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/multinode/120-fluent-logging.sh b/tools/deployment/multinode/130-fluent-logging.sh similarity index 100% rename from tools/deployment/multinode/120-fluent-logging.sh rename to tools/deployment/multinode/130-fluent-logging.sh diff --git a/tools/deployment/multinode/130-kibana.sh b/tools/deployment/multinode/130-kibana.sh deleted file mode 120000 index 65eac6c6f..000000000 --- a/tools/deployment/multinode/130-kibana.sh +++ /dev/null @@ -1 +0,0 @@ -../common/130-kibana.sh \ No newline at end of file diff --git a/tools/deployment/multinode/140-kibana.sh b/tools/deployment/multinode/140-kibana.sh new file mode 120000 index 000000000..938b38606 --- /dev/null +++ b/tools/deployment/multinode/140-kibana.sh @@ -0,0 +1 @@ +../common/140-kibana.sh \ No newline at end of file