Merge "Add 2way sync job for salt-formulas-scripts"
diff --git a/aptly/server/mirror/ubuntu/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index 2729acc..b8e83c2 100644
--- a/aptly/server/mirror/ubuntu/trusty/ceph.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ceph.yml
@@ -1,9 +1,12 @@
parameters:
+ _param:
+ ceph_version: luminous
+ apt_mk_version: stable
aptly:
server:
mirror:
ceph-trusty:
- source: http://download.ceph.com/debian-hammer
+ source: http://download.ceph.com/debian-${_param:ceph_version}
distribution: trusty
components: main
architectures: amd64
@@ -12,4 +15,4 @@
publisher:
component: ceph
distributions:
- - ubuntu-trusty/nightly
+ - ubuntu-trusty/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
new file mode 100644
index 0000000..944a590
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_extra:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: extra
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: extra
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml
index 0aad158..a2a848e 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/init.yml
@@ -1,79 +1,8 @@
-parameters:
- _param:
- apt_mk_version: stable
- aptly:
- server:
- mirror:
- # required for opencontrail formulas
- mcp_opencontrail_trusty_oc311:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc311
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc311
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
- mcp_opencontrail_trusty_oc31:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc31
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc31
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
- mcp_opencontrail_trusty_oc32:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc32
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc32
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
- mcp_opencontrail_trusty_oc323:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc323
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc323
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
- mirantis_openstack_trusty_extra:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: extra
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: extra
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
- mirantis_openstack_trusty_salt:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: salt
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: salt
- distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.oc31
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.oc311
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.oc32
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.oc323
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.mitaka
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.extra
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.salt
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
new file mode 100644
index 0000000..5b9bc63
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mk_openstack_xenial_mitaka:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: mitaka
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: mitaka
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
new file mode 100644
index 0000000..bae9875
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_trusty_oc31:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc31
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc31
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
new file mode 100644
index 0000000..d60f154
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_trusty_oc311:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc311
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc311
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
new file mode 100644
index 0000000..6fe8489
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_trusty_oc32:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc32
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc32
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
new file mode 100644
index 0000000..e4a9462
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_trusty_oc323:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc323
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc323
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
new file mode 100644
index 0000000..7588830
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_salt:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: salt
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: salt
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
deleted file mode 100644
index 3495967..0000000
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ /dev/null
@@ -1,297 +0,0 @@
-parameters:
- _param:
- linux_system_country_code: cz
- aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- aptly:
- server:
- mirror:
- # trusty
- trusty-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/trusty
- trusty-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/trusty
- trusty-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/trusty
- trusty-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/trusty
-
- # trusty-updates
- trusty-updates-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-updates
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/trusty-updates
- trusty-updates-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-updates
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/trusty-updates
- trusty-updates-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-updates
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/trusty-updates
- trusty-updates-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-updates
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/trusty-updates
-
- #trusty-security:
- trusty-security-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-security
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/trusty-security
- trusty-security-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-security
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/trusty-security
- trusty-security-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-security
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/trusty-security
- trusty-security-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-security
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/trusty-security
-
- #trusty-proposed:
- trusty-proposed-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-proposed
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/trusty-proposed
- trusty-proposed-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-proposed
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/trusty-proposed
- trusty-proposed-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-proposed
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/trusty-proposed
- trusty-proposed-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-proposed
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/trusty-proposed
-
- #trusty-backports:
- trusty-backports-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-backports
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/trusty-backports
- trusty-backports-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-backports
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/trusty-backports
- trusty-backports-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-backports
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/trusty-backports
- trusty-backports-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-backports
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/trusty-backports
-
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/init.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/init.yml
new file mode 100644
index 0000000..802f17b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/init.yml
@@ -0,0 +1,6 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-backports
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-proposed
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-security
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/init.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/init.yml
new file mode 100644
index 0000000..45fb000
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-backports.main
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-backports.multiverse
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-backports.restricted
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-backports.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
new file mode 100644
index 0000000..8edff1f
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-backports
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/trusty-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
new file mode 100644
index 0000000..1985b2d
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-backports
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/trusty-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
new file mode 100644
index 0000000..68c18be
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-backports
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/trusty-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
new file mode 100644
index 0000000..4bf2165
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-backports
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/trusty-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/init.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/init.yml
new file mode 100644
index 0000000..e749de0
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-proposed.main
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-proposed.multiverse
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-proposed.restricted
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-proposed.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
new file mode 100644
index 0000000..744e9c7
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-proposed
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/trusty-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
new file mode 100644
index 0000000..cd79014
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-proposed
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/trusty-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
new file mode 100644
index 0000000..c9c1966
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-proposed
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/trusty-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
new file mode 100644
index 0000000..2049b68
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-proposed
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/trusty-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/init.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/init.yml
new file mode 100644
index 0000000..3bf3204
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-security.main
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-security.multiverse
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-security.restricted
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-security.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
new file mode 100644
index 0000000..1068a48
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-security
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/trusty-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
new file mode 100644
index 0000000..db7b0ed
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-security
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/trusty-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
new file mode 100644
index 0000000..8c93486
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-security
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/trusty-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
new file mode 100644
index 0000000..bcc7da3
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-security
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/trusty-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/init.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/init.yml
new file mode 100644
index 0000000..0673363
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-updates.main
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-updates.multiverse
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-updates.restricted
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty-updates.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
new file mode 100644
index 0000000..8e86162
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-updates
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/trusty-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
new file mode 100644
index 0000000..1e6d543
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty-updates
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/trusty-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
new file mode 100644
index 0000000..278376d
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-updates
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/trusty-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
new file mode 100644
index 0000000..632abbb
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty-updates
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/trusty-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/init.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/init.yml
new file mode 100644
index 0000000..71ea5a0
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty.main
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty.multiverse
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty.restricted
+- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
new file mode 100644
index 0000000..08559a6
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/trusty
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
new file mode 100644
index 0000000..1748832
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: trusty
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/trusty
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
new file mode 100644
index 0000000..8004636
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/trusty
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
new file mode 100644
index 0000000..ac3ba70
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ trusty-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
+ distribution: trusty
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/trusty
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index efb1703..50afc3e 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph.yml
@@ -1,9 +1,12 @@
parameters:
+ _param:
+ ceph_version: luminous
+ apt_mk_version: stable
aptly:
server:
mirror:
ceph-xenial:
- source: http://download.ceph.com/debian-hammer
+ source: http://download.ceph.com/debian-${_param:ceph_version}
distribution: xenial
components: main
architectures: amd64
@@ -12,4 +15,4 @@
publisher:
component: ceph
distributions:
- - ubuntu-xenial/nightly
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
new file mode 100644
index 0000000..7231ac0
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_extra:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: extra
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: extra
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml
index c95e3e5..4e88f48 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/init.yml
@@ -1,79 +1,8 @@
-parameters:
- _param:
- apt_mk_version: stable
- aptly:
- server:
- mirror:
- # required for opencontrail formulas
- mcp_opencontrail_xenial_oc311:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc311
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc311
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
- mcp_opencontrail_xenial_oc31:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc31
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc31
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
- mcp_opencontrail_xenial_oc32:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc32
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc32
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
- mcp_opencontrail_xenial_oc323:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc323
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: oc323
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
- mirantis_openstack_xenial_extra:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: extra
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: extra
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
- mirantis_openstack_xenial_salt:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: salt
- architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
- publisher:
- component: salt
- distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.oc31
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.oc311
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.oc32
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.oc323
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.ocata
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.extra
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.salt
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
new file mode 100644
index 0000000..cbd4f29
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_xenial_oc31:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc31
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc31
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
new file mode 100644
index 0000000..bfa1638
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_xenial_oc311:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc311
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc311
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
new file mode 100644
index 0000000..40ca5d1
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_xenial_oc32:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc32
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc32
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
new file mode 100644
index 0000000..2275c07
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mcp_opencontrail_xenial_oc323:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc323
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc323
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
new file mode 100644
index 0000000..fc0e512
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mk_openstack_xenial_ocata:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: ocata
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: ocata
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
new file mode 100644
index 0000000..f5e4ca4
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_salt:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: salt
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: salt
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
deleted file mode 100644
index 6b41aee..0000000
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ /dev/null
@@ -1,293 +0,0 @@
-parameters:
- _param:
- linux_system_country_code_default: cz
- linux_system_country_code: ${_param:linux_system_country_code_default}
- aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
- aptly:
- server:
- mirror:
- # xenial
- xenial-main:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/xenial
- xenial-multiverse:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/xenial
- xenial-restricted:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/xenial
- xenial-universe:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/xenial
-
- # xenial-updates
- xenial-updates-main:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-updates
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/xenial-updates
- xenial-updates-multiverse:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-updates
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/xenial-updates
- xenial-updates-restricted:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-updates
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/xenial-updates
- xenial-updates-universe:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-updates
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/xenial-updates
-
- #xenial-security:
- xenial-security-main:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-security
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/xenial-security
- xenial-security-multiverse:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-security
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/xenial-security
- xenial-security-restricted:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-security
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/xenial-security
- xenial-security-universe:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-security
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/xenial-security
-
- #xenial-proposed:
- xenial-proposed-main:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-proposed
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/xenial-proposed
- xenial-proposed-multiverse:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-proposed
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/xenial-proposed
- xenial-proposed-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-proposed
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/xenial-proposed
- xenial-proposed-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-proposed
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/xenial-proposed
-
- #xenial-backports:
- xenial-backports-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-backports
- components: main
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: main
- distributions:
- - ubuntu/xenial-backports
- xenial-backports-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-backports
- components: multiverse
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: multiverse
- distributions:
- - ubuntu/xenial-backports
- xenial-backports-restricted:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-backports
- components: restricted
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: restricted
- distributions:
- - ubuntu/xenial-backports
- xenial-backports-universe:
- sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-backports
- components: universe
- architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
- publisher:
- component: universe
- distributions:
- - ubuntu/xenial-backports
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/init.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/init.yml
new file mode 100644
index 0000000..4d8dc20
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/init.yml
@@ -0,0 +1,6 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-backports
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-proposed
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-security
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/init.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/init.yml
new file mode 100644
index 0000000..a211387
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-backports.main
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-backports.multiverse
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-backports.restricted
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-backports.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
new file mode 100644
index 0000000..9aeff43
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-backports-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-backports
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/xenial-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
new file mode 100644
index 0000000..ffb9239
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-backports-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-backports
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/xenial-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
new file mode 100644
index 0000000..29f061e
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-backports-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-backports
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/xenial-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
new file mode 100644
index 0000000..cdf9af1
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-backports-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-backports
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/xenial-backports
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/init.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/init.yml
new file mode 100644
index 0000000..257d7cf
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-proposed.main
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-proposed.multiverse
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-proposed.restricted
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-proposed.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
new file mode 100644
index 0000000..8763e94
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-proposed-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-proposed
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/xenial-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
new file mode 100644
index 0000000..6263456
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-proposed-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-proposed
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/xenial-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
new file mode 100644
index 0000000..e6c1562
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-proposed-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-proposed
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/xenial-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
new file mode 100644
index 0000000..82c5bab
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-proposed-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-proposed
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/xenial-proposed
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/init.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/init.yml
new file mode 100644
index 0000000..ebf0830
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-security.main
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-security.multiverse
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-security.restricted
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-security.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
new file mode 100644
index 0000000..24d55ff
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-security-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-security
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/xenial-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
new file mode 100644
index 0000000..e503cff
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-security-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-security
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/xenial-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
new file mode 100644
index 0000000..3aa3b25
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-security-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-security
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/xenial-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
new file mode 100644
index 0000000..b657e2d
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-security-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-security
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/xenial-security
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/init.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/init.yml
new file mode 100644
index 0000000..2e3f8b5
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-updates.main
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-updates.multiverse
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-updates.restricted
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial-updates.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
new file mode 100644
index 0000000..d84d4f0
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-updates-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-updates
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/xenial-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
new file mode 100644
index 0000000..ebef47d
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-updates-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial-updates
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/xenial-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
new file mode 100644
index 0000000..4431c1c
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-updates-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-updates
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/xenial-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
new file mode 100644
index 0000000..e085074
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-updates-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial-updates
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/xenial-updates
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/init.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/init.yml
new file mode 100644
index 0000000..1b81ba1
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial.main
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial.multiverse
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial.restricted
+- system.aptly.server.mirror.ubuntu.xenial.ubuntu.xenial.universe
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
new file mode 100644
index 0000000..aa5ee5e
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-main:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: main
+ distributions:
+ - ubuntu/xenial
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
new file mode 100644
index 0000000..b2c4b82
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-multiverse:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ distribution: xenial
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ components: multiverse
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: multiverse
+ distributions:
+ - ubuntu/xenial
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
new file mode 100644
index 0000000..31370d6
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-restricted:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial
+ components: restricted
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: restricted
+ distributions:
+ - ubuntu/xenial
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
new file mode 100644
index 0000000..8c33902
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ aptly:
+ server:
+ mirror:
+ xenial-universe:
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
+ distribution: xenial
+ components: universe
+ architectures: amd64
+ gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
+ publisher:
+ component: universe
+ distributions:
+ - ubuntu/xenial
\ No newline at end of file
diff --git a/ceph/common/cluster.yml b/ceph/common/cluster.yml
new file mode 100644
index 0000000..6f0b9c8
--- /dev/null
+++ b/ceph/common/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.common.cluster
diff --git a/ceph/common/single.yml b/ceph/common/single.yml
new file mode 100644
index 0000000..66b798c
--- /dev/null
+++ b/ceph/common/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.common.single
diff --git a/ceph/mgr/cluster.yml b/ceph/mgr/cluster.yml
new file mode 100644
index 0000000..5ba2d72
--- /dev/null
+++ b/ceph/mgr/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.mgr.cluster
diff --git a/ceph/mgr/single.yml b/ceph/mgr/single.yml
new file mode 100644
index 0000000..daf42de
--- /dev/null
+++ b/ceph/mgr/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.mgr.single
diff --git a/ceph/mon/cluster_init.yml b/ceph/mon/cluster_init.yml
new file mode 100644
index 0000000..0b36e17
--- /dev/null
+++ b/ceph/mon/cluster_init.yml
@@ -0,0 +1,19 @@
+classes:
+- service.ceph.setup.single
+parameters:
+ ceph:
+ common:
+ keyring:
+ admin:
+ caps:
+ mds: "allow *"
+ mgr: "allow *"
+ mon: "allow *"
+ osd: "allow *"
+ mon:
+ enabled: true
+ keyring:
+ mon:
+ caps:
+ mon: "allow *"
+
diff --git a/cinder/control/backend/ceph.yml b/cinder/control/backend/ceph.yml
index 3b036d4..47846ae 100644
--- a/cinder/control/backend/ceph.yml
+++ b/cinder/control/backend/ceph.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ cinder_storage_client_key: ''
cinder:
controller:
default_volume_type: standard-iops
diff --git a/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
index 945f2f9..6b41224 100644
--- a/cinder/volume/backend/ceph.yml
+++ b/cinder/volume/backend/ceph.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ cinder_storage_client_key: ''
cinder:
volume:
message_queue:
diff --git a/git/server/single.yml b/git/server/single.yml
new file mode 100644
index 0000000..788a5a8
--- /dev/null
+++ b/git/server/single.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ git_server_host: git.${_param:cluster_domain}
+ git_server_port: 8088
+ git:
+ server:
+ enabled: True
+ nginx:
+ server:
+ enabled: True
+ site:
+ git_server:
+ enabled: True
+ name: git_server
+ type: git
+ root: /srv/git
+ client_max_body_size: 0
+ host:
+ name: ${_param:git_server_host}
+ port: ${_param:git_server_port}
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 4a18e8e..75c3776 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -83,6 +83,10 @@
type: text
default: ""
description: "YAML with overrides for Salt deployment"
+ FORMULA_PKG_REVISION:
+ type: string
+ default: ""
+ description: "Formulas revision to install on Salt Master bootstrap stage"
# aws api
AWS_STACK_REGION:
@@ -144,7 +148,7 @@
TEST_TEMPEST_IMAGE:
type: string
description: "Tempest docker image"
- default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ default: "docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest"
TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests"
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
index 06aab0a..4854845 100644
--- a/jenkins/client/job/deploy/rollout.yml
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -55,7 +55,7 @@
TEST_TEMPEST_IMAGE:
type: string
description: "Tempest docker image"
- default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ default: "docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest"
TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests"
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
index 0f9b202..b965a52 100644
--- a/jenkins/client/job/deploy/test.yml
+++ b/jenkins/client/job/deploy/test.yml
@@ -36,7 +36,7 @@
TEST_TEMPEST_IMAGE:
type: string
description: "Tempest docker image"
- default: "obutenko/rally_tempest_docker"
+ default: "docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest"
TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests. use FQDN for ctl01 e.g. ctl01.deploy-heat-os_ha_contrail-17.bud-mk.local"
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 7bc2f79..b5c2d40 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -16,25 +16,25 @@
credentials: "gerrit"
script: pipelines/mcp-k8s-test-pipeline.groovy
trigger:
- gerrit:
- project:
- kubernetes/kubernetes:
- branches:
- - compare_type: "ANT"
- name: "**"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
param:
KUBE_DOCKER_REGISTRY:
type: string
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 7be935b..9ee63c1 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
jenkins:
client:
view:
@@ -22,11 +24,11 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
script: validate-cloud.groovy
-
param:
SALT_MASTER_URL:
type: string
- default: ""
+ default: "${_param:jenkins_salt_api_url}"
+ description: Full Salt API address [e.g. https://10.10.10.2:6969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
diff --git a/keystone/server/wsgi.yml b/keystone/server/wsgi.yml
index 1a949e9..f62c1cc 100644
--- a/keystone/server/wsgi.yml
+++ b/keystone/server/wsgi.yml
@@ -18,7 +18,7 @@
log:
custom:
format: >-
- %v:%p %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
modules:
- wsgi
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 54db248..032ffbf 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -14,7 +14,6 @@
neutron_enable_vlan_aware_vms: False
neutron:
server:
- plugin: ml2
global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
l3_ha: ${_param:neutron_l3_ha}
dvr: ${_param:neutron_control_dvr}
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index bdc050d..009c116 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -12,7 +12,6 @@
neutron_enable_vlan_aware_vms: False
neutron:
server:
- plugin: ml2
global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
l3_ha: ${_param:neutron_l3_ha}
dvr: ${_param:neutron_control_dvr}
diff --git a/nova/compute/storage/ceph.yml b/nova/compute/storage/ceph.yml
index 7cb24cb..7e14e1b 100644
--- a/nova/compute/storage/ceph.yml
+++ b/nova/compute/storage/ceph.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ nova_storage_client_key: nova
nova:
compute:
ceph:
@@ -7,4 +9,4 @@
rbd_pool: ${_param:nova_storage_pool}
secret_uuid: ${_param:nova_storage_secret_uuid}
client_cinder_key: ${_param:nova_storage_client_key}
- rbd_user: ${_param:nova_storage_user}
\ No newline at end of file
+ rbd_user: ${_param:nova_storage_user}
diff --git a/openssh/server/team/all.yml b/openssh/server/team/all.yml
index 1fea51d..5106c73 100644
--- a/openssh/server/team/all.yml
+++ b/openssh/server/team/all.yml
@@ -10,6 +10,7 @@
#- system.openssh.server.team.support
- system.openssh.server.team.stacklight
- system.openssh.server.team.networking
+- system.openssh.server.team.security
- system.openssh.server.team.oss_team
- system.openssh.server.team.services_qa
- system.openssh.server.team.qa_scale
diff --git a/openssh/server/team/members/ahecko.yml b/openssh/server/team/members/ahecko.yml
new file mode 100644
index 0000000..9b5c6d8
--- /dev/null
+++ b/openssh/server/team/members/ahecko.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ ahecko:
+ enabled: true
+ name: ahecko
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Adam Hecko
+ home: /home/ahecko
+ email: ahecko@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ ahecko:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@mirantis
+ user: ${linux:system:user:ahecko}
diff --git a/openssh/server/team/members/maximefimov.yml b/openssh/server/team/members/maximefimov.yml
index 9baaaaf..1915548 100644
--- a/openssh/server/team/members/maximefimov.yml
+++ b/openssh/server/team/members/maximefimov.yml
@@ -19,5 +19,4 @@
user: ${linux:system:user:mefimov}
public_keys:
mefimov:
- - key: rsa-key AAAAB3NzaC1yc2EAAAABJQAAAQEAgLfqReVrcsOuG8GaxPF1iSJjhUPsCnoxtAwFU4YPd0qVmLFxZtcKgb29yR/OSKQz3o5RM1OvQhHs080/gfiboMIyVa5gOCcbVj1PoySd8dAAVy9DORKWCU3djWmHcsG76FU1G8UE1w7nSrWqs01KW9/NzLjiHxf/4r3YWZ51UTr/C1AFyPPMfFRbffqq6yqULG+/TfpkgN2maBrotN5trDuGAHKluyboL7+EZazYpgjUsd2cPMH8TzdQZNwYrtrzWDS0YAqSQVyMc2dFh/gptw/QCsWT2IMyQKLKOcaAy2qon1xWDRFL1fVgqjakF+oM5RBAvX1bkJ1Vx883GEnPaQ==
-
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhbjsMWhgLWtiSYwJRBY8x6yuXPEmeOPjv2SWsGnhLkW3iY/6CEYph4mKBP22vvJaiXRmuUNIpQCnORjp9OrzD9gQM94EmEjpPhaLixYeejPxPW27rEfRo+Xtp9U02GfBUBpBP1hwayKvCOM8y/FTZnPF3pS2zXmBU9VYf3MGR8mt1RS1uJHj+ZBO6fDnf7LNStps1oGdyXkliTqytLH2AE7t+darR3RDN9CN8qMfAMaPSvDjjqE4UzmpoBU4+by/Rxt3bFFyGx5v0/xwq0ieSXT0pkLFSB7mX2P4BiPvr4piH3rZzcVio5QJ5zcH86fHwME9+/tUg7DXihWWW89Vvw== rsa-key-20161025
diff --git a/openssh/server/team/security.yml b/openssh/server/team/security.yml
new file mode 100644
index 0000000..e165ce1
--- /dev/null
+++ b/openssh/server/team/security.yml
@@ -0,0 +1,7 @@
+classes:
+- system.linux.system.sudo
+- system.openssh.server.team.members.ahecko
+- system.openssh.server.team.members.pmichalec
+parameters:
+ _param:
+ linux_system_user_sudo: true
diff --git a/reclass/storage/system/ceph_mon_cluster.yml b/reclass/storage/system/ceph_mon_cluster.yml
index 85beafb..d54d767 100644
--- a/reclass/storage/system/ceph_mon_cluster.yml
+++ b/reclass/storage/system/ceph_mon_cluster.yml
@@ -12,6 +12,7 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.ceph.mon
+ - cluster.${_param:cluster_name}.ceph.mon_init
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:ceph_mon_system_codename}
diff --git a/salt/control/cluster/ceph_mon_cluster.yml b/salt/control/cluster/ceph_mon_cluster.yml
new file mode 100644
index 0000000..bccec01
--- /dev/null
+++ b/salt/control/cluster/ceph_mon_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ ceph.mon:
+ cpu: 16
+ ram: 32768
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ cmn01:
+ name: ${_param:ceph_mon_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.mon
+ cmn02:
+ name: ${_param:ceph_mon_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.mon
+ cmn03:
+ name: ${_param:ceph_mon_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.mon
\ No newline at end of file