Merge "Create k8s server certs directly on ctl nodes"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index ba3c682..d80c7d0 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -15,3 +15,6 @@
# Nova
nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
nova_memcache_secret_key: ''
+ # Glance
+ glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+ glance_memcache_secret_key: ''
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index 7985217..964899d 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -9,6 +9,9 @@
gerrit_ldap_group_base: ""
gerrit_http_listen_url: http://*:8080/
gerrit_extra_opts: ""
+ gerrit_db_publish_port: 13306
+ gerrit_publish_port: 18083
+ gerrit_ssh_publish_port: 29417
docker:
client:
stack:
@@ -20,8 +23,8 @@
condition: any
image: ${_param:docker_image_gerrit}
ports:
- - 18083:8080
- - 29417:29418
+ - ${_param:gerrit_publish_port}:8080
+ - ${_param:gerrit_ssh_publish_port}:29418
volumes:
- /srv/volumes/gerrit:/var/gerrit/review_site
depends_on:
@@ -62,6 +65,6 @@
condition: any
image: "${_param:docker_image_mysql}"
ports:
- - 13306:3306
+ - ${_param:gerrit_db_publish_port}:3306
volumes:
- /srv/volumes/mysql:/var/lib/mysql
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index de8e9ae..0c17ac8 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -6,9 +6,6 @@
- system.salt.minion.cert.mysql.clients.openstack.glance
- system.salt.minion.cert.rabbitmq.clients.openstack.glance
parameters:
- _param:
- glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- glance_memcache_secret_key: ''
linux:
system:
cron:
diff --git a/glance/control/single.yml b/glance/control/single.yml
index ad6e1cb..c9b818d 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -3,9 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.glance
- system.salt.minion.cert.rabbitmq.clients.openstack.glance
parameters:
- _param:
- glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- glance_memcache_secret_key: ''
linux:
system:
cron:
diff --git a/jenkins/client/job/debian/init.yml b/jenkins/client/job/debian/init.yml
index f24cccc..a713427 100644
--- a/jenkins/client/job/debian/init.yml
+++ b/jenkins/client/job/debian/init.yml
@@ -1,15 +1,2 @@
-classes:
- - system.jenkins.client.job.debian.packages
-parameters:
- jenkins:
- client:
- view:
- Debian:
- enabled: true
- type: CategorizedJobsView
- include_regex: "build-debian-(?!salt-formula-).*"
- categories:
- - group_regex: ".*-ubuntu-trusty"
- naming_rule: "Ubuntu Trusty"
- - group_regex: ".*-ubuntu-xenial"
- naming_rule: "Ubuntu Xenial"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/ceph.yml b/jenkins/client/job/debian/packages/ceph.yml
index 5307b4b..a713427 100644
--- a/jenkins/client/job/debian/packages/ceph.yml
+++ b/jenkins/client/job/debian/packages/ceph.yml
@@ -1,77 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian-ceph-package:
- name: build-debian-{{package}}-{{version}}-ubuntu-{{dist}}
- jobs:
- # Xenial
- - package: ceph
- dist: xenial
- branch: debian/xenial-luminous
- version: luminous
- - package: ceph
- dist: xenial
- branch: debian/xenial-jewel
- version: jewel
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-pipeline.groovy
- trigger:
- gerrit:
- project:
- debian/{{package}}:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/debian/{{package}}.git"
- SOURCE_BRANCH:
- type: string
- default: "{{branch}}"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- EXTRA_REPO_URL:
- type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing ceph"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "ubuntu-{{dist}}-{{package}}-{{version}}"
- OS:
- type: string
- default: "ubuntu"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
\ No newline at end of file
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index f3475b3..a713427 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -1,278 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian:
- name: build-debian-{{package}}-ubuntu-{{dist}}
- jobs:
- - package: librdkafka
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-kafka
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: liburcu
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-kazoo
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-pathlib
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: kafka
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-geventhttpclient
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-consistent-hash
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: libipfix
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-ncclient
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-pycassa
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-xmltodict
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-backports.ssl-match-hostname
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-certifi
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-docker
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-cassandra-driver
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-redis
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-tabulate
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: cassandra-cpp-driver
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: libuv1
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: python-sseclient
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: reclass
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: jmx-exporter
- dist: trusty
- build: jmx-exporter
- branch: master
- - package: python-bitstring
- dist: trusty
- build: pipeline
- branch: debian/trusty
- - package: libvirt-exporter
- dist: trusty
- build: libvirt-exporter
- branch: master
- - package: librdkafka
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-kafka
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-geventhttpclient
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-pydbus
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-docker
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-consistent-hash
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: libipfix
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: cassandra-cpp-driver
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-sseclient
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: reclass
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: telegraf
- dist: trusty
- build: telegraf
- branch: release-1.5
- - package: telegraf
- dist: xenial
- build: telegraf
- branch: release-1.5
- - package: libvirt-exporter
- dist: xenial
- build: libvirt-exporter
- branch: master
- - package: kafka
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-cassandra-driver
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: jmx-exporter
- dist: xenial
- build: jmx-exporter
- branch: master
- - package: influxdb-relay
- dist: xenial
- build: influxdb-relay
- branch: master
- - package: prometheus-relay
- dist: trusty
- build: prometheus-relay
- branch: master
- - package: prometheus-relay
- dist: xenial
- build: prometheus-relay
- branch: master
- - package: python-datrie
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: contrail-api-cli
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: gerritlib
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-pygerrit2
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: jeepyb
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: salt-pepper
- dist: xenial
- build: pipeline
- branch: debian/xenial
- - package: python-backports.ssl-match-hostname
- dist: xenial
- build: pipeline
- branch: debian/xenial
- template:
- type: workflow-scm
- concurrent: false
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-{{build}}.groovy
- trigger:
- gerrit:
- project:
- debian/{{package}}:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/debian/{{package}}.git"
- SOURCE_BRANCH:
- type: string
- default: "{{branch}}"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- EXTRA_REPO_URL:
- type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing extra"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "ubuntu-{{dist}}-extra"
- OS:
- type: string
- default: "ubuntu"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- PPA:
- type: string
- default: "mirantis-opencontrail/extra"
- UPLOAD_PPA:
- type: boolean
- default: 'true'
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/heat/resources.yml b/jenkins/client/job/debian/packages/heat/resources.yml
index 92bdbe0..a713427 100644
--- a/jenkins/client/job/debian/packages/heat/resources.yml
+++ b/jenkins/client/job/debian/packages/heat/resources.yml
@@ -1,91 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian-heat-resources:
- name: build-debian-{{name}}-{{os}}-{{dist}}
- jobs:
- # Trusty
- - name: heat-resource-salt
- os: ubuntu
- dist: trusty
- branch: master
- # Xenial
- - name: heat-resource-salt
- os: ubuntu
- dist: xenial
- branch: master
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-pipeline.groovy
- trigger:
- gerrit:
- project:
- salt-formulas/{{name}}:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "git@github.com:salt-formulas/heat-resource-salt.git"
- SOURCE_BRANCH:
- type: string
- default: "{{branch}}"
- SOURCE_CREDENTIALS:
- type: string
- default: "github-credentials"
- DEBIAN_SNAPSHOT:
- type: boolean
- default: 'true'
- REVISION_POSTFIX:
- type: string
- default: '~{{dist}}1'
- EXTRA_REPO_URL:
- type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing extra"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "{{os}}-{{dist}}-extra"
- OS:
- type: string
- default: "{{os}}"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
- PRE_BUILD_SCRIPT:
- type: text
- default: |
- echo "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted" >> /etc/apt/sources.list.d/extra.list
- curl --insecure -ss -f "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key" | apt-key add -
- apt-get update
-
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/horizon/init.yml b/jenkins/client/job/debian/packages/horizon/init.yml
index a899680..a713427 100644
--- a/jenkins/client/job/debian/packages/horizon/init.yml
+++ b/jenkins/client/job/debian/packages/horizon/init.yml
@@ -1,3 +1,2 @@
-classes:
- - system.jenkins.client.job.debian.packages.horizon.modules
- - system.jenkins.client.job.debian.packages.horizon.themes
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 357be6e..a713427 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -1,242 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian-horizon-module:
- name: build-debian-horizon-module-{{name}}-{{os_version}}-{{os}}-{{dist}}
- jobs:
- # Trusty
- - name: horizon-avi-panels
- os: ubuntu
- dist: trusty
- os_version: mitaka
- branch: stable/mitaka
- # Xenial
- - name: horizon-avi-panels
- os: ubuntu
- dist: xenial
- os_version: mitaka
- branch: stable/mitaka
- # Trusty
- - name: horizon-neutron-lbaasv2-panel
- os: ubuntu
- dist: trusty
- os_version: ocata
- branch: stable/ocata
- # Xenial
- - name: horizon-neutron-lbaasv2-panel
- os: ubuntu
- dist: xenial
- os_version: ocata
- branch: stable/ocata
- # Trusty
- - name: horizon-neutron-lbaasv2-panel
- os: ubuntu
- dist: trusty
- os_version: mitaka
- branch: stable/mitaka
- # Xenial
- - name: horizon-neutron-lbaasv2-panel
- os: ubuntu
- dist: xenial
- os_version: mitaka
- branch: stable/mitaka
- # Trusty
- - name: horizon-overrides-plugin
- os: ubuntu
- dist: trusty
- os_version: mitaka
- branch: master
- # Xenial
- - name: horizon-overrides-plugin
- os: ubuntu
- dist: xenial
- os_version: mitaka
- branch: master
- # Trusty
- - name: horizon-overrides-plugin
- os: ubuntu
- dist: trusty
- os_version: ocata
- branch: master
- # Xenial
- - name: horizon-overrides-plugin
- os: ubuntu
- dist: xenial
- os_version: ocata
- branch: master
- # Trusty
- - name: horizon-contrib
- os: ubuntu
- dist: trusty
- os_version: ocata
- branch: master
- # Xenial
- - name: horizon-contrib
- os: ubuntu
- dist: xenial
- os_version: ocata
- branch: master
- # Trusty
- - name: horizon-contrail-panels
- os: ubuntu
- dist: trusty
- os_version: mitaka
- branch: stable/mitaka
- # Xenial
- - name: horizon-contrail-panels
- os: ubuntu
- dist: xenial
- os_version: mitaka
- branch: stable/mitaka
- # Trusty
- - name: horizon-contrail-panels
- os: ubuntu
- dist: trusty
- os_version: newton
- branch: stable/newton
- # Xenial
- - name: horizon-contrail-panels
- os: ubuntu
- dist: xenial
- os_version: newton
- branch: stable/newton
- # Trusty
- - name: horizon-contrail-panels
- os: ubuntu
- dist: trusty
- os_version: ocata
- branch: stable/ocata
- # Xenial
- - name: horizon-contrail-panels
- os: ubuntu
- dist: xenial
- os_version: ocata
- branch: stable/ocata
- # Trusty
- - name: horizon-contrail-panels
- os: ubuntu
- dist: trusty
- os_version: pike
- branch: stable/pike
- # Xenial
- - name: horizon-contrail-panels
- os: ubuntu
- dist: xenial
- os_version: pike
- branch: stable/pike
- # Trusty
- - name: horizon-contrail-panels
- os: ubuntu
- dist: trusty
- os_version: queens
- branch: stable/queens
- # Xenial
- - name: horizon-contrail-panels
- os: ubuntu
- dist: xenial
- os_version: queens
- branch: stable/queens
- # Trusty
- - name: horizon-jenkins-dashboard
- os: ubuntu
- dist: trusty
- os_version: liberty
- branch: stable/liberty
- # Xenial
- - name: horizon-jenkins-dashboard
- os: ubuntu
- dist: xenial
- os_version: liberty
- branch: stable/liberty
- # Trusty
- - name: horizon-telemetry-dashboard
- os: ubuntu
- dist: trusty
- os_version: liberty
- branch: stable/liberty
- # Xenial
- - name: horizon-telemetry-dashboard
- os: ubuntu
- dist: xenial
- os_version: liberty
- branch: stable/liberty
- # Trusty
- - name: horizon-telemetry-dashboard
- os: ubuntu
- dist: trusty
- os_version: mitaka
- branch: stable/mitaka
- # Xenial
- - name: horizon-telemetry-dashboard
- os: ubuntu
- dist: xenial
- os_version: mitaka
- branch: stable/mitaka
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-pipeline.groovy
- trigger:
- gerrit:
- project:
- horizon-modules/{{name}}:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/horizon-modules/{{name}}.git"
- SOURCE_BRANCH:
- type: string
- default: "{{branch}}"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- DEBIAN_SNAPSHOT:
- type: boolean
- default: 'true'
- REVISION_POSTFIX:
- type: string
- default: '~{{os_version}}1{{dist}}1'
- EXTRA_REPO_URL:
- type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing extra {{os_version}}"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "{{os}}-{{dist}}-{{os_version}}"
- OS:
- type: string
- default: "{{os}}"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/horizon/themes.yml b/jenkins/client/job/debian/packages/horizon/themes.yml
index dbaab83..a713427 100644
--- a/jenkins/client/job/debian/packages/horizon/themes.yml
+++ b/jenkins/client/job/debian/packages/horizon/themes.yml
@@ -1,98 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian-horizon-theme:
- name: build-debian-horizon-theme-{{name}}-{{os_version}}-{{os}}-{{dist}}
- jobs:
- # Trusty
- - name: horizon-mirantis-theme
- os: ubuntu
- dist: trusty
- os_version: mitaka
- branch: stable/mitaka
- # Xenial
- - name: horizon-mirantis-theme
- os: ubuntu
- dist: xenial
- os_version: mitaka
- branch: stable/mitaka
- # Trusty
- - name: horizon-mirantis-theme
- os: ubuntu
- dist: trusty
- os_version: ocata
- branch: stable/ocata
- # Xenial
- - name: horizon-mirantis-theme
- os: ubuntu
- dist: xenial
- os_version: ocata
- branch: stable/ocata
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-pipeline.groovy
- trigger:
- gerrit:
- project:
- horizon-themes/{{name}}:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/horizon-themes/{{name}}.git"
- SOURCE_BRANCH:
- type: string
- default: "{{branch}}"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- DEBIAN_SNAPSHOT:
- type: boolean
- default: 'true'
- REVISION_POSTFIX:
- type: string
- default: '~{{os_version}}1{{dist}}1'
- EXTRA_REPO_URL:
- type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing extra {{os_version}}"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "{{os}}-{{dist}}-{{os_version}}"
- OS:
- type: string
- default: "{{os}}"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/init.yml b/jenkins/client/job/debian/packages/init.yml
index 4196f95..a713427 100644
--- a/jenkins/client/job/debian/packages/init.yml
+++ b/jenkins/client/job/debian/packages/init.yml
@@ -1,19 +1,2 @@
-classes:
- - system.jenkins.client.job.debian.packages.extra
- - system.jenkins.client.job.debian.packages.salt
- - system.jenkins.client.job.debian.packages.salt-multi
- - system.jenkins.client.job.debian.packages.horizon
- - system.jenkins.client.job.debian.packages.heat.resources
- - system.jenkins.client.job.debian.packages.ceph
-parameters:
- jenkins:
- client:
- view:
- Xenial:
- enabled: true
- type: ListView
- include_regex: "build-.*-ubuntu-xenial.*"
- Trusty:
- enabled: true
- type: ListView
- include_regex: "build-.*-ubuntu-trusty.*"
\ No newline at end of file
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index b58b801..a713427 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -1,144 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian-salt-multibranch:
- name: build-debian-salt-formula-{{name}}-ubuntu-{{dist}}
- jobs:
- - name: ceilometer
- upload_source_package: false
- dist: trusty
- - name: cinder
- upload_source_package: false
- dist: trusty
- - name: glance
- upload_source_package: false
- dist: trusty
- - name: heat
- upload_source_package: false
- dist: trusty
- - name: horizon
- upload_source_package: false
- dist: trusty
- - name: keystone
- upload_source_package: false
- dist: trusty
- - name: kubernetes
- upload_source_package: false
- dist: trusty
- - name: neutron
- upload_source_package: false
- dist: trusty
- - name: nova
- upload_source_package: false
- dist: trusty
- - name: swift
- upload_source_package: false
- dist: trusty
- - name: ceilometer
- upload_source_package: true
- dist: xenial
- - name: cinder
- upload_source_package: true
- dist: xenial
- - name: glance
- upload_source_package: true
- dist: xenial
- - name: heat
- upload_source_package: true
- dist: xenial
- - name: horizon
- upload_source_package: true
- dist: xenial
- - name: keystone
- upload_source_package: true
- dist: xenial
- - name: kubernetes
- upload_source_package: true
- dist: xenial
- - name: neutron
- upload_source_package: true
- dist: xenial
- - name: nova
- upload_source_package: true
- dist: xenial
- - name: swift
- upload_source_package: false
- dist: xenial
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-pipeline.groovy
- trigger:
- gerrit:
- project:
- salt-formulas/{{name}}:
- branches:
- - master
- - debian/{{dist}}
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}.git"
- SOURCE_BRANCH:
- type: string
- default: "master"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- DEBIAN_BRANCH:
- type: string
- default: 'debian/{{dist}}'
- DEBIAN_SNAPSHOT:
- type: boolean
- default: 'true'
- EXTRA_REPO_URL:
- type: string
- default: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main; deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub; ${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "ubuntu-{{dist}}-salt"
- OS:
- type: string
- default: "ubuntu"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- PPA:
- type: string
- default: "salt-formulas/ppa"
- UPLOAD_PPA:
- type: boolean
- default: 'true'
- UPLOAD_APTLY:
- type: boolean
- default: '{{upload_source_package}}'
- DEBUG:
- type: boolean
- default: 'false'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index ee8c9ef..a713427 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -1,475 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- build-debian-salt-formula:
- name: build-debian-salt-formula-{{name}}-ubuntu-{{dist}}
- jobs:
- - name: aodh
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: apache
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: aptcacher
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: aptly
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: artifactory
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: avinetworks
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: auditd
- upload_source_packages: false
- upload_to_aptly: true
- dist: xenial
- - name: barbican
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: baremetal-simulator
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: backupninja
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: bind
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: bird
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: cadf
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: calico
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: cassandra
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: ceph
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: chrony
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: collectd
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: debmirror
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: dekapod
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: designate
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: devops-portal
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: docker
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: dogtag
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: elasticsearch
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: etcd
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: fluentbit
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: fluentd
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: freeipa
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: galera
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: gerrit
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: git
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: gitlab
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: glusterfs
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: gnocchi
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: grafana
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: haproxy
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: heka
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: heketi
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: helm
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: hubble
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: influxdb
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: iptables
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: ironic
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: isc-dhcp
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: java
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: jenkins
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: keepalived
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: keycloak
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: kibana
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: letsencrypt
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: libvirt
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: linux
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: lldp
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: logrotate
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: maas
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: manila
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: memcached
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: mirascan
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: monasca
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: mongodb
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: murano
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: mysql
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: nfs
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: nginx
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: ntp
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: octavia
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: opencontrail
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: openldap
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: openscap
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: openssh
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: openvpn
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: oslo-templates
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: panko
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: postgresql
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: prometheus
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: powerdns
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: python
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: rabbitmq
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: reclass
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: redis
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: rsync
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: rundeck
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: rsyslog
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: runtest
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: sahara
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: salt
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: sensu
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: shibboleth
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: sphinx
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: spinnaker
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: statsd
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: telegraf
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: tinyproxy
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: tftpd-hpa
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: watchdog
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: xtrabackup
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- - name: zookeeper
- upload_source_package: true
- upload_to_aptly: true
- dist: xenial
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-pipeline.groovy
- trigger:
- gerrit:
- project:
- salt-formulas/{{name}}:
- branches:
- - master
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}.git"
- SOURCE_BRANCH:
- type: string
- default: "master"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- DEBIAN_SNAPSHOT:
- type: boolean
- default: 'true'
- REVISION_POSTFIX:
- type: string
- default: '~{{dist}}1'
- EXTRA_REPO_URL:
- type: string
- default: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main; deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt"
- EXTRA_REPO_KEY_URL:
- type: string
- default: "https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub; ${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "ubuntu-{{dist}}-salt"
- OS:
- type: string
- default: "ubuntu"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- PPA:
- type: string
- default: "salt-formulas/ppa"
- UPLOAD_PPA:
- type: boolean
- default: '{{upload_source_package}}'
- UPLOAD_APTLY:
- type: boolean
- default: '{{upload_to_aptly}}'
- DEBUG:
- type: boolean
- default: 'false'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/debian/packages/testing.yml b/jenkins/client/job/debian/packages/testing.yml
index 84ff1cc..a713427 100644
--- a/jenkins/client/job/debian/packages/testing.yml
+++ b/jenkins/client/job/debian/packages/testing.yml
@@ -1,80 +1,2 @@
-parameters:
- _param:
- jenkins_pollscm_spec: "H/60 * * * *"
- jenkins:
- client:
- job_template:
- build-debian-python-flask-hello:
- name: build-debian-{{package}}-ubuntu-{{dist}}
- jobs:
- - package: python-flask-hello
- dist: trusty
- build: pipeline
- branch: master
- template:
- type: workflow-scm
- concurrent: false
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: build-debian-packages-{{build}}.groovy
- trigger:
- gerrit:
- project:
- mk/{{package}}:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
- SOURCE_BRANCH:
- type: string
- default: "{{branch}}"
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- EXTRA_REPO_URL:
- type: string
- default: ""
- EXTRA_REPO_KEY_URL:
- type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- APTLY_REPO:
- type: string
- default: "ubuntu-{{dist}}-extra"
- OS:
- type: string
- default: "ubuntu"
- DIST:
- type: string
- default: "{{dist}}"
- ARCH:
- type: string
- default: "amd64"
- PPA:
- type: string
- default: "mirantis-opencontrail/extra"
- UPLOAD_PPA:
- type: boolean
- default: 'false'
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
index 7a391af..2500254 100644
--- a/jenkins/client/job/k8s-test/init.yml
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -1,6 +1,2 @@
-classes:
-- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
-- system.jenkins.client.job.k8s-test.mcp-k8s-merge-pipeline
-- system.jenkins.client.job.k8s-test.mcp-k8s-generic-test-pipeline
-- system.jenkins.client.job.k8s-test.mcp-k8s-generic-merge-pipeline
-- system.jenkins.client.job.k8s-test.mcp-k8s-formula-test-pipeline
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
index d07fedd..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
@@ -1,88 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- mcp_k8s_formula_test_pipeline:
- type: workflow-scm
- name: mcp-k8s-formula-test-pipeline
- display_name: "Kubernetes formula test pipeline"
- description: "Run k8s conformance against gerrit commit"
- discard:
- build:
- keep_num: 30
- artifact:
- keep_num: 30
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: pipelines/mcp-formula-change-test-pipeline.groovy
- trigger:
- gerrit:
- project:
- salt-formulas/kubernetes:
- branches:
- - compare_type: "ANT"
- name: "**"
- skip_vote:
- - successful
- - failed
- - unstable
- - not_built
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
- param:
- SOURCE_CREDENTIALS:
- type: string
- default: "gerrit"
- UPLOAD_APTLY:
- type: boolean
- default: 'true'
- description: Whether to upload to Aptly
- APTLY_REPO:
- type: string
- default: ""
- description: Aptly repo name
- BUILD_PACKAGE:
- type: boolean
- default: 'true'
- description: Whether to build package
- APTLY_REPO_URL:
- type: string
- default: "${_param:jenkins_aptly_url}"
- description: Aptly url
- APTLY_API_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- description: Aptly API url
- SOURCES:
- type: text
- default: ""
- description: Optional parameter to list Git refspecs to be build
- PKG_BUILD_JOB_NAME:
- type: string
- default: "oscore-build-salt-formula-refspec"
- description: Jenkins job name to build package
- STACK_DELETE:
- type: boolean
- default: 'true'
- description: Whether to delete stacks ater tests
- APTLY_PREFIX:
- type: string
- default: "oscc-dev"
- description: Aptly prefix
- SOURCE_REPO_NAME:
- type: string
- description: "Name of the repo where packages are stored"
- default: "ubuntu-xenial-salt"
- DEPLOY_JOB:
- type: string
- default: "deploy-heat-k8s_ha_calico"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
index ad66033..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
@@ -1,62 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- mcp-k8s-generic-merge-pipeline:
- name: mcp-k8s-{{name}}-merge-pipeline
- jobs:
- - name: coredns
- display_name: "CoreDNS merge pipeline"
- pipeline: mcp-k8s-coredns-pipeline.groovy
- repo: kubernetes/coredns
- - name: dashboard
- display_name: "Kubernetes dashboard merge pipeline"
- pipeline: mcp-k8s-dashboard-pipeline.groovy
- repo: kubernetes/dashboard
- - name: external-dns
- display_name: "External DNS merge pipeline"
- pipeline: mcp-k8s-ext-dns-pipeline.groovy
- repo: kubernetes/external-dns
- - name: metallb
- display_name: "Metal LB merge pipeline"
- pipeline: mcp-k8s-metallb-pipeline.groovy
- repo: kubernetes/metallb
- - name: nginx-ingress
- display_name: "NGINX ingress merge pipeline"
- pipeline: mcp-k8s-ingress-nginx-pipeline.groovy
- repo: kubernetes/ingress-nginx
- template:
- type: workflow-scm
- display_name: "{{display_name}}"
- discard:
- build:
- keep_num: 20
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: "pipelines/{{pipeline}}"
- trigger:
- gerrit:
- project:
- "{{repo}}":
- branches:
- - compare_type: "ANT"
- name: "**mcp**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- change:
- - merged
- param:
- KUBE_DOCKER_REGISTRY:
- type: string
- default: docker-dev-local.docker.mirantis.net
- description: 'Docker registry for binaries and images'
- KUBE_PROD_DOCKER_REGISTRY:
- type: string
- default: ${_param:mcp_docker_registry}
- description: 'Prod docker registry for binaries and images'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
index 3bf77cb..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
@@ -1,67 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- mcp-k8s-generic-test-pipeline:
- name: mcp-k8s-{{name}}-test-pipeline
- jobs:
- - name: coredns
- display_name: "CoreDNS test pipeline"
- pipeline: mcp-k8s-coredns-pipeline.groovy
- repo: kubernetes/coredns
- - name: dashboard
- display_name: "Kubernetes dashboard test pipeline"
- pipeline: mcp-k8s-dashboard-pipeline.groovy
- repo: kubernetes/dashboard
- - name: external-dns
- display_name: "External DNS test pipeline"
- pipeline: mcp-k8s-ext-dns-pipeline.groovy
- repo: kubernetes/external-dns
- - name: metallb
- display_name: "Metal LB test pipeline"
- pipeline: mcp-k8s-metallb-pipeline.groovy
- repo: kubernetes/metallb
- - name: nginx-ingress
- display_name: "NGINX ingress test pipeline"
- pipeline: mcp-k8s-ingress-nginx-pipeline.groovy
- repo: kubernetes/ingress-nginx
- template:
- type: workflow-scm
- display_name: "{{display_name}}"
- discard:
- build:
- keep_num: 50
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: "pipelines/{{pipeline}}"
- trigger:
- gerrit:
- project:
- "{{repo}}":
- branches:
- - compare_type: "ANT"
- name: "**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- override-votes:
- gerritBuildUnstableVerifiedValue: 1
- gerritBuildUnstableCodeReviewValue: 1
- param:
- KUBE_DOCKER_REGISTRY:
- type: string
- default: 'docker-dev-local.docker.mirantis.net'
- description: 'Docker registry for binaries and images'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
index 042e8d3..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
@@ -1,36 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- mcp_k8s_merge_pipeline:
- type: workflow-scm
- name: mcp-k8s-merge-pipeline
- display_name: "Kubernetes merge pipeline"
- discard:
- build:
- keep_num: 20
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: pipelines/mcp-k8s-test-pipeline.groovy
- trigger:
- gerrit:
- project:
- kubernetes/kubernetes:
- branches:
- - compare_type: "ANT"
- name: "**mcp**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- change:
- - merged
- param:
- KUBE_DOCKER_REGISTRY:
- type: string
- default: docker-dev-local.docker.mirantis.net
- description: 'Docker registry for binaries and images'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
index c5ffe4e..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
@@ -1,40 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- mcp_k8s_metallb_merge_pipeline:
- type: workflow-scm
- name: mcp-k8s-metallb-merge-pipeline
- display_name: "MetalLB merge pipeline"
- discard:
- build:
- keep_num: 20
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: pipelines/mcp-k8s-metallb-pipeline.groovy
- trigger:
- gerrit:
- project:
- kubernetes/metallb:
- branches:
- - compare_type: "ANT"
- name: "**mcp**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- change:
- - merged
- param:
- KUBE_DOCKER_REGISTRY:
- type: string
- default: docker-dev-local.docker.mirantis.net
- description: 'Docker registry for binaries and images'
- KUBE_PROD_DOCKER_REGISTRY:
- type: string
- default: ${_param:mcp_docker_registry}
- description: 'Prod docker registry for binaries and images'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
index fbce687..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
@@ -1,46 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- mcp_k8s_metallb_test_pipeline:
- type: workflow-scm
- name: mcp-k8s-metallb-test-pipeline
- display_name: "MetalLB tests pipeline"
- discard:
- build:
- keep_num: 50
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: pipelines/mcp-k8s-metallb-pipeline.groovy
- trigger:
- gerrit:
- project:
- kubernetes/metallb:
- branches:
- - compare_type: "ANT"
- name: "**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- override-votes:
- gerritBuildUnstableVerifiedValue: 1
- gerritBuildUnstableCodeReviewValue: 1
- param:
- KUBE_DOCKER_REGISTRY:
- type: string
- default: 'docker-dev-local.docker.mirantis.net'
- description: 'Docker registry for binaries and images'
-
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 3e01ea2..2500254 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -1,69 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- mcp_k8s_test_pipeline:
- type: workflow-scm
- name: mcp-k8s-test-pipeline
- display_name: "Kubernetes tests pipeline"
- discard:
- build:
- keep_num: 50
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
- credentials: "gerrit"
- script: pipelines/mcp-k8s-test-pipeline.groovy
- trigger:
- gerrit:
- project:
- kubernetes/kubernetes:
- branches:
- - compare_type: "ANT"
- name: "**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- override-votes:
- gerritBuildUnstableVerifiedValue: 1
- gerritBuildUnstableCodeReviewValue: 1
- param:
- KUBE_DOCKER_REGISTRY:
- type: string
- default: docker-dev-local.docker.mirantis.net
- description: 'Docker registry for binaries and images'
- CALICO_DOCKER_REGISTRY:
- type: string
- default: 'docker-prod-virtual.docker.mirantis.net'
- description: 'Docker registry for published Calico images'
- K8S_BASE_IMAGE:
- type: string
- default: 'mirantis/base-images/debian-base:20161223134732'
- description: 'Base Docker image to build k8s'
- CALICO_CNI_IMAGE_REPO:
- type: string
- default: 'calico/cni'
- description: 'Custom calico/cni image repository'
- CALICO_CNI_IMAGE_TAG:
- type: string
- default: 'v1.5.1'
- description: 'Custom calico/cni image tag'
- CALICO_DOWNSTREAM:
- type: boolean
- default: 'true'
- description: 'Use Calico downstream'
- CALICO_VER:
- type: string
- default: 'mcp'
- description: 'Custom Calico version'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/oss/init.yml b/jenkins/client/job/oss/init.yml
index 5aecb0b..a713427 100644
--- a/jenkins/client/job/oss/init.yml
+++ b/jenkins/client/job/oss/init.yml
@@ -1,6 +1,2 @@
-classes:
- - system.jenkins.client.job.oss.test_devops_portal
- - system.jenkins.client.job.oss.test_devops_portal_backend
- - system.jenkins.client.job.oss.test_devops_portal_nightly
- - system.jenkins.client.job.oss.test_pushkin_codebase
- - system.jenkins.client.job.oss.test_security_monkey_openstack
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oss/test_devops_portal.yml b/jenkins/client/job/oss/test_devops_portal.yml
index 7001200..a713427 100644
--- a/jenkins/client/job/oss/test_devops_portal.yml
+++ b/jenkins/client/job/oss/test_devops_portal.yml
@@ -1,46 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- test-oss-devops-portal:
- name: test-oss-devops-portal
- discard:
- build:
- keep_num: 15
- artifact:
- keep_num: 15
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
- credentials: "gerrit"
- script: test-devops-portal-pipeline.groovy
- trigger:
- gerrit:
- project:
- "oss/devops-portal":
- branches:
- - master
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- DEFAULT_GIT_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/oss/devops-portal"
- DEFAULT_GIT_REF:
- type: string
- default: master
- NIGHTLY_BUILD:
- type: boolean
- default: false
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oss/test_devops_portal_backend.yml b/jenkins/client/job/oss/test_devops_portal_backend.yml
index 0c23847..a713427 100644
--- a/jenkins/client/job/oss/test_devops_portal_backend.yml
+++ b/jenkins/client/job/oss/test_devops_portal_backend.yml
@@ -1,99 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- test-oss-devops-portal-backend:
- name: test-oss-devops-portal-backend
- discard:
- build:
- keep_num: 15
- artifact:
- keep_num: 15
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
- credentials: "gerrit"
- script: test-devops-portal-backend-pipeline.groovy
- param:
- # heat
- HEAT_STACK_NAME:
- type: string
- description: Heat stack name. Will be generated if missing.
- # salt master
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt-qa-credentials"
- SSH_PUBLIC_KEY:
- type: string
- description: "User's public SSH key to be able to login when stack is deployed"
- # openstack api
- OPENSTACK_API_URL:
- type: string
- default: "https://cloud-cz.bud.mirantis.net:5000"
- OPENSTACK_API_CREDENTIALS:
- type: string
- default: "openstack-devcloud-credentials"
- OPENSTACK_API_PROJECT:
- type: string
- default: "mcp-oss"
- OPENSTACK_API_CLIENT:
- type: string
- default: ""
- OPENSTACK_API_VERSION:
- type: string
- default: "3"
- OPENSTACK_API_PROJECT_DOMAIN:
- type: string
- default: "default"
- OPENSTACK_API_USER_DOMAIN_ID:
- type: string
- default: "default"
- OPENSTACK_API_PROJECT_ID:
- type: string
- default: ""
- OPENSTACK_API_USER_DOMAIN:
- type: string
- default: "default"
- # devops-portal-tests
- DEVOPS_PORTAL_TESTS_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/oss/devops-portal-tests"
- DEVOPS_PORTAL_TESTS_CREDENTIALS:
- type: string
- default: "gerrit"
- DEVOPS_PORTAL_TESTS_BRANCH:
- type: string
- default: "master"
- DEVOPS_PORTAL_BIND_IP:
- type: string
- default: "0.0.0.0"
- DEVOPS_PORTAL_BIND_PORT:
- type: string
- default: "8012"
- # testrail
- TESTRAIL_REPORT:
- type: boolean
- default: false
- TESTRAIL_URL:
- type: string
- default: "https://mirantis.testrail.com"
- TESTRAIL_QA_CREDENTIALS:
- type: string
- default: "oscore-qa-credentials"
- TESTRAIL_PROJECT:
- type: string
- default: "Mirantis Cloud Platform"
- TESTRAIL_PLAN:
- type: string
- default: "[MCP] [Auto] DevOps Portal"
- TESTRAIL_SUITE:
- type: string
- default: "[MCP] DevOps Portal"
- TESTRAIL_MILESTONE:
- type: string
- default: "MCP-Q18.1"
- TESTRAIL_RUN:
- type: string
- default: "[MCP] [Auto] DevOps Portal test run"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oss/test_devops_portal_nightly.yml b/jenkins/client/job/oss/test_devops_portal_nightly.yml
index b654846..a713427 100644
--- a/jenkins/client/job/oss/test_devops_portal_nightly.yml
+++ b/jenkins/client/job/oss/test_devops_portal_nightly.yml
@@ -1,58 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- test-oss-devops-portal-nightly:
- name: test-oss-devops-portal-nightly
- discard:
- build:
- keep_num: 15
- artifact:
- keep_num: 15
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
- credentials: "gerrit"
- script: test-devops-portal-pipeline.groovy
- trigger:
- timer:
- spec: "0 23 * * *"
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- DEFAULT_GIT_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/oss/devops-portal"
- DEFAULT_GIT_REF:
- type: string
- default: master
- NIGHTLY_BUILD:
- type: boolean
- default: true
- TESTRAIL_REPORT:
- type: boolean
- default: false
- TESTRAIL_URL:
- type: string
- default: "https://mirantis.testrail.com"
- TESTRAIL_QA_CREDENTIALS:
- type: string
- default: "oscore-qa-credentials"
- TESTRAIL_PROJECT:
- type: string
- default: "Mirantis Cloud Platform"
- TESTRAIL_PLAN:
- type: string
- default: "[MCP] [Auto] DevOps Portal"
- TESTRAIL_SUITE:
- type: string
- default: "[MCP] DevOps Portal"
- TESTRAIL_MILESTONE:
- type: string
- default: "MCP-Q18.1"
- TESTRAIL_RUN:
- type: string
- default: "[MCP] [Auto] DevOps Portal test run"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oss/test_pushkin_codebase.yml b/jenkins/client/job/oss/test_pushkin_codebase.yml
index baefbc9..a713427 100644
--- a/jenkins/client/job/oss/test_pushkin_codebase.yml
+++ b/jenkins/client/job/oss/test_pushkin_codebase.yml
@@ -1,45 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- test-oss-pushkin-codebase:
- name: test-oss-pushkin-codebase
- discard:
- build:
- keep_num: 15
- artifact:
- keep_num: 15
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
- credentials: "gerrit"
- script: test-pushkin-pipeline.groovy
- trigger:
- gerrit:
- project:
- "oss/pushkin":
- branches:
- - devel
- - master
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- DEFAULT_GIT_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/oss/pushkin"
- DEFAULT_GIT_REF:
- type: string
- default: master
- description: "Refspec in format refs/changes/, i.e. refs/changes/32/10332/4"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/oss/test_security_monkey_openstack.yml b/jenkins/client/job/oss/test_security_monkey_openstack.yml
index 7e9343f..a713427 100644
--- a/jenkins/client/job/oss/test_security_monkey_openstack.yml
+++ b/jenkins/client/job/oss/test_security_monkey_openstack.yml
@@ -1,43 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- test-oss-security-monkey-openstack:
- name: test-oss-security-monkey-openstack
- discard:
- build:
- keep_num: 15
- artifact:
- keep_num: 15
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
- credentials: "gerrit"
- script: test-security-monkey-openstack-pipeline.groovy
- trigger:
- gerrit:
- project:
- "oss/security-monkey-openstack":
- branches:
- - master
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- DEFAULT_GIT_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/oss/security-monkey-openstack"
- DEFAULT_GIT_REF:
- type: string
- default: master
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index 958fae1..485b95e 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -15,21 +15,3 @@
is_admin: true
password: ${_param:keystone_cinder_password}
email: ${_param:admin_email}
- service:
- cinder:
- type: volume
- description: OpenStack Volume Service
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8776
- public_path: '/v1/$(project_id)s'
- internal_address: ${_param:cinder_service_host}
- internal_port: 8776
- internal_path: '/v1/$(project_id)s'
- internal_protocol: ${_param:cinder_service_protocol}
- admin_protocol: ${_param:cinder_service_protocol}
- admin_address: ${_param:cinder_service_host}
- admin_port: 8776
- admin_path: '/v1/$(project_id)s'
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index b8ab7f1..74d3e5b 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -2,6 +2,7 @@
- system.keystone.client.os_client_config.admin_identity
- system.keystone.client.service.cinder
- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
- system.keystone.client.service.glance
- system.keystone.client.service.heat
- system.keystone.client.service.heat-cfn
diff --git a/keystone/client/v3/service/cinder.yml b/keystone/client/v3/service/cinder.yml
index bfb0e70..30a159f 100644
--- a/keystone/client/v3/service/cinder.yml
+++ b/keystone/client/v3/service/cinder.yml
@@ -14,20 +14,3 @@
service_admin:
name: admin
project_id: service
- services:
- cinder:
- type: volume
- description: OpenStack Volume Service
- endpoints:
- cinder_public_v1:
- interface: 'public'
- url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:8776/v1/$(project_id)s
- region: ${_param:openstack_region}
- cinder_internal_v1:
- interface: 'internal'
- url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776/v1/$(project_id)s
- region: ${_param:openstack_region}
- cinder_admin_v1:
- interface: 'admin'
- url: ${_param:cinder_service_protocol}://${_param:cinder_service_host}:8776/v1/$(project_id)s
- region: ${_param:openstack_region}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 52a91ea..18227df 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -3,7 +3,6 @@
- service.haproxy.proxy.single
- service.neutron.control.cluster
- system.haproxy.proxy.listen.openstack.neutron
-- system.galera.server.database.neutron
- system.salt.minion.cert.mysql.clients.openstack.neutron
- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 5cf06bf..e47aa2c 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -1,6 +1,5 @@
classes:
- system.neutron.control.single
-- system.galera.server.database.neutron
parameters:
neutron:
server:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 40bdea3..2210f2f 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -1,6 +1,5 @@
classes:
- service.neutron.control.single
-- system.galera.server.database.neutron
- system.salt.minion.cert.mysql.clients.openstack.neutron
- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters: