Merge "Add possibility to build only some binaries for oc extra"
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 474deb9..ee5df33 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -4,6 +4,8 @@
- service.keepalived.cluster.single
- system.haproxy.proxy.listen.openstack.heat
parameters:
+ _param:
+ cluster_public_protocol: https
heat:
server:
stack_domain_admin:
@@ -28,14 +30,17 @@
user: heat
password: ${_param:mysql_heat_password}
metadata:
- host: ${_param:cluster_vip_address}
+ host: ${_param:cluster_public_host}
port: 8000
+ protocol: ${_param:cluster_public_protocol}
waitcondition:
- host: ${_param:cluster_vip_address}
+ host: ${_param:cluster_public_host}
port: 8000
+ protocol: ${_param:cluster_public_protocol}
watch:
- host: ${_param:cluster_vip_address}
+ host: ${_param:cluster_public_host}
port: 8003
+ protocol: ${_param:cluster_public_protocol}
identity:
engine: keystone
host: ${_param:cluster_vip_address}
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 6a5cb43..2056ee4 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -43,7 +43,7 @@
project:
"mk/docker-{{name}}":
branches:
- - {{branch}}
+ - "{{branch}}"
event:
patchset:
- created:
diff --git a/jenkins/client/job/git-mirrors/downstream/templates.yml b/jenkins/client/job/git-mirrors/downstream/templates.yml
new file mode 100644
index 0000000..50e9152
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/downstream/templates.yml
@@ -0,0 +1,13 @@
+classes:
+ - system.jenkins.client.job.git-mirrors.downstream
+parameters:
+ _param:
+ jenkins_git_mirror_downstream_jobs:
+ - name: cookiecutter-templates
+ downstream: mk/cookiecutter-templates
+ upstream: "https://github.com/Mirantis/mk2x-cookiecutter-reclass-model"
+ branches: master
+ - name: heat-templates
+ downstream: mk/heat-templates
+ upstream: "https://github.com/Mirantis/mk-lab-heat-templates"
+ branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/upstream/templates.yml b/jenkins/client/job/git-mirrors/upstream/templates.yml
new file mode 100644
index 0000000..12e4a9a
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/upstream/templates.yml
@@ -0,0 +1,13 @@
+classes:
+ - system.jenkins.client.job.git-mirrors.upstream
+parameters:
+ _param:
+ jenkins_git_mirror_upstream_jobs:
+ - name: cookiecutter-templates
+ downstream: mk/cookiecutter-templates
+ upstream: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model"
+ branches: master
+ - name: heat-templates
+ downstream: mk/heat-templates
+ upstream: "git@github.com:Mirantis/mk-lab-heat-templates"
+ branches: master
\ No newline at end of file
diff --git a/linux/system/repo/mos10.yml b/linux/system/repo/mos10.yml
new file mode 100644
index 0000000..63f6a9d
--- /dev/null
+++ b/linux/system/repo/mos10.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/ mos10.0 main restricted"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/archive-mos10.0.key"
+ mirantis_openstack_hotfix:
+ source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/ mos10.0-hotfix main restricted"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/archive-mos10.0.key"
+ mirantis_openstack_security:
+ source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/ mos10.0-security main restricted"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/archive-mos10.0.key"
+ mirantis_openstack_updates:
+ source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/ mos10.0-updates main restricted"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/archive-mos10.0.key"
\ No newline at end of file
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 545a432..1bcc8b9 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -71,4 +71,4 @@
mtu: 1500
tenant: service
metadata:
- password: metadataPass
+ password: ${_param:metadata_password}