Merge pull request #7 from LotharKAtt/master
fix influxdb repo
diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
index 1e3d67a..c1196d7 100644
--- a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -13,7 +13,21 @@
source: http://apt.tcpcloud.eu/nightly
distribution: trusty
#TODO: extra component might not be needed; tcp is just for heka
- components: main security tcp
+ components: main security
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-main
+ distributions:
+ - ubuntu-trusty/nightly
+
+ tcpcloud-nightly-main-trusty:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: trusty
+ #TODO: extra component might not be needed; tcp is just for heka
+ components: tcp
architectures: amd64
key_url: "http://apt.tcpcloud.eu/public.gpg"
gpgkeys:
diff --git a/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml b/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
new file mode 100644
index 0000000..740fa7b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
@@ -0,0 +1,97 @@
+parameters:
+ aptly:
+ server:
+ mirror:
+
+ #TOOD: 4x the lower below
+ #tcpcloud-[stable/testing]-xxx-[xenial/xenial]:
+ #
+ # Other components
+ # salt tcp-salt extra liberty mitaka oc30 security mitaka
+
+ tcpcloud-nightly-main-xenial:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: xenial
+ #TODO: extra component might not be needed; tcp is just for heka
+ components: main security
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-main
+ distributions:
+ - ubuntu-xenial/nightly
+
+
+ tcpcloud-nightly-tcp-xenial:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: xenial
+ #TODO: extra component might not be needed; tcp is just for heka
+ components: tcp
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp
+ distributions:
+ - ubuntu-xenial/nightly
+
+
+ tcpcloud-nightly-extra-xenial:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: xenial
+ #TODO: extra component might not be needed; tcp is just for heka
+ components: extra
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-extra
+ distributions:
+ - ubuntu-xenial/nightly
+
+ # required for salt formulas
+ tcpcloud-nightly-salt-xenial:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: xenial
+ components: tcp-salt
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-salt
+ distributions:
+ - ubuntu-xenial/nightly
+
+ # required for opencontrail formulas
+ tcpcloud-nightly-oc30-xenial:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: xenial
+ components: oc30
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-oc30
+ distributions:
+ - ubuntu-xenial/nightly
+
+ # elastic, kibana is there
+ tcpcloud-nightly-elastic-xenial:
+ source: http://apt.tcpcloud.eu/nightly
+ distribution: xenial
+ components: elastic
+ architectures: amd64
+ key_url: "http://apt.tcpcloud.eu/public.gpg"
+ gpgkeys:
+ - 3EF02D1C
+ publisher:
+ component: tcp-elastic
+ distributions:
+ - ubuntu-xenial/nightly
+
diff --git a/grafana/server/single.yml b/grafana/server/single.yml
index fd8f020..775ce38 100644
--- a/grafana/server/single.yml
+++ b/grafana/server/single.yml
@@ -5,13 +5,6 @@
grafana_port: 3000
grafana_user: admin
grafana_password: admin
- linux:
- system:
- repo:
- grafana:
- enabled: true
- source: 'deb https://packagecloud.io/grafana/stable/debian/ jessie main'
- key_url: 'https://packagecloud.io/gpg.key'
grafana:
server:
enabled: true
diff --git a/linux/system/repo/grafana.yml b/linux/system/repo/grafana.yml
new file mode 100644
index 0000000..267065e
--- /dev/null
+++ b/linux/system/repo/grafana.yml
@@ -0,0 +1,7 @@
+ linux:
+ system:
+ repo:
+ grafana:
+ enabled: true
+ source: 'deb https://packagecloud.io/grafana/stable/debian/ jessie main'
+ key_url: 'https://packagecloud.io/gpg.key'
\ No newline at end of file
diff --git a/linux/system/repo-local/contrail.yml b/linux/system/repo_local/contrail.yml
similarity index 100%
rename from linux/system/repo-local/contrail.yml
rename to linux/system/repo_local/contrail.yml
diff --git a/linux/system/repo-local/grafana.yml b/linux/system/repo_local/grafana.yml
similarity index 100%
rename from linux/system/repo-local/grafana.yml
rename to linux/system/repo_local/grafana.yml
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo_local/influxdb.yml
similarity index 65%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/influxdb.yml
index f007544..7e3fb93 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/influxdb.yml
@@ -1,10 +1,9 @@
parameters:
linux:
system:
- repo:
- tcpcloud:
- default: true
+ repo:influxdb
+ grafana:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly influxdb"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/mos8.yml b/linux/system/repo_local/mos8.yml
similarity index 100%
rename from linux/system/repo-local/mos8.yml
rename to linux/system/repo_local/mos8.yml
diff --git a/linux/system/repo-local/mos9.yml b/linux/system/repo_local/mos9.yml
similarity index 100%
rename from linux/system/repo-local/mos9.yml
rename to linux/system/repo_local/mos9.yml
diff --git a/linux/system/repo-local/opencontrail.yml b/linux/system/repo_local/opencontrail.yml
similarity index 100%
rename from linux/system/repo-local/opencontrail.yml
rename to linux/system/repo_local/opencontrail.yml
diff --git a/linux/system/repo-local/openstack.yml b/linux/system/repo_local/openstack.yml
similarity index 100%
rename from linux/system/repo-local/openstack.yml
rename to linux/system/repo_local/openstack.yml
diff --git a/linux/system/repo-local/salt.yml b/linux/system/repo_local/salt.yml
similarity index 100%
rename from linux/system/repo-local/salt.yml
rename to linux/system/repo_local/salt.yml
diff --git a/linux/system/repo-local/salt_formulas.yml b/linux/system/repo_local/salt_formulas.yml
similarity index 100%
rename from linux/system/repo-local/salt_formulas.yml
rename to linux/system/repo_local/salt_formulas.yml
diff --git a/linux/system/repo-local/sensu.yml b/linux/system/repo_local/sensu.yml
similarity index 100%
rename from linux/system/repo-local/sensu.yml
rename to linux/system/repo_local/sensu.yml
diff --git a/linux/system/repo-local/elasticsearch.yml b/linux/system/repo_local/tcp-elastic.yml
similarity index 100%
rename from linux/system/repo-local/elasticsearch.yml
rename to linux/system/repo_local/tcp-elastic.yml
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo_local/tcp-extra.yml
similarity index 79%
rename from linux/system/repo-local/tcpcloud.yml
rename to linux/system/repo_local/tcp-extra.yml
index f007544..5d68de8 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-extra.yml
@@ -5,6 +5,6 @@
tcpcloud:
default: true
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-extra"
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/tcp-liberty.yml
similarity index 73%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/tcp-liberty.yml
index f007544..389b976 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-liberty.yml
@@ -3,8 +3,7 @@
system:
repo:
tcpcloud:
- default: true
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty"
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/tcp-oc30.yml
similarity index 73%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/tcp-oc30.yml
index f007544..6ed244b 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-oc30.yml
@@ -3,8 +3,7 @@
system:
repo:
tcpcloud:
- default: true
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-oc30"
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/tcp-salt.yml
similarity index 73%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/tcp-salt.yml
index f007544..86ef0ac 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-salt.yml
@@ -3,8 +3,7 @@
system:
repo:
tcpcloud:
- default: true
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-salt"
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/tcp.yml
similarity index 100%
rename from linux/system/repo-local/tcpcloud_main.yml
rename to linux/system/repo_local/tcp.yml
diff --git a/linux/system/repo-local/ubuntu-liberty.yml b/linux/system/repo_local/ubuntu-liberty.yml
similarity index 100%
rename from linux/system/repo-local/ubuntu-liberty.yml
rename to linux/system/repo_local/ubuntu-liberty.yml
diff --git a/linux/system/repo-local/ubuntu.yml b/linux/system/repo_local/ubuntu.yml
similarity index 100%
rename from linux/system/repo-local/ubuntu.yml
rename to linux/system/repo_local/ubuntu.yml