Merge "Glance take into account cluster_internal_protocol variable"
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index 742408d..71d8f9a 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -11,7 +11,7 @@
- name: mcp-common-scripts
source: mcp/mcp-common-scripts
target: Mirantis/mcp-common-scripts
- branches: "master"
+ branches: "master,release/2018.8.1"
- name: mcp-local-repo-model
source: mcp/mcp-local-repo-model
target: Mirantis/mcp-local-repo-model
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index 271a725..17611cb 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -8,8 +8,8 @@
- name: pipeline-library
downstream: mcp-ci/pipeline-library
upstream: "${_param:gerrit_pipeline_library_repo}"
- branches: master
+ branches: "master,release/2018.8.1"
- name: mk-pipelines
downstream: mk/mk-pipelines
upstream: "${_param:gerrit_mk_pipelines_repo}"
- branches: master
+ branches: "master,release/2018.8.1"
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
index 537cd3c..59904c2 100644
--- a/jenkins/client/job/k8s-test/init.yml
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -3,6 +3,8 @@
- system.jenkins.client.job.k8s-test.mcp-k8s-merge-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-dashboard-test-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-dashboard-merge-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-nginx-ingress-test-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-nginx-ingress-merge-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-metallb-test-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-metallb-merge-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-coredns-test-pipeline
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-nginx-ingress-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-nginx-ingress-merge-pipeline.yml
new file mode 100644
index 0000000..8236536
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-nginx-ingress-merge-pipeline.yml
@@ -0,0 +1,43 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+ mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
+ jenkins:
+ client:
+ job:
+ mcp_k8s_nginx_ingress_merge_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-nginx-ingress-merge-pipeline
+ display_name: "k8s nginx ingress 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-ingress-nginx-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/ingress-nginx:
+ 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: ${_param:mcp_docker_registry}
+ description: 'Docker registry for binaries and images'
+ KUBE_PROD_DOCKER_REGISTRY:
+ type: string
+ default: ${_param:mcp_prod_docker_registry}
+ description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-nginx-ingress-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-nginx-ingress-test-pipeline.yml
new file mode 100644
index 0000000..8730f0d
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-nginx-ingress-test-pipeline.yml
@@ -0,0 +1,48 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
+ jenkins:
+ client:
+ job:
+ mcp_k8s_nginx_ingress_test_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-nginx-ingress-test-pipeline
+ display_name: "k8s nginx ingress 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-ingress-nginx-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/ingress-nginx:
+ 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: ${_param:mcp_docker_registry}
+ description: 'Docker registry for binaries and images'
+
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 85c9ac8..f2efc67 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -456,7 +456,7 @@
default: "gerrit"
BRANCHES:
type: string
- default: "master"
+ default: "master,release/2018.8.1"
git-mirror-2way-salt-formulas-cookiecutter:
description: ${_param:job_description_2way}
discard:
diff --git a/kubernetes/common/addons/prometheus.yml b/kubernetes/common/addons/prometheus.yml
new file mode 100644
index 0000000..5f5fcea
--- /dev/null
+++ b/kubernetes/common/addons/prometheus.yml
@@ -0,0 +1,37 @@
+classes:
+- system.prometheus.server.container
+parameters:
+ _param:
+ kubernetes_prometheus_image: ${_param:mcp_docker_registry}/openstack-docker/prometheus:2018.8.0
+ kubernetes_prometheus_enabled: false
+ kubernetes_prometheus_namespace: stacklight
+ kubernetes_prometheus_server_resources_limits_memory: 500M
+ kubernetes_prometheus_server_resources_requests_memory: 500M
+ kubernetes_prometheus_server_bind_host_port: 31990
+ kubernetes_prometheus_server_storage_local_engine: persisted
+ kubernetes_prometheus_server_use_static_datadir: true
+ kubernetes:
+ common:
+ addons:
+ prometheus:
+ enabled: ${_param:kubernetes_prometheus_enabled}
+ image: ${_param:kubernetes_prometheus_image}
+ namespace: ${_param:kubernetes_prometheus_namespace}
+ server:
+ bind:
+ port: ${prometheus:server:bind:port}
+ host: ${prometheus:server:bind:address}
+ host_port: ${_param:kubernetes_prometheus_server_bind_host_port}
+ config:
+ config_dir: ${prometheus:server:dir:config_in_container}
+ host_config_dir: ${prometheus:server:dir:config}
+ data_dir: ${_param:prometheus_server_data_directory}
+ host_data_dir: ${prometheus:server:dir:data}
+ storage_local_engine: ${_param:kubernetes_prometheus_server_storage_local_engine}
+ storage_local_retention: ${prometheus:server:storage:local:retention}
+ use_static_datadir: ${_param:kubernetes_prometheus_server_use_static_datadir}
+ resources:
+ limits:
+ memory: ${_param:kubernetes_prometheus_server_resources_limits_memory}
+ requests:
+ memory: ${_param:kubernetes_prometheus_server_resources_requests_memory}
diff --git a/kubernetes/common.yml b/kubernetes/common/init.yml
similarity index 100%
rename from kubernetes/common.yml
rename to kubernetes/common/init.yml
diff --git a/neutron/client/service/public_v2.yml b/neutron/client/service/public_v2.yml
new file mode 100644
index 0000000..7c14248
--- /dev/null
+++ b/neutron/client/service/public_v2.yml
@@ -0,0 +1,24 @@
+classes:
+- service.neutron.client
+parameters:
+ neutron:
+ client:
+ resources:
+ v2:
+ admin_identity:
+ network:
+ public:
+ shared: True
+ router_external: True
+ default: True
+ provider_network_type: flat
+ provider_physical_network: physnet1
+ subnet:
+ public-subnet:
+ cidr: ${_param:openstack_public_neutron_subnet_cidr}
+ gateway_ip: ${_param:openstack_public_neutron_subnet_gateway}
+ allocation_pools:
+ - start: ${_param:openstack_public_neutron_subnet_allocation_start}
+ end: ${_param:openstack_public_neutron_subnet_allocation_end}
+ enable_dhcp: False
+ ip_version: 4
diff --git a/prometheus/server/init.yml b/prometheus/server/init.yml
index 5d115ac..cd511d4 100644
--- a/prometheus/server/init.yml
+++ b/prometheus/server/init.yml
@@ -2,10 +2,12 @@
_param:
prometheus_server_config_directory: /srv/prometheus
prometheus_server_data_directory: /data
+ prometheus_server_host_config_directory: /srv/volumes/local/prometheus/config
+ prometheus_server_host_data_directory: /srv/volumes/local/prometheus/data
prometheus:
server:
version: 2.0
dir:
- data: /srv/volumes/local/prometheus/data
- config: /srv/volumes/local/prometheus/config
+ data: ${_param:prometheus_server_host_data_directory}
+ config: ${_param:prometheus_server_host_config_directory}
config_in_container: ${_param:prometheus_server_config_directory}