Merge "Added gerrit auto abandon config"
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic.yml
deleted file mode 100644
index b4946e1..0000000
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
- _param:
- apt_mk_version: stable
- mirror_mirantis_openstack_xenial_elastic_source: http://apt.mirantis.com/xenial/elastic/2.x/
- mirror_mirantis_openstack_xenial_elastic_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_elastic_components: main
- mirror_mirantis_openstack_xenial_elastic_key_url: "http://apt.mirantis.com/public.gpg"
- mirror_mirantis_openstack_xenial_elastic_gpgkeys:
- - A76882D3
- aptly:
- server:
- mirror:
- mirantis_openstack_xenial_elastic:
- source: ${_param:mirror_mirantis_openstack_xenial_elastic_source}
- distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_distribution}
- components: ${_param:mirror_mirantis_openstack_xenial_elastic_components}
- architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_key_url}
- gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_gpgkeys}
- publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_elastic_components}
- distributions:
- - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
new file mode 100644
index 0000000..6b1c006
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_elastic_2x_source: http://apt.mirantis.com/xenial/elastic/2.x/
+ mirror_mirantis_openstack_xenial_elastic_2x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_elastic_2x_components: main
+ mirror_mirantis_openstack_xenial_elastic_2x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_elastic_2x:
+ source: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
+ distributions:
+ - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
new file mode 100644
index 0000000..d7e92c6
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_elastic_5x_source: http://apt.mirantis.com/xenial/elastic/5.x/
+ mirror_mirantis_openstack_xenial_elastic_5x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_elastic_5x_components: main
+ mirror_mirantis_openstack_xenial_elastic_5x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_elastic_5x:
+ source: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
+ distributions:
+ - ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/init.yml
new file mode 100644
index 0000000..f214330
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.elastic.2x
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.elastic.5x
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana.yml
deleted file mode 100644
index 40df719..0000000
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
- _param:
- apt_mk_version: stable
- mirror_mirantis_openstack_xenial_kibana_source: http://apt.mirantis.com/xenial/kibana/4.6/
- mirror_mirantis_openstack_xenial_kibana_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_kibana_components: "kibana-46"
- mirror_mirantis_openstack_xenial_kibana_key_url: "http://apt.mirantis.com/public.gpg"
- mirror_mirantis_openstack_xenial_kibana_gpgkeys:
- - A76882D3
- aptly:
- server:
- mirror:
- mirantis_openstack_xenial_kibana:
- source: ${_param:mirror_mirantis_openstack_xenial_kibana_source}
- distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_distribution}
- components: ${_param:mirror_mirantis_openstack_xenial_kibana_components}
- architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_key_url}
- gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_gpgkeys}
- publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_kibana_components}
- distributions:
- - ubuntu-xenial/kibana/4.6/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
new file mode 100644
index 0000000..815185b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_kibana_46_source: http://apt.mirantis.com/xenial/kibana/4.6/
+ mirror_mirantis_openstack_xenial_kibana_46_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_kibana_46_components: "kibana-46"
+ mirror_mirantis_openstack_xenial_kibana_46_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_kibana_46_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_kibana_46:
+ source: ${_param:mirror_mirantis_openstack_xenial_kibana_46_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_46_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_kibana_46_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_46_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_46_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_kibana_46_components}
+ distributions:
+ - ubuntu-xenial/kibana/4.6/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
new file mode 100644
index 0000000..c1b061e
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_kibana_5x_source: http://apt.mirantis.com/xenial/kibana/5.x/
+ mirror_mirantis_openstack_xenial_kibana_5x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_kibana_5x_components: "kibana-5x"
+ mirror_mirantis_openstack_xenial_kibana_5x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_kibana_5x:
+ source: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_components}
+ distributions:
+ - ubuntu-xenial/kibana/5.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/init.yml
new file mode 100644
index 0000000..dfd93bb
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana.46
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana.5x
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 1fa2ab3..a8d4fae 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -46,3 +46,141 @@
DOCKER_REGISTRY:
type: string
default: "docker-prod-local.docker.mirantis.net"
+ oscore-docker-image-systest-template:
+ name: "{{job_prefix}}-{{oscore-qa-project}}-image-systest-{{model}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-tempest-image-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ mcp/{{oscore-qa-project}}:
+ branches:
+ - compare_type: "PLAIN"
+ name: "master"
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ custom_url: '* $JOB_NAME $BUILD_URL'
+ param:
+ # general
+ BOOTSTRAP_EXTRA_REPO_PARAMS:
+ type: string
+ description: Extra repos for bootstrap stage
+ default: ""
+ CREDENTIALS_ID:
+ type: string
+ description: gerrit creds
+ default: "gerrit"
+ GERRIT_PROJECT_URL:
+ type: string
+ description: Url to project with docker image source
+ default: ""
+ GERRIT_BRANCH:
+ type: string
+ description: Branch of project with docker image source
+ default: ""
+ HEAT_STACK_ZONE:
+ type: string
+ description: AZ
+ default: "mcp-oscore-ci"
+ STACK_TEST_JOB:
+ type: string
+ description: Job for environment deployment
+ default: "{{stack_test_job}}"
+ STACK_TYPE:
+ type: string
+ default: "heat"
+ STACK_INSTALL:
+ type: string
+ description: components to install
+ default: 'core,openstack,ovs'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: '{{stack_reclass_address}}'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: '{{stack_reclass_branch}}'
+ description: 'Branch of repository with stack salt models'
+ STACK_CLEANUP_JOB:
+ type: string
+ default: "{{stack_cleanup_job}}"
+ # salt
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "{{formula_pkg_revision}}"
+ UPLOAD_CREDENTIALS_ID:
+ type: string
+ description: ID of credentials to connect to target host
+ default: "heat-env-ssh"
+ # 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-oscore-ci"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ # test
+ TEST_TEMPEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "{{tempest_conf}}"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{tempest_target}}"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ default: "{{model}}"
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ SALT_MASTER_IP:
+ type: string
+ description: Ip of env's salt master
+ default: ""
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 7a5c671..c022c28 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -314,8 +314,12 @@
description: Salt target to run tests
TEST_TEMPEST_IMAGE:
type: string
- description: Node to run tests
+ description: Url to tempest docker image
default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ LOCAL_TEMPEST_IMAGE:
+ type: string
+ description: Path to local docker image
+ default: ''
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic.yml b/linux/system/repo/mcp/apt_mirantis/elastic.yml
deleted file mode 100644
index da1b004..0000000
--- a/linux/system/repo/mcp/apt_mirantis/elastic.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- _param:
- apt_mk_version: stable
- linux_system_repo_mcp_elastic_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_elastic_version_number: "2.x"
- linux:
- system:
- repo:
- mcp_elastic:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/${_param:linux_system_repo_mcp_elastic_version_number}/ ${_param:linux_system_repo_mcp_elastic_version} main"
- architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
- clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_elastic_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
new file mode 100644
index 0000000..4add81e
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_2x:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/2.x/ ${_param:linux_system_repo_mcp_elastic_2x_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_2x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
new file mode 100644
index 0000000..8876c51
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_5x:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/5.x/ ${_param:linux_system_repo_mcp_elastic_5x_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/init.yml b/linux/system/repo/mcp/apt_mirantis/elastic/init.yml
new file mode 100644
index 0000000..a66b757
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.elastic.2x
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana.yml b/linux/system/repo/mcp/apt_mirantis/kibana.yml
deleted file mode 100644
index 078ebd8..0000000
--- a/linux/system/repo/mcp/apt_mirantis/kibana.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- _param:
- apt_mk_version: stable
- linux_system_repo_mcp_kibana_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_kibana_version_number: "4.6"
- linux:
- system:
- repo:
- mcp_kibana:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/${_param:linux_system_repo_mcp_kibana_version_number}/ ${_param:linux_system_repo_mcp_kibana_version} kibana-46"
- architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
- clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_kibana_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
new file mode 100644
index 0000000..f3795ad
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_46:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/4.6/ ${_param:linux_system_repo_mcp_kibana_46_version} kibana-46"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_46_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
new file mode 100644
index 0000000..e2f4795
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_5x:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/5.x/ ${_param:linux_system_repo_mcp_kibana_5x_version} kibana-5x"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/init.yml b/linux/system/repo/mcp/apt_mirantis/kibana/init.yml
new file mode 100644
index 0000000..daaf7ab
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.kibana.46
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic.yml
deleted file mode 100644
index 2646273..0000000
--- a/linux/system/repo_local/mcp/apt_mirantis/elastic.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- _param:
- apt_mk_version: stable
- linux_system_repo_mcp_elastic_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_elastic_version_number: "2.x"
- linux:
- system:
- repo:
- mcp_elastic:
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/elastic/${_param:linux_system_repo_mcp_elastic_version_number}/ ${_param:linux_system_repo_mcp_elastic_version} main"
- architectures: amd64
- key_url: "http://${_param:local_repo_url}/public.gpg"
- clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_elastic_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
new file mode 100644
index 0000000..3cade96
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_2x:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/elastic/2.x/ ${_param:linux_system_repo_mcp_elastic_2x_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_2x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
new file mode 100644
index 0000000..7349f72
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_5x:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/elastic/5.x/ ${_param:linux_system_repo_mcp_elastic_5x_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/init.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/init.yml
new file mode 100644
index 0000000..f356aa2
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.2x
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.5x
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana.yml
deleted file mode 100644
index c0ebe5a..0000000
--- a/linux/system/repo_local/mcp/apt_mirantis/kibana.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- _param:
- apt_mk_version: stable
- linux_system_repo_mcp_kibana_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_kibana_version_number: "4.6"
- linux:
- system:
- repo:
- mcp_kibana:
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/kibana/${_param:linux_system_repo_mcp_kibana_version_number}/ ${_param:linux_system_repo_mcp_kibana_version} kibana-46"
- architectures: amd64
- key_url: "http://${_param:local_repo_url}/public.gpg"
- clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_kibana_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
new file mode 100644
index 0000000..7fa87a0
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_46:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/kibana/4.6/ ${_param:linux_system_repo_mcp_kibana_46_version} kibana-46"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_46_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
new file mode 100644
index 0000000..2441568
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_5x:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/kibana/5.x/ ${_param:linux_system_repo_mcp_kibana_5x_version} kibana-5x"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/init.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/init.yml
new file mode 100644
index 0000000..fe9ec2e
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.46
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
\ No newline at end of file
diff --git a/nginx/server/proxy/openstack/glare.yml b/nginx/server/proxy/openstack/glare.yml
index ac16abc..898f622 100644
--- a/nginx/server/proxy/openstack/glare.yml
+++ b/nginx/server/proxy/openstack/glare.yml
@@ -12,7 +12,7 @@
underscores_in_headers: true
check: false
proxy:
- host: ${_param:nginx_proxy_openstack_api_proxy_host}
+ host: ${_param:glance_service_host}
port: 9494
protocol: http
size: 30000m