Merge "Gate: Trim dev-deploy gates"

doc/source/install/developer/deploy-with-ceph.rst

@@ -135,7 +135,7 @@ Alternatively, this step can be performed by running the script directly:
 Deploy Process Exporter
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../../tools/deployment/developer/ceph/085-process-exporter.sh
+.. literalinclude:: ../../../../tools/deployment/developer/ceph/090-process-exporter.sh
     :language: shell
     :lines: 1,17-
 
@@ -143,20 +143,7 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/ceph/085-process-exporter.sh
+  ./tools/deployment/developer/ceph/090-process-exporter.sh
-
-Deploy OpenStack Exporter
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. literalinclude:: ../../../../tools/deployment/developer/ceph/090-openstack-exporter.sh
-    :language: shell
-    :lines: 1,17-
-
-Alternatively, this step can be performed by running the script directly:
-
-.. code-block:: shell
-
-  ./tools/deployment/developer/ceph/090-openstack-exporter.sh
 
 Deploy Grafana
 ^^^^^^^^^^^^^^

doc/source/install/developer/deploy-with-nfs.rst

@@ -122,7 +122,7 @@ Alternatively, this step can be performed by running the script directly:
 Deploy Process Exporter
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: ../../../../tools/deployment/developer/nfs/085-process-exporter.sh
+.. literalinclude:: ../../../../tools/deployment/developer/nfs/090-process-exporter.sh
     :language: shell
     :lines: 1,17-
 
@@ -130,20 +130,7 @@ Alternatively, this step can be performed by running the script directly:
 
 .. code-block:: shell
 
-  ./tools/deployment/developer/nfs/085-process-exporter.sh
+  ./tools/deployment/developer/nfs/090-process-exporter.sh
-
-Deploy OpenStack Exporter
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. literalinclude:: ../../../../tools/deployment/developer/nfs/090-openstack-exporter.sh
-    :language: shell
-    :lines: 1,17-
-
-Alternatively, this step can be performed by running the script directly:
-
-.. code-block:: shell
-
-  ./tools/deployment/developer/nfs/090-openstack-exporter.sh
 
 Deploy Grafana
 ^^^^^^^^^^^^^^

playbooks/osh-infra-dev-deploy-ceph.yaml

@@ -93,13 +93,7 @@
     - name: Deploy Process Exporter
       shell: |
         set -xe;
-        ./tools/deployment/developer/ceph/085-process-exporter.sh
+        ./tools/deployment/developer/ceph/090-process-exporter.sh
-      args:
-        chdir: "{{ zuul.project.src_dir }}"
-    - name: Deploy Prometheus OpenStack Exporter
-      shell: |
-        set -xe;
-        ./tools/deployment/developer/ceph/090-openstack-exporter.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Grafana

playbooks/osh-infra-dev-deploy-nfs.yaml

@@ -87,13 +87,7 @@
     - name: Deploy Process Exporter
       shell: |
         set -xe;
-        ./tools/deployment/developer/nfs/085-process-exporter.sh
+        ./tools/deployment/developer/nfs/090-process-exporter.sh
-      args:
-        chdir: "{{ zuul.project.src_dir }}"
-    - name: Deploy Prometheus OpenStack Exporter
-      shell: |
-        set -xe;
-        ./tools/deployment/developer/nfs/090-openstack-exporter.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
     - name: Deploy Grafana

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

@@ -1,41 +0,0 @@
-#!/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: Lint and package chart
-make prometheus-openstack-exporter
-
-#NOTE: Deploy command
-tee /tmp/prometheus-openstack-exporter.yaml << EOF
-manifests:
-  job_ks_user: false
-dependencies:
-  static:
-    prometheus_openstack_exporter:
-      jobs: null
-      services: null
-EOF
-helm upgrade --install prometheus-openstack-exporter \
-    ./prometheus-openstack-exporter \
-    --namespace=openstack \
-    --values=/tmp/prometheus-openstack-exporter.yaml
-
-#NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status prometheus-openstack-exporter

tools/deployment/developer/ceph/085-process-exporter.sh

@@ -1 +0,0 @@
-../../common/085-process-exporter.sh

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

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

tools/deployment/developer/ceph/090-process-exporter.sh

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

tools/deployment/developer/common/120-elasticsearch.sh

@@ -20,17 +20,9 @@ set -xe
 make elasticsearch
 
 #NOTE: Deploy command
-tee /tmp/elasticsearch.yaml << EOF
-monitoring:
-  prometheus:
-    enabled: true
-pod:
-  replicas:
-    data: 1
-EOF
 helm upgrade --install elasticsearch ./elasticsearch \
     --namespace=osh-infra \
-    --values=/tmp/elasticsearch.yaml
+    --set pod.replicas.data=1
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh osh-infra

tools/deployment/developer/common/130-fluent-logging.sh

@@ -22,7 +22,6 @@ make fluent-logging
 #NOTE: Deploy command
 helm upgrade --install fluent-logging ./fluent-logging \
     --namespace=osh-infra \
-    --set monitoring.prometheus.enabled=true \
     --set pod.replicas.fluentd=1
 
 #NOTE: Wait for deploy

tools/deployment/developer/nfs/085-process-exporter.sh

@@ -1 +0,0 @@
-../../common/085-process-exporter.sh

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

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

tools/deployment/developer/nfs/090-process-exporter.sh

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

tools/deployment/multinode/085-process-exporter.sh

@@ -1 +1 @@
-../common/085-process-exporter.sh
+../common/090-process-exporter.sh

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

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

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

@@ -0,0 +1,41 @@
+#!/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: Lint and package chart
+make prometheus-openstack-exporter
+
+#NOTE: Deploy command
+tee /tmp/prometheus-openstack-exporter.yaml << EOF
+manifests:
+  job_ks_user: false
+dependencies:
+  static:
+    prometheus_openstack_exporter:
+      jobs: null
+      services: null
+EOF
+helm upgrade --install prometheus-openstack-exporter \
+    ./prometheus-openstack-exporter \
+    --namespace=openstack \
+    --values=/tmp/prometheus-openstack-exporter.yaml
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+helm status prometheus-openstack-exporter