From c7f709173927eff6e4c518c1a8b69a04096cd723 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Thu, 4 Oct 2018 12:47:48 -0500 Subject: [PATCH] Gate: refactor gate script running This is the 1st in a series of commits to reduce the complexity of the gate playbooks, follow on work will target gates more specificly to both reduce infra load and improve coverage. This PS also removes the unused ldap-deploy playbook. Change-Id: Ie4ddabe86d71008611c6cc5015a927e32c54fa35 Signed-off-by: Pete Birley --- .zuul.yaml | 101 +++++++++++++-- playbooks/osh-infra-dev-deploy-ceph.yaml | 140 --------------------- playbooks/osh-infra-dev-deploy-nfs.yaml | 128 ------------------- playbooks/osh-infra-gate-runner.yaml | 22 ++++ playbooks/osh-infra-keystone-k8s-auth.yaml | 93 -------------- playbooks/osh-infra-ldap-deploy.yaml | 58 --------- playbooks/osh-infra-multinode-deploy.yaml | 136 -------------------- playbooks/osh-infra-openstack-support.yaml | 80 ------------ roles/osh-run-script/tasks/main.yaml | 23 ++++ 9 files changed, 137 insertions(+), 644 deletions(-) delete mode 100644 playbooks/osh-infra-dev-deploy-ceph.yaml delete mode 100644 playbooks/osh-infra-dev-deploy-nfs.yaml create mode 100644 playbooks/osh-infra-gate-runner.yaml delete mode 100644 playbooks/osh-infra-keystone-k8s-auth.yaml delete mode 100644 playbooks/osh-infra-ldap-deploy.yaml delete mode 100644 playbooks/osh-infra-multinode-deploy.yaml delete mode 100644 playbooks/osh-infra-openstack-support.yaml create mode 100644 roles/osh-run-script/tasks/main.yaml diff --git a/.zuul.yaml b/.zuul.yaml index d9e1b7eec..a667bbcf3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -200,8 +200,29 @@ - playbooks/osh-infra-deploy-docker.yaml - playbooks/osh-infra-build.yaml - playbooks/osh-infra-deploy-k8s.yaml - run: playbooks/osh-infra-multinode-deploy.yaml + run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml + vars: + gate_scripts: + - ./tools/deployment/multinode/010-deploy-docker-registry.sh + - ./tools/deployment/multinode/020-ingress.sh + - ./tools/deployment/multinode/030-ceph.sh + - ./tools/deployment/multinode/035-ceph-ns-activate.sh + - ./tools/deployment/multinode/040-ldap.sh + - ./tools/deployment/multinode/045-mariadb.sh + - ./tools/deployment/multinode/050-prometheus.sh + - ./tools/deployment/multinode/060-alertmanager.sh + - ./tools/deployment/multinode/070-kube-state-metrics.sh + - ./tools/deployment/multinode/080-node-exporter.sh + - ./tools/deployment/multinode/085-process-exporter.sh + - ./tools/deployment/multinode/090-openstack-exporter.sh + - ./tools/deployment/multinode/100-grafana.sh + - ./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 - job: name: openstack-helm-infra-ubuntu @@ -223,27 +244,81 @@ parent: openstack-helm-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-dev-deploy-ceph.yaml + run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml 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 - job: name: openstack-helm-infra-dev-deploy-nfs parent: openstack-helm-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-dev-deploy-nfs.yaml + run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml 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 - job: name: openstack-helm-infra-openstack-support parent: openstack-helm-functional timeout: 7200 pre-run: playbooks/osh-infra-upgrade-host.yaml - run: playbooks/osh-infra-openstack-support.yaml + run: playbooks/osh-infra-gate-runner.yaml post-run: playbooks/osh-infra-collect-logs.yaml nodeset: openstack-helm-single-node + vars: + gate_scripts: + - ./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 - job: name: openstack-helm-infra-five-ubuntu @@ -262,12 +337,20 @@ - job: name: openstack-helm-infra-kubernetes-keystone-auth - vars: - zuul_osh_relative_path: ../openstack-helm/ - kubernetes_keystone_auth: true - gate_fqdn_test: true parent: openstack-helm-infra nodeset: openstack-helm-single-node - run: playbooks/osh-infra-keystone-k8s-auth.yaml + run: playbooks/osh-infra-gate-runner.yaml required-projects: - openstack/openstack-helm + vars: + kubernetes_keystone_auth: true + gate_fqdn_test: true + gate_scripts: + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/020-setup-client.sh + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/030-ingress.sh + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/040-nfs-provisioner.sh + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/050-mariadb.sh + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/060-rabbitmq.sh + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/070-memcached.sh + - cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/080-keystone.sh + - ./tools/deployment/keystone-auth/check.sh diff --git a/playbooks/osh-infra-dev-deploy-ceph.yaml b/playbooks/osh-infra-dev-deploy-ceph.yaml deleted file mode 100644 index 409ebb7ad..000000000 --- a/playbooks/osh-infra-dev-deploy-ceph.yaml +++ /dev/null @@ -1,140 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Deploy Required packages - shell: | - set -xe; - ./tools/deployment/developer/ceph/000-install-packages.sh - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - - name: Deploy Kubernetes - shell: | - set -xe; - ./tools/deployment/developer/ceph/005-deploy-k8s.sh - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - - name: Deploy Registry NFS, Redis, and Docker Registry - shell: | - set -xe; - ./tools/deployment/developer/ceph/010-deploy-docker-registry.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Cluster and Namespace Ingress - shell: | - set -xe; - ./tools/deployment/developer/ceph/020-ingress.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph - shell: | - set -xe; - ./tools/deployment/developer/ceph/030-ceph.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph NS Activate - shell: | - set -xe; - ./tools/deployment/developer/ceph/035-ceph-ns-activate.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy LDAP - shell: | - set -xe; - ./tools/deployment/developer/ceph/040-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy MariaDB - shell: | - set -xe; - ./tools/deployment/developer/ceph/045-mariadb.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Prometheus - shell: | - set -xe; - ./tools/deployment/developer/ceph/050-prometheus.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Alertmanager - shell: | - set -xe; - ./tools/deployment/developer/ceph/060-alertmanager.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kube-State-Metrics - shell: | - set -xe; - ./tools/deployment/developer/ceph/070-kube-state-metrics.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Node Exporter - shell: | - set -xe; - ./tools/deployment/developer/ceph/080-node-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Process Exporter - shell: | - set -xe; - ./tools/deployment/developer/ceph/090-process-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Grafana - shell: | - set -xe; - ./tools/deployment/developer/ceph/100-grafana.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Nagios - shell: | - set -xe; - ./tools/deployment/developer/ceph/110-nagios.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy RadosGW for OSH-Infra Namespace - shell: | - set -xe; - ./tools/deployment/developer/ceph/115-radosgw-osh-infra.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Elasticsearch - shell: | - set -xe; - ./tools/deployment/developer/ceph/120-elasticsearch.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Test LDAP Auth for Elasticsearch - shell: | - set -xe; - ./tools/deployment/developer/ceph/125-elasticsearch-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Fluent-Logging - shell: | - set -xe; - ./tools/deployment/developer/ceph/130-fluent-logging.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kibana - shell: | - set -xe; - ./tools/deployment/developer/ceph/140-kibana.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/playbooks/osh-infra-dev-deploy-nfs.yaml b/playbooks/osh-infra-dev-deploy-nfs.yaml deleted file mode 100644 index b65becc91..000000000 --- a/playbooks/osh-infra-dev-deploy-nfs.yaml +++ /dev/null @@ -1,128 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Deploy Required packages - shell: | - set -xe; - ./tools/deployment/developer/nfs/000-install-packages.sh - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - - name: Deploy Kubernetes - shell: | - set -xe; - ./tools/deployment/developer/nfs/005-deploy-k8s.sh - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - - name: Deploy Registry NFS, Redis, and Docker Registry - shell: | - set -xe; - ./tools/deployment/developer/nfs/010-deploy-docker-registry.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Cluster and Namespace Ingress - shell: | - set -xe; - ./tools/deployment/developer/nfs/020-ingress.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy NFS Provisioner - shell: | - set -xe; - ./tools/deployment/developer/nfs/030-nfs-provisioner.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy LDAP - shell: | - set -xe; - ./tools/deployment/developer/nfs/040-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy MariaDB - shell: | - set -xe; - ./tools/deployment/developer/nfs/045-mariadb.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Prometheus - shell: | - set -xe; - ./tools/deployment/developer/nfs/050-prometheus.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Alertmanager - shell: | - set -xe; - ./tools/deployment/developer/nfs/060-alertmanager.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kube-State-Metrics - shell: | - set -xe; - ./tools/deployment/developer/nfs/070-kube-state-metrics.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Node Exporter - shell: | - set -xe; - ./tools/deployment/developer/nfs/080-node-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Process Exporter - shell: | - set -xe; - ./tools/deployment/developer/nfs/090-process-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Grafana - shell: | - set -xe; - ./tools/deployment/developer/nfs/100-grafana.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Nagios - shell: | - set -xe; - ./tools/deployment/developer/nfs/110-nagios.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Elasticsearch - shell: | - set -xe; - ./tools/deployment/developer/nfs/120-elasticsearch.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Test LDAP Auth for Elasticsearch - shell: | - set -xe; - ./tools/deployment/developer/nfs/125-elasticsearch-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Fluent-Logging - shell: | - set -xe; - ./tools/deployment/developer/nfs/130-fluent-logging.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kibana - shell: | - set -xe; - ./tools/deployment/developer/nfs/140-kibana.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/playbooks/osh-infra-gate-runner.yaml b/playbooks/osh-infra-gate-runner.yaml new file mode 100644 index 000000000..a8b92df2d --- /dev/null +++ b/playbooks/osh-infra-gate-runner.yaml @@ -0,0 +1,22 @@ +# 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. + +- hosts: primary + tasks: + - name: Run gate scripts + include_role: + name: osh-run-script + vars: + gate_script_path: "{{ item }}" + with_items: "{{ gate_scripts }}" diff --git a/playbooks/osh-infra-keystone-k8s-auth.yaml b/playbooks/osh-infra-keystone-k8s-auth.yaml deleted file mode 100644 index 95e28d9c4..000000000 --- a/playbooks/osh-infra-keystone-k8s-auth.yaml +++ /dev/null @@ -1,93 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Setup OS and K8s Clients - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/020-setup-client.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ingress - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/030-ingress.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy NFS - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/040-nfs-provisioner.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - OSH_INFRA_PATH: "../openstack-helm-infra/" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Mariadb - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/050-mariadb.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy RabbitMQ - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/060-rabbitmq.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Memcached - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/070-memcached.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Keystone - shell: | - set -xe; - cd "${OSH_PATH}" - ./tools/deployment/developer/nfs/080-keystone.sh - environment: - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_PATH: "{{ zuul_osh_relative_path | default('') }}" - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Check Kubernetes Keystone Auth - shell: | - set -xe; - ./tools/deployment/keystone-auth/check.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/playbooks/osh-infra-ldap-deploy.yaml b/playbooks/osh-infra-ldap-deploy.yaml deleted file mode 100644 index 7df5788ae..000000000 --- a/playbooks/osh-infra-ldap-deploy.yaml +++ /dev/null @@ -1,58 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Deploy Required packages - shell: | - set -xe; - ./tools/deployment/ldap/000-install-packages.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kubernetes - shell: | - set -xe; - ./tools/deployment/ldap/010-deploy-k8s.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy NFS for Logging, Monitoring and Alerting Components - shell: | - set -xe; - ./tools/deployment/ldap/020-lma-nfs-provisioner.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy LDAP - shell: | - set -xe; - ./tools/deployment/ldap/030-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Elasticsearch - shell: | - set -xe; - ./tools/deployment/ldap/040-elasticsearch.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Test Elasticsearch Access via LDAP - shell: | - set -xe; - ./tools/deployment/ldap/045-elasticsearch-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kibana - shell: | - set -xe; - ./tools/deployment/ldap/050-kibana.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/playbooks/osh-infra-multinode-deploy.yaml b/playbooks/osh-infra-multinode-deploy.yaml deleted file mode 100644 index 946fb2305..000000000 --- a/playbooks/osh-infra-multinode-deploy.yaml +++ /dev/null @@ -1,136 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Deploy Falco - shell: | - set -xe; - ./tools/deployment/multinode/150-falco.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Registry NFS, Redis, and Docker Registry - shell: | - set -xe; - ./tools/deployment/multinode/010-deploy-docker-registry.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Cluster and Namespace Ingresses - shell: | - set -xe; - ./tools/deployment/multinode/020-ingress.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph - shell: | - set -xe; - ./tools/deployment/multinode/030-ceph.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph NS Activate - shell: | - set -xe; - ./tools/deployment/multinode/035-ceph-ns-activate.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy LDAP - shell: | - set -xe; - ./tools/deployment/multinode/040-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy MariaDB - shell: | - set -xe; - ./tools/deployment/multinode/045-mariadb.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Prometheus - shell: | - set -xe; - ./tools/deployment/multinode/050-prometheus.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Alertmanager - shell: | - set -xe; - ./tools/deployment/multinode/060-alertmanager.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kube-State-Metrics - shell: | - set -xe; - ./tools/deployment/multinode/070-kube-state-metrics.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Node Exporter - shell: | - set -xe; - ./tools/deployment/multinode/080-node-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Process Exporter - shell: | - set -xe; - ./tools/deployment/multinode/085-process-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Prometheus OpenStack Exporter - shell: | - set -xe; - ./tools/deployment/multinode/090-openstack-exporter.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Grafana - shell: | - set -xe; - ./tools/deployment/multinode/100-grafana.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Nagios - shell: | - set -xe; - ./tools/deployment/multinode/110-nagios.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy RadosGW for OSH-Infra Namespace - shell: | - set -xe; - ./tools/deployment/multinode/115-radosgw-osh-infra.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Elasticsearch - shell: | - set -xe; - ./tools/deployment/multinode/120-elasticsearch.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Test LDAP Auth for Elasticsearch - shell: | - set -xe; - ./tools/deployment/multinode/125-elasticsearch-ldap.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Fluent-Logging - shell: | - set -xe; - ./tools/deployment/multinode/130-fluent-logging.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kibana - shell: | - set -xe; - ./tools/deployment/multinode/140-kibana.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/playbooks/osh-infra-openstack-support.yaml b/playbooks/osh-infra-openstack-support.yaml deleted file mode 100644 index 26da181cd..000000000 --- a/playbooks/osh-infra-openstack-support.yaml +++ /dev/null @@ -1,80 +0,0 @@ -# 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. - -- hosts: primary - tasks: - - name: Deploy Required packages - shell: | - set -xe; - ./tools/deployment/openstack-support/000-install-packages.sh - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - - name: Deploy Kubernetes - shell: | - set -xe; - ./tools/deployment/openstack-support/005-deploy-k8s.sh - args: - chdir: "{{ zuul.project.src_dir }}" - environment: - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - - name: Deploy Cluster and Namespace Ingress - shell: | - set -xe; - ./tools/deployment/openstack-support/010-ingress.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph - shell: | - set -xe; - ./tools/deployment/openstack-support/015-ceph.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph NS Activate - shell: | - set -xe; - ./tools/deployment/openstack-support/020-ceph-ns-activate.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Rabbitmq - shell: | - set -xe; - ./tools/deployment/openstack-support/025-rabbitmq.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Memcached - shell: | - set -xe; - ./tools/deployment/openstack-support/030-memcached.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Mariadb - shell: | - set -xe; - ./tools/deployment/openstack-support/035-mariadb.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Libvirt - shell: | - set -xe; - ./tools/deployment/openstack-support/040-libvirt.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Openvswitch - shell: | - set -xe; - ./tools/deployment/openstack-support/045-openvswitch.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/roles/osh-run-script/tasks/main.yaml b/roles/osh-run-script/tasks/main.yaml new file mode 100644 index 000000000..bbecb5ad7 --- /dev/null +++ b/roles/osh-run-script/tasks/main.yaml @@ -0,0 +1,23 @@ +# 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. + +- name: "Run script {{ gate_script_path }}" + shell: | + set -xe; + {{ gate_script_path }} + args: + chdir: "{{ zuul.project.src_dir }}" + environment: + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" + OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" + OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" + OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}"