diff --git a/doc/source/install/developer/deploy-with-ceph.rst b/doc/source/install/developer/deploy-with-ceph.rst deleted file mode 100644 index 1a5625a44..000000000 --- a/doc/source/install/developer/deploy-with-ceph.rst +++ /dev/null @@ -1,225 +0,0 @@ -====================== -Development Deployment -====================== - -Deploy Local Docker Registry -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/010-deploy-docker-registry.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/010-deploy-docker-registry.sh - -Deploy Cluster and Namespace Ingress Controllers -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/020-ingress.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/020-ingress.sh - - Deploy Ceph - ^^^^^^^^^^^ - - .. literalinclude:: ../../../../tools/deployment/developer/ceph/030-ceph.sh - :language: shell - :lines: 1,17- - - Alternatively, this step can be performed by running the script directly: - - .. code-block:: shell - - ./tools/deployment/developer/ceph/030-ceph.sh - - Activate the OSH-Infra namespace to be able to use Ceph - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - .. literalinclude:: ../../../../tools/deployment/developer/ceph/035-ceph-ns-activate.sh - :language: shell - :lines: 1,17- - - Alternatively, this step can be performed by running the script directly: - - .. code-block:: shell - - ./tools/deployment/developer/ceph/035-ceph-ns-activate.sh - -Deploy LDAP -^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/040-ldap.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/040-ldap.sh - -Deploy MariaDB -^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/045-mariadb.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/045-mariadb.sh - -Deploy Prometheus -^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/050-prometheus.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/050-prometheus.sh - -Deploy Alertmanager -^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/060-alertmanager.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/060-alertmanager.sh - -Deploy Kube-State-Metrics -^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/070-kube-state-metrics.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/070-kube-state-metrics.sh - -Deploy Node Exporter -^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/080-node-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/080-node-exporter.sh - -Deploy Process Exporter -^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/090-process-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-process-exporter.sh - -Deploy Grafana -^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/100-grafana.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/100-grafana.sh - -Deploy Nagios -^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/110-nagios.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/110-nagios.sh - -Deploy Rados Gateway for OSH-Infra -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/115-radosgw-osh-infra.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/115-radosgw-osh-infra.sh - - -Deploy Elasticsearch -^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/120-elasticsearch.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/120-elasticsearch.sh - -Deploy Fluent-Logging -^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/130-fluent-logging.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/130-fluent-logging.sh - -Deploy Kibana -^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/ceph/140-kibana.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/ceph/140-kibana.sh diff --git a/doc/source/install/developer/deploy-with-nfs.rst b/doc/source/install/developer/deploy-with-nfs.rst deleted file mode 100644 index 27dfa0a13..000000000 --- a/doc/source/install/developer/deploy-with-nfs.rst +++ /dev/null @@ -1,198 +0,0 @@ -====================== -Development Deployment -====================== - -Deploy Local Docker Registry -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/010-deploy-docker-registry.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/010-deploy-docker-registry.sh - -Deploy Cluster and Namespace Ingress Controllers -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/020-ingress.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/020-ingress.sh - -Deploy NFS Provisioner -^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/030-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/nfs/030-nfs-provisioner.sh - -Deploy LDAP -^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/040-ldap.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/040-ldap.sh - -Deploy MariaDB -^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/045-mariadb.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/045-mariadb.sh - -Deploy Prometheus -^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/050-prometheus.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/050-prometheus.sh - -Deploy Alertmanager -^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/060-alertmanager.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/060-alertmanager.sh - -Deploy Kube-State-Metrics -^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/070-kube-state-metrics.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/070-kube-state-metrics.sh - -Deploy Node Exporter -^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/080-node-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/080-node-exporter.sh - -Deploy Process Exporter -^^^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/090-process-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-process-exporter.sh - -Deploy Grafana -^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/100-grafana.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/100-grafana.sh - -Deploy Nagios -^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/110-nagios.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/110-nagios.sh - -Deploy Elasticsearch -^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/120-elasticsearch.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/120-elasticsearch.sh - -Deploy Fluent-Logging -^^^^^^^^^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/130-fluent-logging.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/130-fluent-logging.sh - -Deploy Kibana -^^^^^^^^^^^^^ - -.. literalinclude:: ../../../../tools/deployment/developer/nfs/140-kibana.sh - :language: shell - :lines: 1,17- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/developer/nfs/140-kibana.sh diff --git a/doc/source/install/developer/index.rst b/doc/source/install/developer/index.rst deleted file mode 100644 index 033f8c847..000000000 --- a/doc/source/install/developer/index.rst +++ /dev/null @@ -1,10 +0,0 @@ -Development -=========== - -Contents: - -.. toctree:: - :maxdepth: 2 - - deploy-with-nfs - deploy-with-ceph diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index e39206809..7843482d9 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -6,5 +6,4 @@ Contents: .. toctree:: :maxdepth: 2 - developer/index multinode diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index eb2f5db92..dfeff78b6 100644 --- a/doc/source/install/multinode.rst +++ b/doc/source/install/multinode.rst @@ -222,16 +222,3 @@ Alternatively, this step can be performed by running the script directly: .. code-block:: shell ./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/tools/deployment/developer/nfs/020-ingress.sh b/tools/deployment/common/020-ingress.sh similarity index 100% rename from tools/deployment/developer/nfs/020-ingress.sh rename to tools/deployment/common/020-ingress.sh diff --git a/tools/deployment/developer/nfs/030-nfs-provisioner.sh b/tools/deployment/common/030-nfs-provisioner.sh similarity index 100% rename from tools/deployment/developer/nfs/030-nfs-provisioner.sh rename to tools/deployment/common/030-nfs-provisioner.sh diff --git a/tools/deployment/developer/ceph/010-deploy-docker-registry.sh b/tools/deployment/developer/ceph/010-deploy-docker-registry.sh deleted file mode 120000 index b5d3fc3c5..000000000 --- a/tools/deployment/developer/ceph/010-deploy-docker-registry.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/010-deploy-docker-registry.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/040-ldap.sh b/tools/deployment/developer/ceph/040-ldap.sh deleted file mode 120000 index 720ccc94e..000000000 --- a/tools/deployment/developer/ceph/040-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/040-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/045-mariadb.sh b/tools/deployment/developer/ceph/045-mariadb.sh deleted file mode 120000 index 80f213b41..000000000 --- a/tools/deployment/developer/ceph/045-mariadb.sh +++ /dev/null @@ -1 +0,0 @@ -../common/045-mariadb.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/050-prometheus.sh b/tools/deployment/developer/ceph/050-prometheus.sh deleted file mode 120000 index b9d0ac26e..000000000 --- a/tools/deployment/developer/ceph/050-prometheus.sh +++ /dev/null @@ -1 +0,0 @@ -../common/050-prometheus.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/060-alertmanager.sh b/tools/deployment/developer/ceph/060-alertmanager.sh deleted file mode 120000 index 6eea542ae..000000000 --- a/tools/deployment/developer/ceph/060-alertmanager.sh +++ /dev/null @@ -1 +0,0 @@ -../common/060-alertmanager.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/070-kube-state-metrics.sh b/tools/deployment/developer/ceph/070-kube-state-metrics.sh deleted file mode 120000 index 1d4481b30..000000000 --- a/tools/deployment/developer/ceph/070-kube-state-metrics.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/070-kube-state-metrics.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/080-node-exporter.sh b/tools/deployment/developer/ceph/080-node-exporter.sh deleted file mode 120000 index 6933b88b5..000000000 --- a/tools/deployment/developer/ceph/080-node-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/080-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/090-process-exporter.sh b/tools/deployment/developer/ceph/090-process-exporter.sh deleted file mode 120000 index 86718d5f8..000000000 --- a/tools/deployment/developer/ceph/090-process-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/090-process-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/100-grafana.sh b/tools/deployment/developer/ceph/100-grafana.sh deleted file mode 120000 index 6729a26c5..000000000 --- a/tools/deployment/developer/ceph/100-grafana.sh +++ /dev/null @@ -1 +0,0 @@ -../common/100-grafana.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/110-nagios.sh b/tools/deployment/developer/ceph/110-nagios.sh deleted file mode 120000 index 625e78001..000000000 --- a/tools/deployment/developer/ceph/110-nagios.sh +++ /dev/null @@ -1 +0,0 @@ -../common/110-nagios.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/125-elasticsearch-ldap.sh b/tools/deployment/developer/ceph/125-elasticsearch-ldap.sh deleted file mode 120000 index 71c4d114b..000000000 --- a/tools/deployment/developer/ceph/125-elasticsearch-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/125-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/130-fluent-logging.sh b/tools/deployment/developer/ceph/130-fluent-logging.sh deleted file mode 120000 index bc0c316b0..000000000 --- a/tools/deployment/developer/ceph/130-fluent-logging.sh +++ /dev/null @@ -1 +0,0 @@ -../common/130-fluent-logging.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/140-kibana.sh b/tools/deployment/developer/ceph/140-kibana.sh deleted file mode 120000 index dd01b65d0..000000000 --- a/tools/deployment/developer/ceph/140-kibana.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/140-kibana.sh \ No newline at end of file diff --git a/tools/deployment/developer/common/000-install-packages.sh b/tools/deployment/developer/common/000-install-packages.sh deleted file mode 100755 index 4b3129b07..000000000 --- a/tools/deployment/developer/common/000-install-packages.sh +++ /dev/null @@ -1,25 +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 - -sudo apt-get update -sudo apt-get install --no-install-recommends -y \ - ca-certificates \ - git \ - make \ - nmap \ - curl diff --git a/tools/deployment/developer/common/005-deploy-k8s.sh b/tools/deployment/developer/common/005-deploy-k8s.sh deleted file mode 100755 index b0a3e8cc8..000000000 --- a/tools/deployment/developer/common/005-deploy-k8s.sh +++ /dev/null @@ -1,20 +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 - -make dev-deploy setup-host -make dev-deploy k8s diff --git a/tools/deployment/developer/netpol/070-kube-state-metrics.sh b/tools/deployment/developer/netpol/070-kube-state-metrics.sh deleted file mode 100755 index 21acee4e2..000000000 --- a/tools/deployment/developer/netpol/070-kube-state-metrics.sh +++ /dev/null @@ -1,30 +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-kube-state-metrics - -#NOTE: Deploy command -helm upgrade --install prometheus-kube-state-metrics \ - ./prometheus-kube-state-metrics --namespace=kube-system - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status prometheus-kube-state-metrics diff --git a/tools/deployment/developer/netpol/080-node-exporter.sh b/tools/deployment/developer/netpol/080-node-exporter.sh deleted file mode 100755 index 070472b26..000000000 --- a/tools/deployment/developer/netpol/080-node-exporter.sh +++ /dev/null @@ -1,30 +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-node-exporter - -#NOTE: Deploy command -helm upgrade --install prometheus-node-exporter \ - ./prometheus-node-exporter --namespace=kube-system - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status prometheus-node-exporter diff --git a/tools/deployment/developer/netpol/090-process-exporter.sh b/tools/deployment/developer/netpol/090-process-exporter.sh deleted file mode 100755 index fa2bf674c..000000000 --- a/tools/deployment/developer/netpol/090-process-exporter.sh +++ /dev/null @@ -1,30 +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-process-exporter - -#NOTE: Deploy command -helm upgrade --install prometheus-process-exporter \ - ./prometheus-process-exporter --namespace=kube-system - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status prometheus-process-exporter diff --git a/tools/deployment/developer/netpol/125-elasticsearch-ldap.sh b/tools/deployment/developer/netpol/125-elasticsearch-ldap.sh deleted file mode 100755 index c7166a9c1..000000000 --- a/tools/deployment/developer/netpol/125-elasticsearch-ldap.sh +++ /dev/null @@ -1,91 +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 - -ELASTICSEARCH_ENDPOINT="elasticsearch-logging.osh-infra" - -#NOTE: Create index with specified LDAP user -function create_index () { - index_result=$(curl -K- <<< "--user $1:$2" \ - -XPUT "${ELASTICSEARCH_ENDPOINT}/$1_index?pretty" -H 'Content-Type: application/json' -d' - { - "settings" : { - "index" : { - "number_of_shards" : 3, - "number_of_replicas" : 2 - } - } - } - ' | python -c "import sys, json; print json.load(sys.stdin)['acknowledged']") - if [ "$index_result" == "True" ]; - then - echo "$1's index successfully created!"; - else - echo "$1's index not created!"; - exit 1; - fi -} - -#NOTE: Insert test data with specified LDAP user -function insert_test_data () { - insert_result=$(curl -K- <<< "--user $1:$2" \ - -XPUT "${ELASTICSEARCH_ENDPOINT}/$1_index/sample_type/123/_create?pretty" -H 'Content-Type: application/json' -d' - { - "name" : "Elasticsearch", - "message" : "Test data text entry" - } - ' | python -c "import sys, json; print json.load(sys.stdin)['result']") - if [ "$insert_result" == "created" ]; then - sleep 20 - echo "Test data inserted into $1's index!"; - else - echo "Test data not inserted into $1's index!"; - exit 1; - fi -} - -#NOTE: Check hits on test data in specified LDAP user's index -function check_hits () { - total_hits=$(curl -K- <<< "--user $1:$2" \ - "${ELASTICSEARCH_ENDPOINT}/_search?pretty" -H 'Content-Type: application/json' -d' - { - "query" : { - "bool": { - "must": [ - { "match": { "name": "Elasticsearch" }}, - { "match": { "message": "Test data text entry" }} - ] - } - } - } - ' | python -c "import sys, json; print json.load(sys.stdin)['hits']['total']") - if [ "$total_hits" -gt 0 ]; then - echo "Successful hits on test data query on $1's index!" - else - echo "No hits on query for test data on $1's index!"; - exit 1; - fi -} - -create_index bob password -create_index alice password - -insert_test_data bob password -insert_test_data alice password - -check_hits bob password -check_hits alice password diff --git a/tools/deployment/developer/nfs/010-deploy-docker-registry.sh b/tools/deployment/developer/nfs/010-deploy-docker-registry.sh deleted file mode 120000 index b5d3fc3c5..000000000 --- a/tools/deployment/developer/nfs/010-deploy-docker-registry.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/010-deploy-docker-registry.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/040-ldap.sh b/tools/deployment/developer/nfs/040-ldap.sh deleted file mode 120000 index 720ccc94e..000000000 --- a/tools/deployment/developer/nfs/040-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/040-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/045-mariadb.sh b/tools/deployment/developer/nfs/045-mariadb.sh deleted file mode 120000 index 80f213b41..000000000 --- a/tools/deployment/developer/nfs/045-mariadb.sh +++ /dev/null @@ -1 +0,0 @@ -../common/045-mariadb.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/050-prometheus.sh b/tools/deployment/developer/nfs/050-prometheus.sh deleted file mode 120000 index b9d0ac26e..000000000 --- a/tools/deployment/developer/nfs/050-prometheus.sh +++ /dev/null @@ -1 +0,0 @@ -../common/050-prometheus.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/060-alertmanager.sh b/tools/deployment/developer/nfs/060-alertmanager.sh deleted file mode 120000 index 6eea542ae..000000000 --- a/tools/deployment/developer/nfs/060-alertmanager.sh +++ /dev/null @@ -1 +0,0 @@ -../common/060-alertmanager.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/070-kube-state-metrics.sh b/tools/deployment/developer/nfs/070-kube-state-metrics.sh deleted file mode 120000 index 1d4481b30..000000000 --- a/tools/deployment/developer/nfs/070-kube-state-metrics.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/070-kube-state-metrics.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/080-node-exporter.sh b/tools/deployment/developer/nfs/080-node-exporter.sh deleted file mode 120000 index 6933b88b5..000000000 --- a/tools/deployment/developer/nfs/080-node-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/080-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/090-process-exporter.sh b/tools/deployment/developer/nfs/090-process-exporter.sh deleted file mode 120000 index 86718d5f8..000000000 --- a/tools/deployment/developer/nfs/090-process-exporter.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/090-process-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/100-grafana.sh b/tools/deployment/developer/nfs/100-grafana.sh deleted file mode 120000 index 6729a26c5..000000000 --- a/tools/deployment/developer/nfs/100-grafana.sh +++ /dev/null @@ -1 +0,0 @@ -../common/100-grafana.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/110-nagios.sh b/tools/deployment/developer/nfs/110-nagios.sh deleted file mode 120000 index 625e78001..000000000 --- a/tools/deployment/developer/nfs/110-nagios.sh +++ /dev/null @@ -1 +0,0 @@ -../common/110-nagios.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/125-elasticsearch-ldap.sh b/tools/deployment/developer/nfs/125-elasticsearch-ldap.sh deleted file mode 120000 index 71c4d114b..000000000 --- a/tools/deployment/developer/nfs/125-elasticsearch-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/125-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/130-fluent-logging.sh b/tools/deployment/developer/nfs/130-fluent-logging.sh deleted file mode 120000 index bc0c316b0..000000000 --- a/tools/deployment/developer/nfs/130-fluent-logging.sh +++ /dev/null @@ -1 +0,0 @@ -../common/130-fluent-logging.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/140-kibana.sh b/tools/deployment/developer/nfs/140-kibana.sh deleted file mode 120000 index dd01b65d0..000000000 --- a/tools/deployment/developer/nfs/140-kibana.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/140-kibana.sh \ No newline at end of file diff --git a/tools/deployment/keystone-auth/030-nfs-provisioner.sh b/tools/deployment/keystone-auth/030-nfs-provisioner.sh index 0137fe739..2d0231b7f 120000 --- a/tools/deployment/keystone-auth/030-nfs-provisioner.sh +++ b/tools/deployment/keystone-auth/030-nfs-provisioner.sh @@ -1 +1 @@ -../developer/nfs/030-nfs-provisioner.sh \ No newline at end of file +../osh-infra-monitoring/030-nfs-provisioner.sh \ No newline at end of file diff --git a/tools/deployment/keystone-auth/040-rabbitmq.sh b/tools/deployment/keystone-auth/040-rabbitmq.sh index 0e062a4bc..497e38873 120000 --- a/tools/deployment/keystone-auth/040-rabbitmq.sh +++ b/tools/deployment/keystone-auth/040-rabbitmq.sh @@ -1 +1 @@ -../openstack-support/025-rabbitmq.sh \ No newline at end of file +../openstack-support/030-rabbitmq.sh \ No newline at end of file diff --git a/tools/deployment/keystone-auth/050-memcached.sh b/tools/deployment/keystone-auth/050-memcached.sh index 3148eeb82..706eb90b3 120000 --- a/tools/deployment/keystone-auth/050-memcached.sh +++ b/tools/deployment/keystone-auth/050-memcached.sh @@ -1 +1 @@ -../openstack-support/030-memcached.sh \ No newline at end of file +../openstack-support/040-memcached.sh \ No newline at end of file diff --git a/tools/deployment/keystone-auth/060-mariadb.sh b/tools/deployment/keystone-auth/060-mariadb.sh deleted file mode 120000 index 33378c5d7..000000000 --- a/tools/deployment/keystone-auth/060-mariadb.sh +++ /dev/null @@ -1 +0,0 @@ -../openstack-support/035-mariadb.sh \ No newline at end of file diff --git a/tools/deployment/keystone-auth/060-mariadb.sh b/tools/deployment/keystone-auth/060-mariadb.sh new file mode 100755 index 000000000..6213fe72c --- /dev/null +++ b/tools/deployment/keystone-auth/060-mariadb.sh @@ -0,0 +1,34 @@ +#!/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 mariadb + +#NOTE: Deploy command +: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} +helm upgrade --install mariadb ./mariadb \ + --namespace=openstack \ + --set pod.replicas.server=1 \ + ${OSH_INFRA_EXTRA_HELM_ARGS} \ + ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB} + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh openstack + +#NOTE: Validate Deployment info +helm status mariadb diff --git a/tools/deployment/multinode/125-elasticsearch-ldap.sh b/tools/deployment/multinode/125-elasticsearch-ldap.sh deleted file mode 120000 index f49334085..000000000 --- a/tools/deployment/multinode/125-elasticsearch-ldap.sh +++ /dev/null @@ -1 +0,0 @@ -../common/125-elasticsearch-ldap.sh \ No newline at end of file diff --git a/tools/deployment/multinode/140-kibana.sh b/tools/deployment/multinode/140-kibana.sh deleted file mode 120000 index 938b38606..000000000 --- a/tools/deployment/multinode/140-kibana.sh +++ /dev/null @@ -1 +0,0 @@ -../common/140-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 100755 index 000000000..5c9829355 --- /dev/null +++ b/tools/deployment/multinode/140-kibana.sh @@ -0,0 +1,31 @@ +#!/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 kibana + +#NOTE: Deploy command +helm upgrade --install kibana ./kibana \ + --namespace=osh-infra \ + --set pod.replicas.kibana=2 + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh osh-infra + +#NOTE: Validate Deployment info +helm status kibana diff --git a/tools/deployment/developer/ceph/000-install-packages.sh b/tools/deployment/network-policy/000-install-packages.sh similarity index 100% rename from tools/deployment/developer/ceph/000-install-packages.sh rename to tools/deployment/network-policy/000-install-packages.sh diff --git a/tools/deployment/developer/ceph/005-deploy-k8s.sh b/tools/deployment/network-policy/005-deploy-k8s.sh similarity index 100% rename from tools/deployment/developer/ceph/005-deploy-k8s.sh rename to tools/deployment/network-policy/005-deploy-k8s.sh diff --git a/tools/deployment/network-policy/010-ingress.sh b/tools/deployment/network-policy/010-ingress.sh new file mode 120000 index 000000000..94b1e92f9 --- /dev/null +++ b/tools/deployment/network-policy/010-ingress.sh @@ -0,0 +1 @@ +../common/020-ingress.sh \ No newline at end of file diff --git a/tools/deployment/network-policy/020-nfs-provisioner.sh b/tools/deployment/network-policy/020-nfs-provisioner.sh new file mode 120000 index 000000000..f7ec8c7ca --- /dev/null +++ b/tools/deployment/network-policy/020-nfs-provisioner.sh @@ -0,0 +1 @@ +../common/030-nfs-provisioner.sh \ No newline at end of file diff --git a/tools/deployment/developer/netpol/039-lockdown.sh b/tools/deployment/network-policy/039-lockdown.sh similarity index 100% rename from tools/deployment/developer/netpol/039-lockdown.sh rename to tools/deployment/network-policy/039-lockdown.sh diff --git a/tools/deployment/developer/netpol/040-ldap.sh b/tools/deployment/network-policy/040-ldap.sh similarity index 100% rename from tools/deployment/developer/netpol/040-ldap.sh rename to tools/deployment/network-policy/040-ldap.sh diff --git a/tools/deployment/developer/netpol/045-mariadb.sh b/tools/deployment/network-policy/045-mariadb.sh similarity index 100% rename from tools/deployment/developer/netpol/045-mariadb.sh rename to tools/deployment/network-policy/045-mariadb.sh diff --git a/tools/deployment/developer/netpol/050-prometheus.sh b/tools/deployment/network-policy/050-prometheus.sh similarity index 100% rename from tools/deployment/developer/netpol/050-prometheus.sh rename to tools/deployment/network-policy/050-prometheus.sh diff --git a/tools/deployment/developer/netpol/060-alertmanager.sh b/tools/deployment/network-policy/060-alertmanager.sh similarity index 100% rename from tools/deployment/developer/netpol/060-alertmanager.sh rename to tools/deployment/network-policy/060-alertmanager.sh diff --git a/tools/deployment/network-policy/070-kube-state-metrics.sh b/tools/deployment/network-policy/070-kube-state-metrics.sh new file mode 120000 index 000000000..2a18ebb8b --- /dev/null +++ b/tools/deployment/network-policy/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/network-policy/080-node-exporter.sh b/tools/deployment/network-policy/080-node-exporter.sh new file mode 120000 index 000000000..412748a74 --- /dev/null +++ b/tools/deployment/network-policy/080-node-exporter.sh @@ -0,0 +1 @@ +../common/080-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/network-policy/090-process-exporter.sh b/tools/deployment/network-policy/090-process-exporter.sh new file mode 120000 index 000000000..fe8036bc0 --- /dev/null +++ b/tools/deployment/network-policy/090-process-exporter.sh @@ -0,0 +1 @@ +../common/090-process-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/netpol/100-grafana.sh b/tools/deployment/network-policy/100-grafana.sh similarity index 100% rename from tools/deployment/developer/netpol/100-grafana.sh rename to tools/deployment/network-policy/100-grafana.sh diff --git a/tools/deployment/developer/netpol/110-nagios.sh b/tools/deployment/network-policy/110-nagios.sh similarity index 100% rename from tools/deployment/developer/netpol/110-nagios.sh rename to tools/deployment/network-policy/110-nagios.sh diff --git a/tools/deployment/developer/netpol/120-elasticsearch.sh b/tools/deployment/network-policy/120-elasticsearch.sh similarity index 100% rename from tools/deployment/developer/netpol/120-elasticsearch.sh rename to tools/deployment/network-policy/120-elasticsearch.sh diff --git a/tools/deployment/developer/netpol/130-fluent-logging.sh b/tools/deployment/network-policy/130-fluent-logging.sh similarity index 100% rename from tools/deployment/developer/netpol/130-fluent-logging.sh rename to tools/deployment/network-policy/130-fluent-logging.sh diff --git a/tools/deployment/developer/netpol/140-kibana.sh b/tools/deployment/network-policy/140-kibana.sh similarity index 100% rename from tools/deployment/developer/netpol/140-kibana.sh rename to tools/deployment/network-policy/140-kibana.sh diff --git a/tools/deployment/developer/netpol/901-test-networkpolicy.sh b/tools/deployment/network-policy/901-test-networkpolicy.sh similarity index 100% rename from tools/deployment/developer/netpol/901-test-networkpolicy.sh rename to tools/deployment/network-policy/901-test-networkpolicy.sh diff --git a/tools/deployment/openstack-support/010-ingress.sh b/tools/deployment/openstack-support/010-ingress.sh index 0b84db1f1..bf5f1e9fb 100755 --- a/tools/deployment/openstack-support/010-ingress.sh +++ b/tools/deployment/openstack-support/010-ingress.sh @@ -38,7 +38,7 @@ helm upgrade --install ingress-kube-system ./ingress \ helm status ingress-kube-system #NOTE: Deploy namespace ingress -for NAMESPACE in openstack ceph; do +for NAMESPACE in ceph openstack; do helm upgrade --install ingress-${NAMESPACE} ./ingress \ --namespace=${NAMESPACE} \ ${OSH_EXTRA_HELM_ARGS} \ diff --git a/tools/deployment/openstack-support/015-ceph.sh b/tools/deployment/openstack-support/015-ceph.sh deleted file mode 120000 index b4fd85f82..000000000 --- a/tools/deployment/openstack-support/015-ceph.sh +++ /dev/null @@ -1 +0,0 @@ -../developer/ceph/030-ceph.sh \ No newline at end of file diff --git a/tools/deployment/openstack-support/020-ceph.sh b/tools/deployment/openstack-support/020-ceph.sh new file mode 120000 index 000000000..1ab828eed --- /dev/null +++ b/tools/deployment/openstack-support/020-ceph.sh @@ -0,0 +1 @@ +../osh-infra-logging/020-ceph.sh \ No newline at end of file diff --git a/tools/deployment/openstack-support/020-ceph-ns-activate.sh b/tools/deployment/openstack-support/025-ceph-ns-activate.sh similarity index 100% rename from tools/deployment/openstack-support/020-ceph-ns-activate.sh rename to tools/deployment/openstack-support/025-ceph-ns-activate.sh diff --git a/tools/deployment/openstack-support/025-rabbitmq.sh b/tools/deployment/openstack-support/030-rabbitmq.sh similarity index 100% rename from tools/deployment/openstack-support/025-rabbitmq.sh rename to tools/deployment/openstack-support/030-rabbitmq.sh diff --git a/tools/deployment/openstack-support/035-mariadb.sh b/tools/deployment/openstack-support/035-mariadb.sh deleted file mode 100755 index 6213fe72c..000000000 --- a/tools/deployment/openstack-support/035-mariadb.sh +++ /dev/null @@ -1,34 +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 mariadb - -#NOTE: Deploy command -: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} -helm upgrade --install mariadb ./mariadb \ - --namespace=openstack \ - --set pod.replicas.server=1 \ - ${OSH_INFRA_EXTRA_HELM_ARGS} \ - ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status mariadb diff --git a/tools/deployment/openstack-support/030-memcached.sh b/tools/deployment/openstack-support/040-memcached.sh similarity index 100% rename from tools/deployment/openstack-support/030-memcached.sh rename to tools/deployment/openstack-support/040-memcached.sh diff --git a/tools/deployment/openstack-support/040-libvirt.sh b/tools/deployment/openstack-support/050-libvirt.sh similarity index 96% rename from tools/deployment/openstack-support/040-libvirt.sh rename to tools/deployment/openstack-support/050-libvirt.sh index a214a4fb0..bac1ce16c 100755 --- a/tools/deployment/openstack-support/040-libvirt.sh +++ b/tools/deployment/openstack-support/050-libvirt.sh @@ -21,7 +21,6 @@ make libvirt #NOTE: Deploy command helm upgrade --install libvirt ./libvirt \ --namespace=openstack \ - --set conf.ceph.enabled=false \ --set network.backend="null" #NOTE: Validate Deployment info diff --git a/tools/deployment/openstack-support/045-openvswitch.sh b/tools/deployment/openstack-support/060-openvswitch.sh similarity index 94% rename from tools/deployment/openstack-support/045-openvswitch.sh rename to tools/deployment/openstack-support/060-openvswitch.sh index b903afede..4809db93f 100755 --- a/tools/deployment/openstack-support/045-openvswitch.sh +++ b/tools/deployment/openstack-support/060-openvswitch.sh @@ -22,7 +22,7 @@ helm upgrade --install openvswitch ./openvswitch \ ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH} #NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack +./tools/deployment/common/wait-for-pods.sh osh-infra #NOTE: Validate Deployment info helm status openvswitch diff --git a/tools/deployment/developer/nfs/000-install-packages.sh b/tools/deployment/osh-infra-logging/000-install-packages.sh similarity index 100% rename from tools/deployment/developer/nfs/000-install-packages.sh rename to tools/deployment/osh-infra-logging/000-install-packages.sh diff --git a/tools/deployment/developer/nfs/005-deploy-k8s.sh b/tools/deployment/osh-infra-logging/005-deploy-k8s.sh similarity index 100% rename from tools/deployment/developer/nfs/005-deploy-k8s.sh rename to tools/deployment/osh-infra-logging/005-deploy-k8s.sh diff --git a/tools/deployment/developer/ceph/020-ingress.sh b/tools/deployment/osh-infra-logging/010-ingress.sh similarity index 100% rename from tools/deployment/developer/ceph/020-ingress.sh rename to tools/deployment/osh-infra-logging/010-ingress.sh diff --git a/tools/deployment/developer/ceph/030-ceph.sh b/tools/deployment/osh-infra-logging/020-ceph.sh similarity index 100% rename from tools/deployment/developer/ceph/030-ceph.sh rename to tools/deployment/osh-infra-logging/020-ceph.sh diff --git a/tools/deployment/developer/ceph/035-ceph-ns-activate.sh b/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh similarity index 100% rename from tools/deployment/developer/ceph/035-ceph-ns-activate.sh rename to tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh diff --git a/tools/deployment/developer/ceph/115-radosgw-osh-infra.sh b/tools/deployment/osh-infra-logging/030-radosgw-osh-infra.sh similarity index 100% rename from tools/deployment/developer/ceph/115-radosgw-osh-infra.sh rename to tools/deployment/osh-infra-logging/030-radosgw-osh-infra.sh diff --git a/tools/deployment/osh-infra-logging/040-ldap.sh b/tools/deployment/osh-infra-logging/040-ldap.sh new file mode 120000 index 000000000..4ed4b9d4b --- /dev/null +++ b/tools/deployment/osh-infra-logging/040-ldap.sh @@ -0,0 +1 @@ +../common/040-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/120-elasticsearch.sh b/tools/deployment/osh-infra-logging/050-elasticsearch.sh similarity index 100% rename from tools/deployment/developer/ceph/120-elasticsearch.sh rename to tools/deployment/osh-infra-logging/050-elasticsearch.sh diff --git a/tools/deployment/common/125-elasticsearch-ldap.sh b/tools/deployment/osh-infra-logging/055-elasticsearch-ldap.sh similarity index 100% rename from tools/deployment/common/125-elasticsearch-ldap.sh rename to tools/deployment/osh-infra-logging/055-elasticsearch-ldap.sh diff --git a/tools/deployment/developer/common/130-fluent-logging.sh b/tools/deployment/osh-infra-logging/060-fluent-logging.sh similarity index 100% rename from tools/deployment/developer/common/130-fluent-logging.sh rename to tools/deployment/osh-infra-logging/060-fluent-logging.sh diff --git a/tools/deployment/common/140-kibana.sh b/tools/deployment/osh-infra-logging/070-kibana.sh similarity index 100% rename from tools/deployment/common/140-kibana.sh rename to tools/deployment/osh-infra-logging/070-kibana.sh diff --git a/tools/deployment/osh-infra-monitoring/000-install-packages.sh b/tools/deployment/osh-infra-monitoring/000-install-packages.sh new file mode 120000 index 000000000..d702c4899 --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/000-install-packages.sh @@ -0,0 +1 @@ +../common/000-install-packages.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-monitoring/005-deploy-k8s.sh b/tools/deployment/osh-infra-monitoring/005-deploy-k8s.sh new file mode 120000 index 000000000..257a39f7a --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/005-deploy-k8s.sh @@ -0,0 +1 @@ +../common/005-deploy-k8s.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-monitoring/010-deploy-docker-registry.sh b/tools/deployment/osh-infra-monitoring/010-deploy-docker-registry.sh new file mode 120000 index 000000000..7360ae428 --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/010-deploy-docker-registry.sh @@ -0,0 +1 @@ +../common/010-deploy-docker-registry.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-monitoring/020-ingress.sh b/tools/deployment/osh-infra-monitoring/020-ingress.sh new file mode 120000 index 000000000..94b1e92f9 --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/020-ingress.sh @@ -0,0 +1 @@ +../common/020-ingress.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/120-elasticsearch.sh b/tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh similarity index 63% rename from tools/deployment/developer/nfs/120-elasticsearch.sh rename to tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh index e4ff2ce85..0017786b7 100755 --- a/tools/deployment/developer/nfs/120-elasticsearch.sh +++ b/tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh @@ -16,24 +16,22 @@ set -xe -#NOTE: Lint and package chart -make elasticsearch +make nfs-provisioner -#NOTE: Deploy command -tee /tmp/elasticsearch.yaml << EOF -monitoring: - prometheus: - enabled: true -pod: - replicas: - data: 1 +#NOTE: Deploy nfs instance for logging, monitoring and alerting components +tee /tmp/nfs-provisioner.yaml << EOF +labels: + node_selector_key: openstack-control-plane + node_selector_value: enabled +storageclass: + name: general EOF -helm upgrade --install elasticsearch ./elasticsearch \ - --namespace=osh-infra \ - --values=/tmp/elasticsearch.yaml +helm upgrade --install nfs-provisioner \ + ./nfs-provisioner --namespace=osh-infra \ + --values=/tmp/nfs-provisioner.yaml -#NOTE: Wait for deploy +#NOTE: Wait for deployment ./tools/deployment/common/wait-for-pods.sh osh-infra #NOTE: Validate Deployment info -helm status elasticsearch +helm status nfs-provisioner diff --git a/tools/deployment/osh-infra-monitoring/040-ldap.sh b/tools/deployment/osh-infra-monitoring/040-ldap.sh new file mode 120000 index 000000000..4ed4b9d4b --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/040-ldap.sh @@ -0,0 +1 @@ +../common/040-ldap.sh \ No newline at end of file diff --git a/tools/deployment/developer/common/045-mariadb.sh b/tools/deployment/osh-infra-monitoring/045-mariadb.sh similarity index 100% rename from tools/deployment/developer/common/045-mariadb.sh rename to tools/deployment/osh-infra-monitoring/045-mariadb.sh diff --git a/tools/deployment/developer/common/050-prometheus.sh b/tools/deployment/osh-infra-monitoring/050-prometheus.sh similarity index 100% rename from tools/deployment/developer/common/050-prometheus.sh rename to tools/deployment/osh-infra-monitoring/050-prometheus.sh diff --git a/tools/deployment/developer/common/060-alertmanager.sh b/tools/deployment/osh-infra-monitoring/060-alertmanager.sh similarity index 100% rename from tools/deployment/developer/common/060-alertmanager.sh rename to tools/deployment/osh-infra-monitoring/060-alertmanager.sh diff --git a/tools/deployment/osh-infra-monitoring/070-kube-state-metrics.sh b/tools/deployment/osh-infra-monitoring/070-kube-state-metrics.sh new file mode 120000 index 000000000..2a18ebb8b --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/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/osh-infra-monitoring/080-node-exporter.sh b/tools/deployment/osh-infra-monitoring/080-node-exporter.sh new file mode 120000 index 000000000..412748a74 --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/080-node-exporter.sh @@ -0,0 +1 @@ +../common/080-node-exporter.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-monitoring/090-process-exporter.sh b/tools/deployment/osh-infra-monitoring/090-process-exporter.sh new file mode 120000 index 000000000..fe8036bc0 --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/090-process-exporter.sh @@ -0,0 +1 @@ +../common/090-process-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/common/100-grafana.sh b/tools/deployment/osh-infra-monitoring/100-grafana.sh similarity index 100% rename from tools/deployment/developer/common/100-grafana.sh rename to tools/deployment/osh-infra-monitoring/100-grafana.sh diff --git a/tools/deployment/developer/common/110-nagios.sh b/tools/deployment/osh-infra-monitoring/110-nagios.sh similarity index 100% rename from tools/deployment/developer/common/110-nagios.sh rename to tools/deployment/osh-infra-monitoring/110-nagios.sh diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index ab3265fdf..3080c1608 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -59,7 +59,6 @@ - ./tools/deployment/multinode/110-nagios.sh - ./tools/deployment/multinode/115-radosgw-osh-infra.sh - ./tools/deployment/multinode/120-elasticsearch.sh - - ./tools/deployment/multinode/125-elasticsearch-ldap.sh - ./tools/deployment/multinode/130-fluent-logging.sh - ./tools/deployment/multinode/140-kibana.sh @@ -80,7 +79,7 @@ nodeset: openstack-helm-fedora - job: - name: openstack-helm-infra-dev-deploy-ceph + name: openstack-helm-infra-aio-logging parent: openstack-helm-infra-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml @@ -89,29 +88,20 @@ nodeset: openstack-helm-single-node vars: gate_scripts: - - ./tools/deployment/developer/ceph/000-install-packages.sh - - ./tools/deployment/developer/ceph/005-deploy-k8s.sh - - ./tools/deployment/developer/ceph/010-deploy-docker-registry.sh - - ./tools/deployment/developer/ceph/020-ingress.sh - - ./tools/deployment/developer/ceph/030-ceph.sh - - ./tools/deployment/developer/ceph/035-ceph-ns-activate.sh - - ./tools/deployment/developer/ceph/040-ldap.sh - - ./tools/deployment/developer/ceph/045-mariadb.sh - - ./tools/deployment/developer/ceph/050-prometheus.sh - - ./tools/deployment/developer/ceph/060-alertmanager.sh - - ./tools/deployment/developer/ceph/070-kube-state-metrics.sh - - ./tools/deployment/developer/ceph/080-node-exporter.sh - - ./tools/deployment/developer/ceph/090-process-exporter.sh - - ./tools/deployment/developer/ceph/100-grafana.sh - - ./tools/deployment/developer/ceph/110-nagios.sh - - ./tools/deployment/developer/ceph/115-radosgw-osh-infra.sh - - ./tools/deployment/developer/ceph/120-elasticsearch.sh - - ./tools/deployment/developer/ceph/125-elasticsearch-ldap.sh - - ./tools/deployment/developer/ceph/130-fluent-logging.sh - - ./tools/deployment/developer/ceph/140-kibana.sh + - ./tools/deployment/osh-infra-logging/000-install-packages.sh + - ./tools/deployment/osh-infra-logging/005-deploy-k8s.sh + - ./tools/deployment/osh-infra-logging/010-ingress.sh + - ./tools/deployment/osh-infra-logging/020-ceph.sh + - ./tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh + - ./tools/deployment/osh-infra-logging/030-radosgw-osh-infra.sh + - ./tools/deployment/osh-infra-logging/040-ldap.sh + - ./tools/deployment/osh-infra-logging/050-elasticsearch.sh + - ./tools/deployment/osh-infra-logging/055-elasticsearch-ldap.sh + - ./tools/deployment/osh-infra-logging/060-fluent-logging.sh + - ./tools/deployment/osh-infra-logging/070-kibana.sh - job: - name: openstack-helm-infra-dev-deploy-nfs + name: openstack-helm-infra-aio-monitoring parent: openstack-helm-infra-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml @@ -120,28 +110,24 @@ nodeset: openstack-helm-single-node vars: gate_scripts: - - ./tools/deployment/developer/nfs/000-install-packages.sh - - ./tools/deployment/developer/nfs/005-deploy-k8s.sh - - ./tools/deployment/developer/nfs/010-deploy-docker-registry.sh - - ./tools/deployment/developer/nfs/020-ingress.sh - - ./tools/deployment/developer/nfs/030-nfs-provisioner.sh - - ./tools/deployment/developer/nfs/040-ldap.sh - - ./tools/deployment/developer/nfs/045-mariadb.sh - - ./tools/deployment/developer/nfs/050-prometheus.sh - - ./tools/deployment/developer/nfs/060-alertmanager.sh - - ./tools/deployment/developer/nfs/070-kube-state-metrics.sh - - ./tools/deployment/developer/nfs/080-node-exporter.sh - - ./tools/deployment/developer/nfs/090-process-exporter.sh - - ./tools/deployment/developer/nfs/100-grafana.sh - - ./tools/deployment/developer/nfs/110-nagios.sh - - ./tools/deployment/developer/nfs/120-elasticsearch.sh - - ./tools/deployment/developer/nfs/125-elasticsearch-ldap.sh - - ./tools/deployment/developer/nfs/130-fluent-logging.sh - - ./tools/deployment/developer/nfs/140-kibana.sh + - ./tools/deployment/osh-infra-monitoring/000-install-packages.sh + - ./tools/deployment/osh-infra-monitoring/005-deploy-k8s.sh + - ./tools/deployment/osh-infra-monitoring/010-deploy-docker-registry.sh + - ./tools/deployment/osh-infra-monitoring/020-ingress.sh + - ./tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh + - ./tools/deployment/osh-infra-monitoring/040-ldap.sh + - ./tools/deployment/osh-infra-monitoring/045-mariadb.sh + - ./tools/deployment/osh-infra-monitoring/050-prometheus.sh + - ./tools/deployment/osh-infra-monitoring/060-alertmanager.sh + - ./tools/deployment/osh-infra-monitoring/070-kube-state-metrics.sh + - ./tools/deployment/osh-infra-monitoring/080-node-exporter.sh + - ./tools/deployment/osh-infra-monitoring/090-process-exporter.sh + - ./tools/deployment/osh-infra-monitoring/100-grafana.sh + - ./tools/deployment/osh-infra-monitoring/110-nagios.sh - job: - name: openstack-helm-infra-dev-deploy-nfs-networkpolicy - parent: openstack-helm-infra-functional + name: openstack-helm-infra-aio-network-policy + parent: openstack-helm-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml run: playbooks/osh-infra-gate-runner.yaml @@ -149,26 +135,24 @@ nodeset: openstack-helm-single-node vars: gate_scripts: - - ./tools/deployment/developer/nfs/000-install-packages.sh - - ./tools/deployment/developer/nfs/005-deploy-k8s.sh - - ./tools/deployment/developer/nfs/010-deploy-docker-registry.sh - - ./tools/deployment/developer/nfs/020-ingress.sh - - ./tools/deployment/developer/nfs/030-nfs-provisioner.sh - - ./tools/deployment/developer/netpol/039-lockdown.sh - - ./tools/deployment/developer/netpol/040-ldap.sh - - ./tools/deployment/developer/netpol/045-mariadb.sh - - ./tools/deployment/developer/netpol/050-prometheus.sh - - ./tools/deployment/developer/netpol/060-alertmanager.sh - - ./tools/deployment/developer/netpol/070-kube-state-metrics.sh - - ./tools/deployment/developer/netpol/080-node-exporter.sh - - ./tools/deployment/developer/netpol/090-process-exporter.sh - - ./tools/deployment/developer/netpol/100-grafana.sh - - ./tools/deployment/developer/netpol/110-nagios.sh - - ./tools/deployment/developer/netpol/120-elasticsearch.sh - - ./tools/deployment/developer/netpol/125-elasticsearch-ldap.sh - - ./tools/deployment/developer/netpol/130-fluent-logging.sh - - ./tools/deployment/developer/netpol/140-kibana.sh - - ./tools/deployment/developer/netpol/901-test-networkpolicy.sh + - ./tools/deployment/network-policy/000-install-packages.sh + - ./tools/deployment/network-policy/005-deploy-k8s.sh + - ./tools/deployment/network-policy/010-ingress.sh + - ./tools/deployment/network-policy/020-nfs-provisioner.sh + - ./tools/deployment/network-policy/039-lockdown.sh + - ./tools/deployment/network-policy/040-ldap.sh + - ./tools/deployment/network-policy/045-mariadb.sh + - ./tools/deployment/network-policy/050-prometheus.sh + - ./tools/deployment/network-policy/060-alertmanager.sh + - ./tools/deployment/network-policy/070-kube-state-metrics.sh + - ./tools/deployment/network-policy/080-node-exporter.sh + - ./tools/deployment/network-policy/090-process-exporter.sh + - ./tools/deployment/network-policy/100-grafana.sh + - ./tools/deployment/network-policy/110-nagios.sh + - ./tools/deployment/network-policy/120-elasticsearch.sh + - ./tools/deployment/network-policy/130-fluent-logging.sh + - ./tools/deployment/network-policy/140-kibana.sh + - ./tools/deployment/network-policy/901-test-networkpolicy.sh - job: name: openstack-helm-infra-openstack-support @@ -183,13 +167,13 @@ - ./tools/deployment/openstack-support/000-install-packages.sh - ./tools/deployment/openstack-support/005-deploy-k8s.sh - ./tools/deployment/openstack-support/010-ingress.sh - - ./tools/deployment/openstack-support/015-ceph.sh - - ./tools/deployment/openstack-support/020-ceph-ns-activate.sh - - ./tools/deployment/openstack-support/025-rabbitmq.sh - - ./tools/deployment/openstack-support/030-memcached.sh - - ./tools/deployment/openstack-support/035-mariadb.sh - - ./tools/deployment/openstack-support/040-libvirt.sh - - ./tools/deployment/openstack-support/045-openvswitch.sh + - ./tools/deployment/openstack-support/020-ceph.sh + - ./tools/deployment/openstack-support/025-ceph-ns-activate.sh + - ./tools/deployment/openstack-support/030-rabbitmq.sh + - ./tools/deployment/openstack-support/040-memcached.sh + - ./tools/deployment/openstack-support/050-libvirt.sh + - ./tools/deployment/openstack-support/060-openvswitch.sh + - job: name: openstack-helm-infra-five-ubuntu parent: openstack-helm-infra diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2e6d281a5..356b6814e 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -20,15 +20,11 @@ jobs: - openstack-helm-lint - openstack-helm-infra-five-ubuntu - - openstack-helm-infra-dev-deploy-ceph: - # NOTE(srwilkers): Changing the dev-deploy-ceph job to nonvoting - # until we can agree on the proper services to deploy with this job + - openstack-helm-infra-aio-logging: voting: false - - openstack-helm-infra-dev-deploy-nfs: - #NOTE(srwilkers): Changing the dev-deploy-nfs job to nonvoting until - # we can agree on the proper services to deploy with this job + - openstack-helm-infra-aio-monitoring: voting: false - - openstack-helm-infra-dev-deploy-nfs-networkpolicy: + - openstack-helm-infra-aio-network-policy: voting: false - openstack-helm-infra-openstack-support - openstack-helm-infra-kubernetes-keystone-auth