Merge "Scripts approval updated"
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index d4ec5da..cfd93f7 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -3,6 +3,7 @@
parameters:
ceilometer:
agent:
+ region: ${_param:openstack_region}
enabled: true
version: ${_param:ceilometer_version}
secret: ${_param:ceilometer_secret_key}
diff --git a/glusterfs/client/volume/aptly.yml b/glusterfs/client/volume/aptly.yml
index c894428..1c252e3 100644
--- a/glusterfs/client/volume/aptly.yml
+++ b/glusterfs/client/volume/aptly.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ aptly_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
aptly:
path: /srv/volumes/aptly
- server: ${_param:cluster_node01_address}
+ server: ${_param:aptly_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/client/volume/artifactory.yml b/glusterfs/client/volume/artifactory.yml
index 056ff82..f9c951e 100644
--- a/glusterfs/client/volume/artifactory.yml
+++ b/glusterfs/client/volume/artifactory.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ artifactory_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
artifactory:
path: /srv/volumes/artifactory
- server: ${_param:cluster_node01_address}
+ server: ${_param:artifactory_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/client/volume/gerrit.yml b/glusterfs/client/volume/gerrit.yml
index 9cbef86..6199aa6 100644
--- a/glusterfs/client/volume/gerrit.yml
+++ b/glusterfs/client/volume/gerrit.yml
@@ -1,10 +1,12 @@
parameters:
+ _param:
+ gerrit_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
gerrit:
path: /srv/volumes/gerrit
- server: ${_param:cluster_node01_address}
+ server: ${_param:gerrit_glusterfs_service_host}
opts: 'defaults'
user: 1000
group: 1000
diff --git a/glusterfs/client/volume/jenkins.yml b/glusterfs/client/volume/jenkins.yml
index 5f804fe..cb6cea7 100644
--- a/glusterfs/client/volume/jenkins.yml
+++ b/glusterfs/client/volume/jenkins.yml
@@ -1,10 +1,12 @@
parameters:
+ _param:
+ jenkins_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
jenkins:
path: /srv/volumes/jenkins
- server: ${_param:cluster_node01_address}
+ server: ${_param:jenkins_glusterfs_service_host}
opts: 'defaults'
user: 1000
group: 1000
diff --git a/glusterfs/client/volume/mysql.yml b/glusterfs/client/volume/mysql.yml
index ebd91fd..a6458c6 100644
--- a/glusterfs/client/volume/mysql.yml
+++ b/glusterfs/client/volume/mysql.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ mysql_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
mysql:
path: /srv/volumes/mysql
- server: ${_param:cluster_node01_address}
+ server: ${_param:mysql_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/client/volume/openldap.yml b/glusterfs/client/volume/openldap.yml
index ada164e..792f15f 100644
--- a/glusterfs/client/volume/openldap.yml
+++ b/glusterfs/client/volume/openldap.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ openldap_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
openldap:
path: /srv/volumes/openldap
- server: ${_param:cluster_node01_address}
+ server: ${_param:openldap_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/client/volume/postgresql.yml b/glusterfs/client/volume/postgresql.yml
index 1867d82..d2337e7 100644
--- a/glusterfs/client/volume/postgresql.yml
+++ b/glusterfs/client/volume/postgresql.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ postgresql_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
postgresql:
path: /srv/volumes/postgresql
- server: ${_param:cluster_node01_address}
+ server: ${_param:postgresql_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/client/volume/registry.yml b/glusterfs/client/volume/registry.yml
index 4b5d664..875895a 100644
--- a/glusterfs/client/volume/registry.yml
+++ b/glusterfs/client/volume/registry.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ registry_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
registry:
path: /srv/volumes/registry
- server: ${_param:cluster_node01_address}
+ server: ${_param:registry_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/client/volume/salt.yml b/glusterfs/client/volume/salt.yml
index f94b316..c3a9570 100644
--- a/glusterfs/client/volume/salt.yml
+++ b/glusterfs/client/volume/salt.yml
@@ -1,8 +1,10 @@
parameters:
+ _param:
+ salt_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
saltmaster:
path: /etc/salt/pki/master
- server: ${_param:cluster_node01_address}
+ server: ${_param:salt_glusterfs_service_host}
opts: 'defaults'
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index fdc90b9..ce1916a 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -14,25 +14,25 @@
port: ${_param:jenkins_master_port}
user: ${_param:jenkins_client_user}
password: ${_param:jenkins_client_password}
- plugins:
- slack:
- extended-choice-parameter:
- rebuild:
- test-stability:
- build-blocker-plugin:
- heavy-job:
- workflow-cps:
- workflow-remote-loader:
- workflow-scm-step:
- docker-workflow:
- gerrit-trigger:
- pipeline-utility-steps:
- discard-old-build:
- ansicolor:
- timestamper:
- build-user-vars-plugin:
- description-setter:
- build-monitor-plugin:
- categorized-view:
- monitoring:
- matrix-auth:
+ plugin:
+ slack: {}
+ extended-choice-parameter: {}
+ rebuild: {}
+ test-stability: {}
+ build-blocker-plugin: {}
+ heavy-job: {}
+ workflow-cps: {}
+ workflow-remote-loader: {}
+ workflow-scm-step: {}
+ docker-workflow: {}
+ gerrit-trigger: {}
+ pipeline-utility-steps: {}
+ discard-old-build: {}
+ ansicolor: {}
+ timestamper: {}
+ build-user-vars-plugin: {}
+ description-setter: {}
+ build-monitor-plugin: {}
+ categorized-view: {}
+ monitoring: {}
+ matrix-auth: {}
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index b6398ce..c428b84 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,6 +1,3 @@
-classes:
- - system.jenkins.client.job.common
-
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/common.yml b/jenkins/client/job/common.yml
deleted file mode 100644
index c92d623..0000000
--- a/jenkins/client/job/common.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-parameters:
- _param:
- jenkins_gerrit_url: "ssh://jenkins-mk@gerrit.mcp.mirantis.net:29418"
- jenkins_pipeline_libs: "${_param:jenkins_gerrit_url}/tcp/ccp-pipeline-libs"
- jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
- jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
- jenkins_aptly_api_url: "http://10.10.100.85:8081"
- jenkins_aptly_url: "http://apt-mk.mirantis.com"
- jenkins_pollscm_spec: "H/60 * * * *"
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 137d4ea..941c9b4 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 86a5990..f63032c 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/debian/packages/horizon/themes.yml b/jenkins/client/job/debian/packages/horizon/themes.yml
index b94518c..a8f8ac2 100644
--- a/jenkins/client/job/debian/packages/horizon/themes.yml
+++ b/jenkins/client/job/debian/packages/horizon/themes.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index f8e8991..f703e7b 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index f848660..7dd70ea 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/git-mirrors/upstream.yml b/jenkins/client/job/git-mirrors/upstream.yml
index 939eb20..f4f7f50 100644
--- a/jenkins/client/job/git-mirrors/upstream.yml
+++ b/jenkins/client/job/git-mirrors/upstream.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/image/centos.yml b/jenkins/client/job/image/centos.yml
index e4b9b72..852f695 100644
--- a/jenkins/client/job/image/centos.yml
+++ b/jenkins/client/job/image/centos.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
jenkins:
client:
job:
@@ -67,4 +69,4 @@
default: "true"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
\ No newline at end of file
+ default: "liberty"
diff --git a/jenkins/client/job/image/debian.yml b/jenkins/client/job/image/debian.yml
index 317c5df..7c996f3 100644
--- a/jenkins/client/job/image/debian.yml
+++ b/jenkins/client/job/image/debian.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
jenkins:
client:
job:
diff --git a/jenkins/client/job/image/ubuntu.yml b/jenkins/client/job/image/ubuntu.yml
index e49bda0..504702c 100755
--- a/jenkins/client/job/image/ubuntu.yml
+++ b/jenkins/client/job/image/ubuntu.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
jenkins:
client:
job:
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index d4960a4..0ac7b50 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -1,5 +1,3 @@
-classes:
- - system.jenkins.client.job.common
parameters:
jenkins:
client:
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index a550d3f..69cb4e7 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -1,6 +1,6 @@
-classes:
- - system.jenkins.client.job.common
parameters:
+ _param:
+ jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
jenkins:
client:
job_template:
@@ -29,7 +29,7 @@
os: ubuntu
dist: trusty
branch: R3.1.1.x
- ppa: irantis/mopencontrail-3.1.1
+ ppa: mirantis/opencontrail-3.1.1
upload_source_package: true
- buildname: oc311
os: ubuntu
diff --git a/jenkins/client/job/opencontrail/git-mirrors/2way.yml b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
index 989ef68..0ecb83f 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/2way.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
@@ -1,6 +1,6 @@
-classes:
- - system.jenkins.client.job.common
parameters:
+ _param:
+ jenkins_pollscm_spec: "H/60 * * * *"
jenkins:
client:
job:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index 1cdb7e8..0cf3a33 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -1,6 +1,6 @@
-classes:
- - system.jenkins.client.job.common
parameters:
+ _param:
+ jenkins_pollscm_spec: "H/60 * * * *"
jenkins:
client:
job_template:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index 303b035..ece2182 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -1,6 +1,7 @@
-classes:
- - system.jenkins.client.job.common
parameters:
+ _param:
+ jenkins_pollscm_spec: "H/60 * * * *"
+ jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
jenkins:
client:
job_template:
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 9b7bb78..0ea3d7b 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ jenkins_pollscm_spec: "H/60 * * * *"
jenkins:
client:
job_template:
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index 2ff917b..7ee7b94 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.yml
@@ -1,6 +1,6 @@
-classes:
- - system.jenkins.client.job.common
parameters:
+ _param:
+ jenkins_pollscm_spec: "H/60 * * * *"
jenkins:
client:
job_template:
diff --git a/neutron/control/opencontrail/cluster.yml b/neutron/control/opencontrail/cluster.yml
index 05b7e33..5baa97e 100644
--- a/neutron/control/opencontrail/cluster.yml
+++ b/neutron/control/opencontrail/cluster.yml
@@ -35,7 +35,7 @@
password: ${_param:mysql_neutron_password}
identity:
engine: keystone
- region: RegionOne
+ region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
port: 35357
user: neutron
@@ -63,4 +63,4 @@
contrail:
version: ${_param:opencontrail_version}
-
+
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index 1726029..a3fefc3 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -41,7 +41,7 @@
identity:
engine: keystone
version: '2.0'
- region: RegionOne
+ region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
port: 35357
user: admin
@@ -101,4 +101,4 @@
port: 9042
network:
engine: neutron
- host: ${_param:cluster_vip_address}
\ No newline at end of file
+ host: ${_param:cluster_vip_address}
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 0ac1033..ff38474 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -26,6 +26,18 @@
sudo: true
full_name: Oleksandr Kosse
home: /home/okosse
+ yshapovalov:
+ enabled: true
+ name: yshapovalov
+ sudo: true
+ full_name: Yevgeniy Shapovalov
+ home: /home/yshapovalov
+ dderyabin:
+ enabled: true
+ name: dderyabin
+ sudo: true
+ full_name: Denis Deryabin
+ home: /home/dderyabin
group:
libvirtd:
enabled: true
@@ -54,6 +66,16 @@
public_keys:
- ${public_keys:okosse}
user: ${linux:system:user:okosse}
+ yshapovalov:
+ enabled: true
+ public_keys:
+ - ${public_keys:yshapovalov}
+ user: ${linux:system:user:yshapovalov}
+ dderyabin:
+ enabled: true
+ public_keys:
+ - ${public_keys:dderyabin}
+ user: ${linux:system:user:dderyabin}
public_keys:
ddmitriev:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuD4wJ8hzkchQ0pfgdwWukQyps1xYRfHOsjosmDu/mmgaXVud5mnpwb2q35E2YYTox2mx+ulJqyS+099gz6MPg4P8D5qdMuRbAsJqbceLaaIGQhdT8qgSo7ESrl5pwvYnfWzKLKF0z5s7nrW0nvArC40zhV9o9XpvzzzSFByepWfkwA8ReldGUYVvTKp8YXaCrqEdMZrU42adPM2nl+fYBbGF+h4/Ka247aVjPeER0blV3znFXbv2Kf38G+i/TEGaktgpBdtGGDi1tX2loMypmTJeqZRJnM0Eoly0BnynB7CSxn11eoIXBUe1mVYNqmQd1hw6uh59iymhK5j939v9J ddmitriev@dis_xcom
@@ -63,3 +85,7 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLtOIkzqNA3wdLQyQxLRaRwi4oXnRCPCsrn8oaAyxDXHhU3+ATGvXBdbkA6xU3d4hAohru5DwxGzyikzAAtrv79GWA9/ryXPcplmxBiJcN36GyfW6eX89hI1VIJMKMG3cUs0ONf2D+hENhbaO0pu4hNAb5HFcHAuqecQNOFFrJ3RqnWM8RWgJPY3iF1A9JnXwVrUgME962VPlydYvlL5mLk+h+4DgHuPipw/Qana5a2JfdErsPYeAdDwG8frCdA9wvMzVVZv78s0lA6BritQdd0SyZejbOlT9KVHhSOhqnWdCtd8+nZXzXgjV7GAiv7H9yE4Ee6QYSHUQHwJxZs3ZT tleontovich@tleontovich-pc
okosse:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmb5FWl6dgK09TmxVYuvmfLyy6G9x2ed6dvXf0kfpMaaP37CST7t0UZ2m23qGF4T0ZGYbCkIdr+6zWG+a5ozuJiqoJwE3dLun8pnCwAjkmUxRyVIi9M6f3us4z+ooBZTBGWTGe7/ryqePpzyAjlw4om23pDTt09YQq5WDirdrFBNJ9ZlTwubbEWMTtHW5XMEui7s1IiggYmHI4cVh0lg7k/neoAk/5ZD9LI9+p2sISCOpD/f7C/BkgVd/4iCFNxXsPmMwRadBVYo8diB0OOekM6qsW5rfPCczCi9oavxjy62Z2XZ6wHPZ3HgeK8MhVJaRGge6zMTnB98aYh9LWfXFv okosse@okosse-pc
+ yshapovalov:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvKNMfHlugrEUMtDDJzZb3T1UzThOp/UtvQvyFTf1rlKN/i14b1cCVmbPaSKR6W4bqZ4YLnRfb5Z66ktEACL02RdC4FkCiGa8yFDAGXLbM2WJhHyA3ksu91z3wK2QRuKJuZuvjmelds1shTK1a31LgTqa7CNPfkfE9h+CsAizZfAhHg1yVqg0/CGKP8+iV8owR5MP9t8+JXTC40G6Qkjzrf/vuA13bT1X+JSWzLoI2OefezZ+X128fLkssPkr4IS1Jg+cbRvSRmGTVjvtk4dnDo3QxF5lUl6JZAUjPslMCxaqDvRFXn86UZ74g6iJ5dZjrU0vn6X+Ov+KVYmZ5znd yshapovalov@ys-pc
+ dderyabin:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQCljOKDvsoOsQFOsabL68kVTlzZOObP9d13Oqc7Lafew1MJx0uaCjabpfcaSOrLrqYu42akkpnHQ0ypQbzRWDREYWKciKmE1TKzRUTXZIF1FNNoFrDT7FfjrKVP42alk4isB0Yj9mvA6AhJGFM7pAy55dVEII30Rc0wKW6XCBAX8fIq3rHDnDYq7KuaSAtxkqj6u/C9eUcGBB+JIQ0NRhTVyIZlqjNeojXoM7py8pGDnGj54bIbpFtYiLU1hbowKfVVcJgHIE+17KsNvR7HwwZZ5lbUxzrOiOnoBq1JKF15JHQ3el358aKw3Ee7rqmVrHszohEBLfxRbWbACoTUem75 denis@usvbox