fix repos local
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index a552dfc..b009e9e 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -2,7 +2,6 @@
- service.glance.control.cluster
- service.keepalived.cluster.single
- service.haproxy.proxy.single
-- system.glance.control.storage.glusterfs
- system.haproxy.proxy.listen.openstack.glance
parameters:
glance:
diff --git a/glusterfs/cluster.yml b/glusterfs/cluster.yml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/glusterfs/cluster.yml
diff --git a/linux/system/repo-local/elasticsearch.yml b/linux/system/repo-local/elasticsearch.yml
index aa0b71d..5e1fc64 100644
--- a/linux/system/repo-local/elasticsearch.yml
+++ b/linux/system/repo-local/elasticsearch.yml
@@ -4,6 +4,6 @@
repo:
tcpcloud_elasticsearch:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp-elastic"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_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
index f7b1edd..a94d1be 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}/${_param:linux_system_codename}/ nightly grafana"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly grafana"
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
index 3232d03..68fea09 100644
--- a/linux/system/repo-local/mos8.yml
+++ b/linux/system/repo-local/mos8.yml
@@ -10,14 +10,14 @@
- pin: 'release s=mos8.0'
priority: 1100
package: '*'
- mos8_openstack_hotfix:
- 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: 1100
- package: '*'
+ #mos8_openstack_hotfix:
+ # 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: 1100
+ # package: '*'
mos8_openstack_proposed:
source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-proposed main"
architectures: amd64
@@ -26,14 +26,14 @@
- pin: 'release s=mos8.0-proposed'
priority: 1100
package: '*'
- mos8_openstack_security:
- 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: 1100
- package: '*'
+ #mos8_openstack_security:
+ # 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: 1100
+ # package: '*'
mos8_openstack_updates:
source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0-updates main"
architectures: amd64
@@ -42,12 +42,12 @@
- pin: 'release s=mos8.0-updates'
priority: 1100
package: '*'
- mos8_murano:
- refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0 murano"
- architectures: amd64
- key_url: "http://${_param:local_repo_url}/public.gpg"
- pin:
- - pin: 'release s=mos8.0-proposed'
- priority: 1100
- package: '*'
\ No newline at end of file
+ #mos8_murano:
+ # refresh_db: ${_param:linux_repo_refresh_db}
+ # source: "deb [arch=amd64] http://${_param:local_repo_url}/mos8/ mos8.0 murano"
+ # architectures: amd64
+ # key_url: "http://${_param:local_repo_url}/public.gpg"
+ # pin:
+ # - pin: 'release s=mos8.0-proposed'
+ # priority: 1100
+ # package: '*'
\ No newline at end of file
diff --git a/linux/system/repo-local/opencontrail.yml b/linux/system/repo-local/opencontrail.yml
index 31371c9..352b925 100644
--- a/linux/system/repo-local/opencontrail.yml
+++ b/linux/system/repo-local/opencontrail.yml
@@ -5,6 +5,6 @@
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_system_codename}/ nightly tcp-oc30"
+ 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/salt.yml b/linux/system/repo-local/salt.yml
index b2a485d..83af754 100644
--- a/linux/system/repo-local/salt.yml
+++ b/linux/system/repo-local/salt.yml
@@ -4,6 +4,6 @@
repo:
salt:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly salt"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_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
index c52599a..12b1b12 100644
--- a/linux/system/repo-local/salt_formulas.yml
+++ b/linux/system/repo-local/salt_formulas.yml
@@ -4,5 +4,5 @@
repo:
salt_formulas:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp-salt"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-salt"
architectures: amd64
diff --git a/linux/system/repo-local/sensu.yml b/linux/system/repo-local/sensu.yml
index 51cd976..df418fd 100644
--- a/linux/system/repo-local/sensu.yml
+++ b/linux/system/repo-local/sensu.yml
@@ -4,6 +4,6 @@
repo:
sensu:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly sensu"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_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
index 98d0416..d4536de 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo-local/tcpcloud.yml
@@ -5,6 +5,6 @@
tcpcloud:
default: true
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp tcp-liberty tcp-extra"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_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
index 26d2bc8..a84b808 100644
--- a/linux/system/repo-local/tcpcloud_main.yml
+++ b/linux/system/repo-local/tcpcloud_main.yml
@@ -5,6 +5,6 @@
tcpcloud_main:
default: false
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ nightly tcp"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/ubuntu.yml b/linux/system/repo-local/ubuntu.yml
index 0bf352c..d46d736 100644
--- a/linux/system/repo-local/ubuntu.yml
+++ b/linux/system/repo-local/ubuntu.yml
@@ -4,19 +4,19 @@
repo:
ubuntu:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename} nightly main"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename} main"
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"
ubuntu-updates:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}-updates nightly main"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-updates main"
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"
ubuntu-security:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}-security nightly main"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-security main"
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"