Merge "Added jenkins default network to compose file"
diff --git a/ceph/backup/client/single.yml b/ceph/backup/client/single.yml
new file mode 100644
index 0000000..c3afe96
--- /dev/null
+++ b/ceph/backup/client/single.yml
@@ -0,0 +1,3 @@
+classes:
+- service.ceph.backup.client
+- system.openssh.client.root
\ No newline at end of file
diff --git a/ceph/backup/server/single.yml b/ceph/backup/server/single.yml
new file mode 100644
index 0000000..ca36297
--- /dev/null
+++ b/ceph/backup/server/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.backup.server
diff --git a/fluentd/label/default_output/file.yml b/fluentd/label/default_output/file.yml
index c67e1e0..80707d3 100644
--- a/fluentd/label/default_output/file.yml
+++ b/fluentd/label/default_output/file.yml
@@ -4,7 +4,6 @@
fluentd:
agent:
config:
- dollar: '$'
label:
default_output:
filter:
@@ -18,9 +17,9 @@
- name: environment_label
value: ${_param:cluster_domain}
- name: Hostname
- value: ${fluentd:config:dollar}{ hostname }
+ value: ${fluentd:dollar}{ hostname }
- name: Timestamp
- value: ${fluentd:config:dollar}{ time.strftime('%Y-%m-%dT%H:%M:%S%z') }
+ value: ${fluentd:dollar}{ time.strftime('%Y-%m-%dT%H:%M:%S%z') }
match:
everything:
tag: '**'
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 3eeac91..5de6055 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -8,6 +8,7 @@
jenkins_client_password: none
jenkins_master_host: ${_param:control_vip_address}
jenkins_master_port: 8081
+ jenkins_aptly_storages: "local"
jenkins:
client:
master:
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index 83b70cb..921e9bc 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -96,3 +96,59 @@
type: string
default: "${_param:jenkins_aptly_storages}"
description: "Comma separated list of storage"
+ job_template:
+ aptly-all:
+ name: aptly-{{operation}}-all-{{source}}-{{target}}
+ jobs:
+ - operation: promote
+ diff_only: false
+ source: nightly
+ target: testing
+ - operation: promote
+ diff_only: false
+ source: testing
+ target: stable
+ template:
+ discard:
+ build:
+ keep_num: 25
+ artifact:
+ keep_num: 25
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: aptly-promote-pipeline.groovy
+ param:
+ SOURCE:
+ type: string
+ default: "(.*)/{{source}}"
+ TARGET:
+ type: string
+ default: "{0}/{{target}}"
+ RECREATE:
+ type: boolean
+ default: 'false'
+ DUMP_PUBLISH:
+ type: boolean
+ default: 'true'
+ DIFF_ONLY:
+ type: boolean
+ default: '{{diff_only}}'
+ APTLY_URL:
+ type: string
+ default: "${_param:jenkins_aptly_api_url}"
+ COMPONENTS:
+ type: string
+ default: "all"
+ description: "Comma separated list (,)"
+ PACKAGES:
+ type: string
+ default: "all"
+ description: "Comma separated list (,)"
+ STORAGES:
+ type: string
+ default: "${_param:jenkins_aptly_storages}"
+ description: "Comma separated list of storage"
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index 158816a..aa56cfc 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -7,10 +7,6 @@
git-mirror-2way-common:
name: git-mirror-2way-{{name}}
jobs:
- - name: salt-formulas-scripts
- source: salt-formulas/salt-formulas-scripts
- target: salt-formulas/salt-formulas-scripts
- branches: "master"
- name: mcp-common-scripts
source: mcp/mcp-common-scripts
target: Mirantis/mcp-common-scripts
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 2de63a5..ab7c4fd 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -263,40 +263,68 @@
BRANCHES:
type: string
default: "{{branches}}"
- git-mirror-2way:
- name: git-mirror-2way-{{name}}
- jobs:
- - name: salt-formulas-scripts
- branches: master
- template:
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- credentials: "gerrit"
- script: git-mirror-2way-pipeline.groovy
- github:
- url: "https://github.com/salt-formulas/{{name}}"
- trigger:
- github:
- pollscm:
- spec: ${_param:jenkins_pollscm_spec}
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}.git"
- TARGET_URL:
- type: string
- default: "https://github.com/salt-formulas/{{name}}.git"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- BRANCHES:
- type: string
- default: "{{branches}}"
+ job:
+ git-mirror-2way-salt-formulas-scripts:
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: git-mirror-2way-pipeline.groovy
+ github:
+ url: "https://github.com/salt-formulas/salt-formulas-scripts"
+ trigger:
+ github:
+ pollscm:
+ spec: ${_param:jenkins_pollscm_spec}
+ param:
+ SOURCE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-scripts.git"
+ TARGET_URL:
+ type: string
+ default: "https://github.com/salt-formulas/salt-formulas-scripts.git"
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ BRANCHES:
+ type: string
+ default: "master"
+ git-mirror-2way-salt-formulas-cookiecutter:
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: git-mirror-2way-pipeline.groovy
+ github:
+ url: "https://github.com/salt-formulas/salt-formulas-cookiecutter"
+ trigger:
+ github:
+ pollscm:
+ spec: ${_param:jenkins_pollscm_spec}
+ param:
+ SOURCE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-cookiecutter.git"
+ TARGET_URL:
+ type: string
+ default: "https://github.com/salt-formulas/salt-formulas-cookiecutter.git"
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ BRANCHES:
+ type: string
+ default: "master"
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index baa363a..465b75d 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -10,7 +10,7 @@
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key"
pin:
- - pin: 'release a=${_param:openstack_version}'
+ - pin: 'release l=${_param:openstack_version}'
priority: 1100
package: '*'
mk_openstack:
@@ -18,6 +18,6 @@
architectures: amd64
key_url: "http://apt.mirantis.com/public.gpg"
pin:
- - pin: 'release a=${_param:linux_system_repo_mk_openstack_version}'
+ - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
priority: 1100
package: '*'
diff --git a/linux/system/repo_local/mcp/openstack.yml b/linux/system/repo_local/mcp/openstack.yml
index a25cc57..08f1e67 100644
--- a/linux/system/repo_local/mcp/openstack.yml
+++ b/linux/system/repo_local/mcp/openstack.yml
@@ -7,6 +7,6 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release a=${_param:openstack_version}'
+ - pin: 'release l=${_param:openstack_version}'
priority: 1100
package: '*'
diff --git a/opencontrail/client/resource/global_vrouter_config.yml b/opencontrail/client/resource/global_vrouter_config.yml
index 15bf76e..9537775 100644
--- a/opencontrail/client/resource/global_vrouter_config.yml
+++ b/opencontrail/client/resource/global_vrouter_config.yml
@@ -2,7 +2,7 @@
opencontrail:
client:
global_vrouter_config:
- name: global-vrouter-config
+ name: default-global-vrouter-config
parent_type: global-system-config
encap_priority: "MPLSoUDP,MPLSoGRE"
vxlan_vn_id_mode: automatic
diff --git a/openssh/server/team/members/dbogaczyk.yml b/openssh/server/team/members/dbogaczyk.yml
new file mode 100644
index 0000000..109706c
--- /dev/null
+++ b/openssh/server/team/members/dbogaczyk.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ dbogaczyk:
+ enabled: true
+ name: dbogaczyk
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Dariusz Bogaczyk
+ home: /home/dbogaczyk
+ email: dbogaczyk@mirantis.com
+ openssh:
+ server:
+ user:
+ dbogaczyk:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC471IhcUC1BZlCWdD012E49P9BLGp08Tp45Zn2EQrSPuMUf6kuNyogU6ZSwRPvW9yzTd8DSNKEqr80hYyoX/SDURsKfZaw5iIKFWhj4M/0AODrx01h6Z6r+l4Oj7cgIe4Y24Qbkg0da9Z1nhy+QjKM7So6n+5IBwQLq0IyEuYkljnY7G1cjlDiw41f+S8euIHMZcOP86t+6UJswdwlLswXrF/QZOlkyXTl7N0Yf1z4ehpO8TpFfd9hdsO8Gh0pBfJ1P+ORveeowldDu9zIv4UUs8D8Q+nuujw2JB42XxiK0dq2xXvHUxwsg7+06gD0N5VHJOZTdJBtsEdOBFPO8GZj dbogaczyk@mirantis.com
+ user: ${linux:system:user:dbogaczyk}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 8f15552..ea34889 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -8,6 +8,7 @@
- system.openssh.server.team.members.korlowska
- system.openssh.server.team.members.miwinski
- system.openssh.server.team.members.mlos
+- system.openssh.server.team.members.dbogaczyk
parameters:
_param:
linux_system_user_sudo: true
diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index 7556dc9..aea524c 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -48,3 +48,12 @@
xxxxlarge:
- system:
size: 700000
+ huge:
+ - system:
+ size: 1000000
+ xhuge:
+ - system:
+ size: 1500000
+ xxhuge:
+ - system:
+ size: 3000000