minor updates
diff --git a/aptly/server/mirror/ubuntu/trusty/mos9.yml b/aptly/server/mirror/ubuntu/trusty/mos9.yml
index 8722650..8920e3a 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos9.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos9.yml
@@ -61,3 +61,15 @@
component: main
distributions:
- mos9/mos9.0-updates
+ mirantis-openstack-9.0-extras-murano:
+ source: http://mirror.fuel-infra.org/extras/murano-plugin-repos/release/1.1.0/ubuntu/9.0/
+ distribution: mos9.0
+ components: main restricted
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: murano
+ distributions:
+ - mos9/mos9.0
diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
index a04e8c5..3fea40b 100644
--- a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -79,3 +79,17 @@
distributions:
- trusty/nightly
+ # elastic, kibana is there
+ tcpcloud-nightly-elastic-trusty:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: trusty
+ components: elastic
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-elastic
+ distributions:
+ - trusty/nightly
+
diff --git a/linux/system/repo-local/contrail.yml b/linux/system/repo-local/contrail.yml
new file mode 100644
index 0000000..c78e68c
--- /dev/null
+++ b/linux/system/repo-local/contrail.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ contrail_repo_pin_priority: 200
+ linux:
+ system:
+ repo:
+ contrail:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/contrail trusty main"
+ pin:
+ - pin: 'release l=Local Contrail APT repository'
+ priority: ${_param:contrail_repo_pin_priority}
+ package: '*'
diff --git a/linux/system/repo-local/elasticsearch.yml b/linux/system/repo-local/elasticsearch.yml
new file mode 100644
index 0000000..118e4e5
--- /dev/null
+++ b/linux/system/repo-local/elasticsearch.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ tcpcloud_elasticsearch:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-elastic"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/grafana.yml b/linux/system/repo-local/grafana.yml
new file mode 100644
index 0000000..4a07383
--- /dev/null
+++ b/linux/system/repo-local/grafana.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ grafana:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly grafana"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/horizon.yml b/linux/system/repo-local/horizon.yml
new file mode 100644
index 0000000..3f6f477
--- /dev/null
+++ b/linux/system/repo-local/horizon.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ tcpcloud_horizon:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ ${_param:linux_distrib_codename} ${_param:horizon_version}"
+ architectures: amd64
+ #key_url: "http://apt.tcpcloud.eu/public.gpg"
+ key_url: "salt://tcpcloud_public.gpg"
diff --git a/linux/system/repo-local/mos9.yml b/linux/system/repo-local/mos9.yml
new file mode 100644
index 0000000..6886185
--- /dev/null
+++ b/linux/system/repo-local/mos9.yml
@@ -0,0 +1,53 @@
+parameters:
+ linux:
+ system:
+ repo:
+ mos9_openstack:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0 main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos9.0'
+ priority: 1100
+ package: '*'
+ mos9_openstack_hotfix:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-hotfix main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos9.0-hotfix'
+ priority: 1100
+ package: '*'
+ mos9_openstack_proposed:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-proposed main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos9.0-proposed'
+ priority: 1100
+ package: '*'
+ mos9_openstack_security:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-security main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos9.0-security'
+ priority: 1100
+ package: '*'
+ mos9_openstack_updates:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0-updates main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos9.0-updates'
+ priority: 1100
+ package: '*'
+ mos9_murano:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos9/ mos9.0 murano"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos8.0-proposed'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo-local/opencontrail.yml b/linux/system/repo-local/opencontrail.yml
new file mode 100644
index 0000000..90d47a0
--- /dev/null
+++ b/linux/system/repo-local/opencontrail.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ tcpcloud_contrail:
+ # oc30 is now by default
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-oc30"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/openstack.yml b/linux/system/repo-local/openstack.yml
new file mode 100644
index 0000000..4754d12
--- /dev/null
+++ b/linux/system/repo-local/openstack.yml
@@ -0,0 +1,51 @@
+classes:
+- system.linux.system.repo.salt
+parameters:
+ linux:
+ system:
+ repo:
+ mirantis:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0 main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos8.0'
+ priority: 1000
+ package: '*'
+ mirantis_openstack_hotfix:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-hotfix main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos8.0-hotfix'
+ priority: 1000
+ package: '*'
+ mirantis_openstack_proposed:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-proposed main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos8.0-proposed'
+ priority: 1000
+ package: '*'
+ mirantis_openstack_security:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-security main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos8.0-security'
+ priority: 1000
+ package: '*'
+ mirantis_openstack_updates:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-updates main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release s=mos8.0-updates'
+ priority: 1000
+ package: '*'
diff --git a/linux/system/repo-local/salt.yml b/linux/system/repo-local/salt.yml
new file mode 100644
index 0000000..273d850
--- /dev/null
+++ b/linux/system/repo-local/salt.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ salt:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly salt"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/salt_formulas.yml b/linux/system/repo-local/salt_formulas.yml
new file mode 100644
index 0000000..8f6706a
--- /dev/null
+++ b/linux/system/repo-local/salt_formulas.yml
@@ -0,0 +1,8 @@
+parameters:
+ linux:
+ system:
+ repo:
+ salt_formulas:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp-salt"
+ architectures: amd64
diff --git a/linux/system/repo-local/salt_xenial.yml b/linux/system/repo-local/salt_xenial.yml
new file mode 100644
index 0000000..273d850
--- /dev/null
+++ b/linux/system/repo-local/salt_xenial.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ salt:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly salt"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/sensu.yml b/linux/system/repo-local/sensu.yml
new file mode 100644
index 0000000..3e5b5a5
--- /dev/null
+++ b/linux/system/repo-local/sensu.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ sensu:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly sensu"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo-local/tcpcloud.yml
new file mode 100644
index 0000000..69ae25a
--- /dev/null
+++ b/linux/system/repo-local/tcpcloud.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ tcpcloud:
+ default: true
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp tcp-liberty tcp-extra"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud_main.yml b/linux/system/repo-local/tcpcloud_main.yml
new file mode 100644
index 0000000..4d326f9
--- /dev/null
+++ b/linux/system/repo-local/tcpcloud_main.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ tcpcloud_main:
+ default: false
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly tcp"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/cloudarchive.yml b/linux/system/repo-local/ubuntu/cloudarchive.yml
new file mode 100644
index 0000000..b06c31a
--- /dev/null
+++ b/linux/system/repo-local/ubuntu/cloudarchive.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ cloudarchive:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_distrib_codename}/ nightly liberty"
+ architectures: amd64
+ default: true
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/trusty.yml b/linux/system/repo-local/ubuntu/trusty.yml
new file mode 100644
index 0000000..b88e402
--- /dev/null
+++ b/linux/system/repo-local/ubuntu/trusty.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ ubuntu:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/trusty/ nightly main"
+ architectures: amd64
+ default: true
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu/xenial.yml b/linux/system/repo-local/ubuntu/xenial.yml
new file mode 100644
index 0000000..b4a1888
--- /dev/null
+++ b/linux/system/repo-local/ubuntu/xenial.yml
@@ -0,0 +1,10 @@
+parameters:
+ linux:
+ system:
+ repo:
+ ubuntu:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/xenial/ nightly main"
+ architectures: amd64
+ default: true
+ key_url: "http://${_param:local_repo_url}/public.gpg"