Merge pull request #244 from Mirantis/pr/keystone_tenant_id2project_name
update deprecated 'tenant_id' argument
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index cfd93f7..135dbe8 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -16,8 +16,10 @@
password: ${_param:keystone_ceilometer_password}
message_queue:
engine: rabbitmq
- host: ${_param:openstack_message_queue_address}
- port: 5672
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index b5d8013..cfe54f9 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -26,8 +26,10 @@
password: ${_param:keystone_ceilometer_password}
message_queue:
engine: rabbitmq
- host: ${_param:openstack_message_queue_address}
- port: 5672
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 6df5290..868b71e 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -39,8 +39,10 @@
port: 9292
message_queue:
engine: rabbitmq
- host: ${_param:openstack_message_queue_address}
- port: 5672
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index cede74c..9c8f7c2 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -9,6 +9,9 @@
glance:
host: ${_param:openstack_control_address}
message_queue:
- host: ${_param:openstack_message_queue_address}
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
identity:
- host: ${_param:openstack_control_address}
\ No newline at end of file
+ host: ${_param:openstack_control_address}
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 5e6665c..3c73fa7 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -41,6 +41,8 @@
dist: trusty
- name: dekapod
dist: trusty
+ - name: designate
+ dist: trusty
- name: devops-portal
dist: trusty
- name: docker
@@ -221,6 +223,8 @@
dist: xenial
- name: dekapod
dist: xenial
+ - name: designate
+ dist: xenial
- name: devops-portal
dist: xenial
- name: docker
diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/mk/cleanup.yml
index 72e40f5..c2b32cc 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -35,3 +35,35 @@
HEAT_STACK_NAME:
type: string
description: This stack will be deleted.
+ delete-failed-stacks:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - delete failed stacks"
+ discard:
+ build:
+ keep_num: 20
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: delete-broken-stacks-pipeline.groovy
+ trigger:
+ timer:
+ spec: "0 H * * *"
+ param:
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://vpc.tcpisek.cz:5000/v2.0"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-qa-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mirantis_mk20_qa"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: "liberty"
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "2"
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 1bb0363..e912235 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -24,6 +24,7 @@
- name: chrony
- name: cinder
- name: collectd
+ - name: designate
- name: dekapod
- name: devops-portal
- name: docker
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index c7f11a0..6db4f7a 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -33,9 +33,11 @@
location: /var/lib/keystone/fernet-keys
message_queue:
engine: rabbitmq
- host: ${_param:openstack_message_queue_address}
- port: 5672
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
- ha_queues: true
\ No newline at end of file
+ ha_queues: true
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index 794682d..9c1d905 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -20,7 +20,10 @@
bind:
address: ${_param:cluster_local_address}
message_queue:
- host: ${_param:openstack_message_queue_address}
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
identity:
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
new file mode 100644
index 0000000..0fbea13
--- /dev/null
+++ b/openssh/server/team/members/achuprin.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ achuprin:
+ enabled: true
+ name: achuprin
+ sudo: true
+ full_name: Alexey Chuprin
+ home: /home/achuprin
+ email: achuprin@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ achuprin:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDho9gTE/kal/lx/edEa073OgsS5Fa+G3ffGUuhPKpqdXp3TfCKchAK1J13TsqW9lLpPLtnDo2OhgJSUwdr0pfNwVEBPldw0KblW/JQIImR/9nojU+IvribDdusRTOJh6i9hSzcLLFtrF8pkZ7S7oyGsOpD7pHoy+qNiDBO1eJ1fkOxkxztpqSjFFg6BaFtA40zLULsqgKIM0EsSgn3vFAQ2zsDWaGynnm/+tQvBj3ogrxblo94uZ+uUK6Z6v+jkZJKA5Nz+w76HAd51A646X3gF05i2LdyPpkWBp0Oqr5PVW66IGfyc+sY0ID35k+wT9tzv/aW4KOFtig5zf/Xv3nDbX0SlIrV5AMzk3pql2aCSE03JSkHb/Gujf1gqQ6ZqqbVFl7CSj2nIZ1DpWhGqw1lF6YH1pf/xbmg7qRAmDCelf/gCZaj9Pe6nA1a6CP5NJt5l3W20blaT5hYxHDqiBPOfTh8YGI16P1p7pV6VfBiQYZk5KGmOqVjIUfQH9axZcOgZjVmrFW8zZCg1VIA4qhYvVfFokL12ty3AiYkdIcDek3GH83LnLrkTX4D6PPzl6lF5f8bAiUfSjH5Yr2EmRxFWizi3LGiNe7QIxVQgB+B71luHG0ymy1Z080XJqZKMs/wosGxOJUiEvjd1i/jkImCNqlta3sBxnjJQRuzX3mUiQ== achuprin@mirantis.com
+ user: ${linux:system:user:achuprin}