Merge "Add maas boot_sources|bss_xenial mirror"
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 00a8263..0a590cf 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -14,7 +14,7 @@
verbose: true
region: ${_param:openstack_region}
database:
- engine: "mysql+pymysql"
+ engine: "mysql"
host: ${_param:openstack_database_address}
port: 3306
name: aodh
diff --git a/horizon/server/plugin/contrail.yml b/horizon/server/plugin/contrail.yml
index 03da87e..9166bce 100644
--- a/horizon/server/plugin/contrail.yml
+++ b/horizon/server/plugin/contrail.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ opencontrail_version: 3.2
horizon:
server:
plugin:
@@ -6,8 +8,9 @@
source:
engine: pkg
name: openstack-dashboard-contrail-panels
+ opencontrail_version: ${_param:opencontrail_version}
horizon_overrides:
overrides:
- contrail_openstack_dashboard
openstack_neutron_network:
- enable_fip_topology_check: False
\ No newline at end of file
+ enable_fip_topology_check: False
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index 2ac90bb..55c7f88 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -97,7 +97,6 @@
type: string
default: "${_param:jenkins_aptly_storages}"
description: "Comma separated list of storage"
- job_template:
aptly-all:
name: aptly-{{operation}}-all-{{source}}-{{target}}
jobs:
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index c1b193d..04a805a 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -28,8 +28,12 @@
type: choice
description: "Context for coockiecutter template specified as filename."
choices:
- - openstack_ovs_non-dvr_vlan
- - openstack_ovs_non-dvr_vxlan
+ - openstack-ovs-core-pike
+ - openstack-ovs-core-ssl-pike
+ - openstack-ovs-core-barbican-pike
+ - openstack-ovs-core-manila-pike
+ - openstack-ovs-core-telemetry-pike
+ - openstack-ovs-core-queens
STACK_INSTALL:
type: string
default: 'core,openstack,ovs'
@@ -69,3 +73,57 @@
type: boolean
description: "Delete Heat stack when finished (bool)"
default: 'false'
+ oscore-test-cookiecutter-models:
+ display_name: oscore-test-cookiecutter-models
+ name: oscore-test-cookiecutter-models
+ concurrent: true
+ 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-cookiecutter-models-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "^mk/cookiecutter-templates$":
+ compare_type: 'REG_EXP'
+ branches:
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ description: "ID of jenkins credentials to be used when connecting to gerrit."
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-oscore-ci"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ TEST_SCHEME:
+ type: text
+ description: "Yaml based scheme to test specific models."
+ default: |-
+ openstack-ovs-core-pike:
+ run_smoke: true
+ stack_install: 'core,openstack,ovs'
diff --git a/keepalived/cluster/instance/kube_api_server_vip.yml b/keepalived/cluster/instance/kube_api_server_vip.yml
new file mode 100644
index 0000000..7e03d25
--- /dev/null
+++ b/keepalived/cluster/instance/kube_api_server_vip.yml
@@ -0,0 +1,25 @@
+applications:
+- keepalived
+classes:
+- service.keepalived.support
+parameters:
+ _param:
+ keepalived_vip_priority: 101
+ keepalived_kube_apiserver_vrrp_script_content: "pidof haproxy && systemctl status kube-apiserver.service --quiet --no-pager"
+ keepalived:
+ cluster:
+ vrrp_scripts:
+ k8s_vip:
+ content: ${_param:keepalived_kube_apiserver_vrrp_script_content}
+ interval: 10
+ rise: 1
+ fall: 1
+ enabled: true
+ instance:
+ kube_apiserver_vip:
+ address: ${_param:keepalived_k8s_apiserver_vip_address}
+ password: ${_param:keepalived_k8s_apiserver_vip_password}
+ interface: ${_param:keepalived_k8s_apiserver_vip_interface}
+ virtual_router_id: 60
+ priority: ${_param:keepalived_vip_priority}
+ track_script: k8s_vip
\ No newline at end of file
diff --git a/openssh/server/team/members/vblokhin.yml b/openssh/server/team/members/vblokhin.yml
new file mode 100644
index 0000000..74ae49c
--- /dev/null
+++ b/openssh/server/team/members/vblokhin.yml
@@ -0,0 +1,21 @@
+parameters:
+ linux:
+ system:
+ user:
+ vblokhin:
+ enabled: true
+ name: vblokhin
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Volodymyr Blokhin
+ home: /home/vblokhin
+ email: vblokhin@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ vblokhin:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY5F0bDcbiCtO5HkwIVgjwAwCHcTRDZwEIE5cwuGlXNKWk9JtlDKh724Dp8f/Yny1e30Kt9oqs23bv6xfMh4pU4vrajjSv9f+s3hCSs1X9JrlEw92CD7r+jpq2R0vz3ufeHZWSWmeMsRR62BodtYy4EkoyPKvq16guq745KHTYgATm/qJgCkjQ5lxca280i0z14Fv+JOtVxrk52xMTxHS+N6wzVOjuEjBbW2vyktsV/RidT/SoJAVMHoPISjJTR+q5usVuKb6J5U83Y2vbmUCnygAnPX6l9k8atsAvwl1v54QxWE6Qz61kMPpwZZ56BNGhCZ458HqqXiybx4lU4PN6eg/zPA9Eq+xj5ZoXaUK1hg2UpJrmrtCh8H4T+/dPySZ+HMDBp221DCuH43x9No6V0QWhifhHPaGWyeK+mGsznbaSnlZ0QxRun5qWgjG7xHu97zgxjlyxmQII8FWGaOSuv/w6jg894A4jcsDfH5oxDbgVTbqqZG9o7TszIXKTImt1f2fmKKr/CT7ixwIKO3MioUNu3PoQ/GhmKajqugV+TIRe4vJ2FD5hl11ythzLlZCchzlEoymap4P6Y5dMh60YErCtYftn7jATJKSq9EHiLEeTIQDBVqhJzdS9/QWAXBV97mNX7mib1dO0H9TBZu1mYMZio7udbx9oursrVPq3fw== vblokhin@mirantis.com
+ user: ${linux:system:user:vblokhin}
+
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index a704e04..c695232 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -15,6 +15,7 @@
- system.openssh.server.team.members.tjaroszyk
- system.openssh.server.team.members.sburns
- system.openssh.server.team.members.yisakov
+- system.openssh.server.team.members.vblokhin
parameters:
_param:
linux_system_user_sudo: true