vw fixes
diff --git a/salt/master/formula/git/kubernetes.yml b/salt/master/formula/git/kubernetes.yml
index c827caf..fe8ad5d 100644
--- a/salt/master/formula/git/kubernetes.yml
+++ b/salt/master/formula/git/kubernetes.yml
@@ -6,17 +6,17 @@
formula:
kubernetes:
source: git
- address: 'https://github.com/openstack/salt-formula-kubernetes.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-kubernetes.git'
revision: ${_param:salt_master_environment_revision}
etcd:
source: git
- address: 'https://github.com/tcpcloud/salt-formula-etcd.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-etcd.git'
revision: ${_param:salt_master_environment_revision}
bird:
source: git
- address: 'https://github.com/tcpcloud/salt-formula-bird.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-bird.git'
revision: ${_param:salt_master_environment_revision}
docker:
source: git
- address: 'https://github.com/tcpcloud/salt-formula-docker.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-docker.git'
revision: ${_param:salt_master_environment_revision}
\ No newline at end of file
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index c6cf269..78b7d91 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -6,19 +6,23 @@
formula:
aodh:
source: git
- address: 'https://github.com/tcpcloud/salt-formula-aodh.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-aodh.git'
revision: ${_param:salt_master_environment_revision}
billometer:
source: git
- address: 'https://github.com/tcpcloud/salt-formula-billometer.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git'
revision: ${_param:salt_master_environment_revision}
ceilometer:
source: git
- address: 'https://github.com/openstack/salt-formula-ceilometer.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-ceilometer.git'
+ revision: ${_param:salt_master_environment_revision}
+ ceph:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-ceph.git'
revision: ${_param:salt_master_environment_revision}
cinder:
source: git
- address: 'https://github.com/openstack/salt-formula-cinder.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-cinder.git'
revision: ${_param:salt_master_environment_revision}
galera:
source: git
@@ -26,11 +30,11 @@
revision: ${_param:salt_master_environment_revision}
glance:
source: git
- address: 'https://github.com/openstack/salt-formula-glance.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-glance.git'
revision: ${_param:salt_master_environment_revision}
glusterfs:
source: git
- address: 'https://github.com/tcpcloud/salt-formula-glusterfs.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-glusterfs.git'
revision: ${_param:salt_master_environment_revision}
haproxy:
source: git
@@ -38,11 +42,11 @@
revision: ${_param:salt_master_environment_revision}
heat:
source: git
- address: 'https://github.com/openstack/salt-formula-heat.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-heat.git'
revision: ${_param:salt_master_environment_revision}
horizon:
source: git
- address: 'https://github.com/openstack/salt-formula-horizon.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-horizon.git'
revision: ${_param:salt_master_environment_revision}
keepalived:
source: git
@@ -50,7 +54,7 @@
revision: ${_param:salt_master_environment_revision}
keystone:
source: git
- address: 'https://github.com/openstack/salt-formula-keystone.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-keystone.git'
revision: ${_param:salt_master_environment_revision}
memcached:
source: git
@@ -70,7 +74,7 @@
revision: ${_param:salt_master_environment_revision}
neutron:
source: git
- address: 'https://github.com/openstack/salt-formula-neutron.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-neutron.git'
revision: ${_param:salt_master_environment_revision}
nginx:
source: git
@@ -78,11 +82,11 @@
revision: ${_param:salt_master_environment_revision}
nova:
source: git
- address: 'https://github.com/openstack/salt-formula-nova.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-nova.git'
revision: ${_param:salt_master_environment_revision}
opencontrail:
source: git
- address: 'https://github.com/openstack/salt-formula-opencontrail.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git'
revision: ${_param:salt_master_environment_revision}
python:
source: git
@@ -102,5 +106,5 @@
revision: ${_param:salt_master_environment_revision}
swift:
source: git
- address: 'https://github.com/openstack/salt-formula-swift.git'
+ address: '${_param:salt_master_environment_repository}/salt-formula-swift.git'
revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index dd8841f..6d9bcab 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -13,6 +13,9 @@
ceilometer:
source: pkg
name: salt-formula-ceilometer
+ ceph:
+ source: pkg
+ name: salt-formula-ceph
cinder:
source: pkg
name: salt-formula-cinder