local_repo maas, glusterfs and mcp fixes
diff --git a/aptly/server/mirror/ubuntu/trusty/glusterfs.yml b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
new file mode 100644
index 0000000..2d3fbaf
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ glusterfs_upstream_trusty:
+ source: http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu
+ distribution: trusty
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 3FE869A9
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml b/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
index b419b8b..32e3b90 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
@@ -1,16 +1,15 @@
parameters:
_param:
mcp_repo_version: 1.0
- linux_system_codename: trusty
aptly:
server:
mirror:
mirantis_openstack_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -19,11 +18,11 @@
- ubuntu-trusty/mitaka
mirantis_openstack_hotfix_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-hotfix
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -32,11 +31,11 @@
- ubuntu-trusty/mitaka-hotfix
mirantis_openstack_security_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-security
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -46,11 +45,11 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_updates_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-updates
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -60,11 +59,11 @@
# required for salt formulas
mirantis_openstack_holdback_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-holdback
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
diff --git a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
new file mode 100644
index 0000000..79a618a
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ glusterfs_upstream_xenial:
+ source: http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu
+ distribution: xenial
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 3FE869A9
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml b/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
index 0d07f5a..a23ece8 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
@@ -1,16 +1,15 @@
parameters:
_param:
mcp_repo_version: 1.0
- linux_system_codename: xenial
aptly:
server:
mirror:
mirantis_openstack_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -19,11 +18,11 @@
- ubuntu-xenial/mitaka
mirantis_openstack_hotfix_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-hotfix
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -32,11 +31,11 @@
- ubuntu-xenial/mitaka-hotfix
mirantis_openstack_security_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-security
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -46,11 +45,11 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_updates_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-updates
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -60,11 +59,11 @@
# required for salt formulas
mirantis_openstack_holdback_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-holdback
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher: