Merge "Organize aio gates by function"

This commit is contained in:
Zuul 2018-10-21 09:16:23 +00:00 committed by Gerrit Code Review
commit 91f38f22b7
99 changed files with 155 additions and 835 deletions

View File

@ -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

View File

@ -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

View File

@ -1,10 +0,0 @@
Development
===========
Contents:
.. toctree::
:maxdepth: 2
deploy-with-nfs
deploy-with-ceph

View File

@ -6,5 +6,4 @@ Contents:
.. toctree::
:maxdepth: 2
developer/index
multinode

View File

@ -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

View File

@ -1 +0,0 @@
../../common/010-deploy-docker-registry.sh

View File

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

View File

@ -1 +0,0 @@
../common/045-mariadb.sh

View File

@ -1 +0,0 @@
../common/050-prometheus.sh

View File

@ -1 +0,0 @@
../common/060-alertmanager.sh

View File

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

View File

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

View File

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

View File

@ -1 +0,0 @@
../common/100-grafana.sh

View File

@ -1 +0,0 @@
../common/110-nagios.sh

View File

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

View File

@ -1 +0,0 @@
../common/130-fluent-logging.sh

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1 +0,0 @@
../../common/010-deploy-docker-registry.sh

View File

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

View File

@ -1 +0,0 @@
../common/045-mariadb.sh

View File

@ -1 +0,0 @@
../common/050-prometheus.sh

View File

@ -1 +0,0 @@
../common/060-alertmanager.sh

View File

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

View File

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

View File

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

View File

@ -1 +0,0 @@
../common/100-grafana.sh

View File

@ -1 +0,0 @@
../common/110-nagios.sh

View File

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

View File

@ -1 +0,0 @@
../common/130-fluent-logging.sh

View File

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

View File

@ -1 +1 @@
../developer/nfs/030-nfs-provisioner.sh
../osh-infra-monitoring/030-nfs-provisioner.sh

View File

@ -1 +1 @@
../openstack-support/025-rabbitmq.sh
../openstack-support/030-rabbitmq.sh

View File

@ -1 +1 @@
../openstack-support/030-memcached.sh
../openstack-support/040-memcached.sh

View File

@ -1 +0,0 @@
../openstack-support/035-mariadb.sh

View File

@ -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

View File

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

View File

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

View File

@ -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

View File

@ -0,0 +1 @@
../common/020-ingress.sh

View File

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

View File

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

View File

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

View File

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

View File

@ -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} \

View File

@ -1 +0,0 @@
../developer/ceph/030-ceph.sh

View File

@ -0,0 +1 @@
../osh-infra-logging/020-ceph.sh

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -0,0 +1 @@
../common/000-install-packages.sh

View File

@ -0,0 +1 @@
../common/005-deploy-k8s.sh

View File

@ -0,0 +1 @@
../common/010-deploy-docker-registry.sh

View File

@ -0,0 +1 @@
../common/020-ingress.sh

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

Some files were not shown because too many files have changed in this diff Show More