Change hardcoded nightly repo to variable
Change-Id: Ifbe7369ddc2937f8abd406eb7097a67d5373c863
diff --git a/aptly/server/mirror/debian/cassandra.yml b/aptly/server/mirror/debian/cassandra.yml
index 3d32e6a..846df4e 100644
--- a/aptly/server/mirror/debian/cassandra.yml
+++ b/aptly/server/mirror/debian/cassandra.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -14,5 +16,5 @@
publisher:
component: extra
distributions:
- - trusty/nightly
- - xenial/nightly
+ - ubuntu-trusty/${_param:apt_mk_version}
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/debian/elasticsearch.yml b/aptly/server/mirror/debian/elasticsearch.yml
index 942b70a..ece60af 100644
--- a/aptly/server/mirror/debian/elasticsearch.yml
+++ b/aptly/server/mirror/debian/elasticsearch.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,8 +14,8 @@
publisher:
component: elastic
distributions:
- - trusty/nightly
- - xenial/nightly
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
kibana:
source: http://packages.elasticsearch.org/kibana/4.4/debian
distribution: stable
@@ -24,8 +26,8 @@
publisher:
component: elastic
distributions:
- - trusty/nightly
- - xenial/nightly
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
kibana-46:
source: http://packages.elasticsearch.org/kibana/4.6/debian
distribution: stable
@@ -36,8 +38,8 @@
publisher:
component: elastic
distributions:
- - trusty/nightly
- - xenial/nightly
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
elasticsearch-curator:
source: http://packages.elastic.co/curator/4/debian
distribution: stable
@@ -48,5 +50,5 @@
publisher:
component: elastic
distributions:
- - trusty/nightly
- - xenial/nightly
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index bfc4168..4c243b8 100644
--- a/aptly/server/mirror/ubuntu/trusty/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/salt.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,5 +14,5 @@
publisher:
component: salt
distributions:
- - ubuntu-trusty/nightly
+ - ubuntu-trusty/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index 819de76..4334374 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,4 +14,4 @@
publisher:
component: docker
distributions:
- - ubuntu-xenial/nightly
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
index f8177a0..248de32 100644
--- a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
@@ -1,5 +1,6 @@
parameters:
_param:
+ apt_mk_version: stable
glusterfs_version: 3.8
aptly:
server:
@@ -14,4 +15,4 @@
publisher:
component: glusterfs
distributions:
- - ubuntu-xenial/nightly
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index 2db0586..8dbb6ea 100644
--- a/aptly/server/mirror/ubuntu/xenial/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/grafana.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,4 +14,4 @@
publisher:
component: grafana
distributions:
- - ubuntu-xenial/nightly
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
index 87930b9..a2ac597 100644
--- a/aptly/server/mirror/ubuntu/xenial/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,4 +14,4 @@
publisher:
component: influxdb
distributions:
- - ubuntu-xenial/nightly
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/maas.yml b/aptly/server/mirror/ubuntu/xenial/maas.yml
index 1382a09..0e4a559 100644
--- a/aptly/server/mirror/ubuntu/xenial/maas.yml
+++ b/aptly/server/mirror/ubuntu/xenial/maas.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,4 +14,4 @@
publisher:
component: maas
distributions:
- - xenial/nightly
+ - xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index 9a9b34c..a100bde 100644
--- a/aptly/server/mirror/ubuntu/xenial/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/salt.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,4 +14,4 @@
publisher:
component: salt
distributions:
- - ubuntu-xenial/nightly
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/linux/system/repo_local/grafana.yml b/linux/system/repo_local/grafana.yml
index a94d1be..f2d9ad5 100644
--- a/linux/system/repo_local/grafana.yml
+++ b/linux/system/repo_local/grafana.yml
@@ -4,6 +4,6 @@
repo:
grafana:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly grafana"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} grafana"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/influxdb.yml b/linux/system/repo_local/influxdb.yml
index 5e30d83..1c641bb 100644
--- a/linux/system/repo_local/influxdb.yml
+++ b/linux/system/repo_local/influxdb.yml
@@ -4,6 +4,6 @@
repo:
influxdb:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly influxdb"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} influxdb"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"