Revert "Merge "Updated all tags for Liberty2""

Revert commit so that master will use the tag latest

Change-Id: If31c77cb288090dd5c780d684df41197df5b7fc2
This commit is contained in:
Ryan Hallisey 2015-08-06 12:56:02 -04:00
parent 5408dd330f
commit a5fa276c3a
25 changed files with 65 additions and 65 deletions

View File

@ -1,5 +1,5 @@
ceilometerapi:
image: kollaglue/centos-rdo-ceilometer-api:liberty2
image: kollaglue/centos-rdo-ceilometer-api:latest
name: ceilometer-api
net: "host"
restart: always
@ -7,7 +7,7 @@ ceilometerapi:
- openstack.env
ceilometercentral:
image: kollaglue/centos-rdo-ceilometer-central:liberty2
image: kollaglue/centos-rdo-ceilometer-central:latest
name: ceilometer-central
net: "host"
restart: always
@ -15,7 +15,7 @@ ceilometercentral:
- openstack.env
ceilometeralarm:
image: kollaglue/centos-rdo-ceilometer-alarm:liberty2
image: kollaglue/centos-rdo-ceilometer-alarm:latest
name: ceilometer-alarm
net: "host"
restart: always
@ -23,7 +23,7 @@ ceilometeralarm:
- openstack.env
ceilometercollector:
image: kollaglue/centos-rdo-ceilometer-collector:liberty2
image: kollaglue/centos-rdo-ceilometer-collector:latest
name: ceilometer-collector
net: "host"
restart: always
@ -31,7 +31,7 @@ ceilometercollector:
- openstack.env
ceilometernotification:
image: kollaglue/centos-rdo-ceilometer-notification:liberty2
image: kollaglue/centos-rdo-ceilometer-notification:latest
name: ceilometer-notification
net: "host"
restart: always

View File

@ -1,5 +1,5 @@
cinderapi:
image: kollaglue/centos-rdo-cinder-api:liberty2
image: kollaglue/centos-rdo-cinder-api:latest
name: cinder-api
net: host
restart: always
@ -7,7 +7,7 @@ cinderapi:
- openstack.env
cinderscheduler:
image: kollaglue/centos-rdo-cinder-scheduler:liberty2
image: kollaglue/centos-rdo-cinder-scheduler:latest
name: cinder-scheduler
net: host
restart: always

View File

@ -1,5 +1,5 @@
cinderbackup:
image: kollaglue/centos-rdo-cinder-backup:liberty2
image: kollaglue/centos-rdo-cinder-backup:latest
name: cinder-backup
net: host
restart: always

View File

@ -1,10 +1,10 @@
cinderdata:
image: kollaglue/centos-rdo-cinder-data:liberty2
image: kollaglue/centos-rdo-cinder-data:latest
name: cinderdata
restart: on-failure
cindervolume:
image: kollaglue/centos-rdo-cinder-volume:liberty2
image: kollaglue/centos-rdo-cinder-volume:latest
name: cinder-volume
net: host
privileged: true

View File

@ -1,6 +1,6 @@
# The DNSaaS REST api from where zones and records are added or removed.
designateapi:
image: kollaglue/centos-rdo-designate-api:liberty2
image: kollaglue/centos-rdo-designate-api:latest
name: designate-api
net: "host"
restart: always
@ -10,7 +10,7 @@ designateapi:
# The central dispatches the API requests and pushes requests further down to
# pool-manager and the database for storage.
designatecentral:
image: kollaglue/centos-rdo-designate-central:liberty2
image: kollaglue/centos-rdo-designate-central:latest
name: designate-central
net: "host"
restart: always
@ -19,7 +19,7 @@ designatecentral:
# The pool-manager will push new zones to the backend so they can slave them.
designatepoolmanager:
image: kollaglue/centos-rdo-designate-poolmanager:liberty2
image: kollaglue/centos-rdo-designate-poolmanager:latest
name: designate-poolmanager
net: "host"
restart: always
@ -28,12 +28,12 @@ designatepoolmanager:
# Bind9 backend and state storage.
designatebackendbind9data:
image: kollaglue/centos-rdo-designate-backend-bind9-data:liberty2
image: kollaglue/centos-rdo-designate-backend-bind9-data:latest
name: designate-backend-bind9-data
restart: on-failure
designatebackendbind9:
image: kollaglue/centos-rdo-designate-backend-bind9:liberty2
image: kollaglue/centos-rdo-designate-backend-bind9:latest
name: designate-backend-bind9
net: "host"
restart: always
@ -46,7 +46,7 @@ designatebackendbind9:
# AXFR/IXFR commands to inform the slaves (which realy listen for queries from
# $world) about updates.
designatemdns:
image: kollaglue/centos-rdo-designate-mdns:liberty2
image: kollaglue/centos-rdo-designate-mdns:latest
name: designate-mdns
net: "host"
restart: always
@ -57,7 +57,7 @@ designatemdns:
# instance creation/deletion or floating IP association/disassociation.
# It then creates records for instances included in events.
designatesink:
image: kollaglue/centos-rdo-designate-sink:liberty2
image: kollaglue/centos-rdo-designate-sink:latest
name: designate-sink
net: "host"
restart: always

View File

@ -1,10 +1,10 @@
galeradbdata:
image: kollaglue/centos-rdo-mariadb-data:liberty2
image: kollaglue/centos-rdo-mariadb-data:latest
name: galeradb-data
restart: on-failure
galeraapp:
image: kollaglue/centos-rdo-galera:liberty2
image: kollaglue/centos-rdo-galera:latest
name: galera-app
restart: always
net: "host"

View File

@ -1,9 +1,9 @@
glancedata:
image: kollaglue/centos-rdo-glance-data:liberty2
image: kollaglue/centos-rdo-glance-data:latest
name: glance-data
glanceregistry:
image: kollaglue/centos-rdo-glance-registry:liberty2
image: kollaglue/centos-rdo-glance-registry:latest
name: glance-registry
net: "host"
restart: always
@ -11,7 +11,7 @@ glanceregistry:
- openstack.env
glanceapi:
image: kollaglue/centos-rdo-glance-api:liberty2
image: kollaglue/centos-rdo-glance-api:latest
name: glance-api
net: "host"
restart: always

View File

@ -1,5 +1,5 @@
gnocchiapi:
image: kollaglue/centos-rdo-gnocchi-api:liberty2
image: kollaglue/centos-rdo-gnocchi-api:latest
name: gnocchiapi
restart: always
env_file:
@ -7,7 +7,7 @@ gnocchiapi:
net: "host"
gnocchistatsd:
image: kollaglue/centos-rdo-gnocchi-statsd:liberty2
image: kollaglue/centos-rdo-gnocchi-statsd:latest
name: gnocchistatsd
restart: always
env_file:

View File

@ -1,19 +1,19 @@
heatapi:
image: kollaglue/centos-rdo-heat-api:liberty2
image: kollaglue/centos-rdo-heat-api:latest
name: heat-api
net: "host"
restart: always
env_file:
- openstack.env
heatengine:
image: kollaglue/centos-rdo-heat-engine:liberty2
image: kollaglue/centos-rdo-heat-engine:latest
name: heat-engine
net: "host"
restart: always
env_file:
- openstack.env
heatapicfn:
image: kollaglue/centos-rdo-heat-api-cfn:liberty2
image: kollaglue/centos-rdo-heat-api-cfn:latest
name: heat-api-cfn
net: "host"
restart: always

View File

@ -1,5 +1,5 @@
horizon:
image: kollaglue/centos-rdo-horizon:liberty2
image: kollaglue/centos-rdo-horizon:latest
name: horizon
net: "host"
restart: always

View File

@ -1,5 +1,5 @@
keepalived:
image: kollaglue/centos-rdo-keepalived:liberty2
image: kollaglue/centos-rdo-keepalived:latest
name: keepalived
restart: always
net: "host"

View File

@ -1,5 +1,5 @@
keystone:
image: kollaglue/centos-rdo-keystone:liberty2
image: kollaglue/centos-rdo-keystone:latest
name: keystone
restart: always
net: "host"

View File

@ -1,12 +1,12 @@
magnumapi:
image: kollaglue/centos-rdo-magnum-api:liberty2
image: kollaglue/centos-rdo-magnum-api:latest
name: magnum-api
net: "host"
restart: always
env_file:
- openstack.env
magnumconductor:
image: kollaglue/centos-rdo-magnum-conductor:liberty2
image: kollaglue/centos-rdo-magnum-conductor:latest
name: magnum-conductor
net: "host"
restart: always

View File

@ -1,10 +1,10 @@
mariadbdata:
image: kollaglue/centos-rdo-mariadb-data:liberty2
image: kollaglue/centos-rdo-mariadb-data:latest
name: mariadbdata
restart: on-failure
mariadbapp:
image: kollaglue/centos-rdo-mariadb-app:liberty2
image: kollaglue/centos-rdo-mariadb-app:latest
name: mariadbapp
restart: always
env_file:

View File

@ -1,5 +1,5 @@
memcached:
image: kollaglue/centos-rdo-memcached:liberty2
image: kollaglue/centos-rdo-memcached:latest
name: memcached
restart: always
net: "host"

View File

@ -1,5 +1,5 @@
neutronagents:
image: kollaglue/centos-rdo-neutron-agents:liberty2
image: kollaglue/centos-rdo-neutron-agents:latest
name: neutron-agents
net: "host"
privileged: true

View File

@ -1,5 +1,5 @@
neutronlinuxbridgeagent:
image: kollaglue/centos-rdo-neutron-linuxbridge-agent:liberty2
image: kollaglue/centos-rdo-neutron-linuxbridge-agent:latest
name: neutron-linuxbridge-agent
net: "host"
privileged: true

View File

@ -1,5 +1,5 @@
neutronserver:
image: kollaglue/centos-rdo-neutron-server:liberty2
image: kollaglue/centos-rdo-neutron-server:latest
name: neutron-server
net: "host"
restart: always

View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:liberty2
image: kollaglue/centos-rdo-nova-compute-data:latest
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:liberty2
image: kollaglue/centos-rdo-nova-libvirt:latest
name: libvirt
net: host
pid: host
@ -19,7 +19,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network:liberty2
image: kollaglue/centos-rdo-nova-network:latest
name: nova-network
net: host
privileged: true
@ -38,7 +38,7 @@ novanetwork:
# nova-metadata api is required in multi_host nova network mode.
# http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
novaapi:
image: kollaglue/centos-rdo-nova-api:liberty2
image: kollaglue/centos-rdo-nova-api:latest
name: nova-api
privileged: True
net: "host"
@ -49,7 +49,7 @@ novaapi:
- /lib/modules:/lib/modules:ro
novacompute:
image: kollaglue/centos-rdo-nova-compute:liberty2
image: kollaglue/centos-rdo-nova-compute:latest
name: nova-compute
net: host
privileged: true

View File

@ -1,5 +1,5 @@
novaconductor:
image: kollaglue/centos-rdo-nova-conductor:liberty2
image: kollaglue/centos-rdo-nova-conductor:latest
name: nova-conductor
net: "host"
restart: always
@ -9,7 +9,7 @@ novaconductor:
# Unfortunately nova api needs to be privileged as it wants to run
# a firewall command.
novaapi:
image: kollaglue/centos-rdo-nova-api:liberty2
image: kollaglue/centos-rdo-nova-api:latest
name: nova-api
privileged: True
net: "host"
@ -18,7 +18,7 @@ novaapi:
- openstack.env
novascheduler:
image: kollaglue/centos-rdo-nova-scheduler:liberty2
image: kollaglue/centos-rdo-nova-scheduler:latest
name: nova-scheduler
net: "host"
restart: always
@ -26,7 +26,7 @@ novascheduler:
- openstack.env
novaconsoleauth:
image: kollaglue/centos-rdo-nova-consoleauth:liberty2
image: kollaglue/centos-rdo-nova-consoleauth:latest
name: nova-consoleauth
net: "host"
restart: always
@ -34,7 +34,7 @@ novaconsoleauth:
- openstack.env
novanovncproxy:
image: kollaglue/centos-rdo-nova-novncproxy:liberty2
image: kollaglue/centos-rdo-nova-novncproxy:latest
name: nova-novncproxy
net: "host"
restart: always

View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:liberty2
image: kollaglue/centos-rdo-nova-compute-data:latest
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:liberty2
image: kollaglue/centos-rdo-nova-libvirt:latest
name: libvirt
net: host
pid: host
@ -19,7 +19,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network:liberty2
image: kollaglue/centos-rdo-nova-network:latest
name: nova-network
net: host
privileged: true
@ -34,7 +34,7 @@ novanetwork:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute:liberty2
image: kollaglue/centos-rdo-nova-compute:latest
name: nova-compute
net: host
privileged: true

View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:liberty2
image: kollaglue/centos-rdo-nova-compute-data:latest
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:liberty2
image: kollaglue/centos-rdo-nova-libvirt:latest
name: libvirt
net: host
pid: host
@ -20,7 +20,7 @@ libvirt:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute:liberty2
image: kollaglue/centos-rdo-nova-compute:latest
name: nova-compute
net: host
privileged: true

View File

@ -1,5 +1,5 @@
rabbitmq:
image: kollaglue/centos-rdo-rabbitmq:liberty2
image: kollaglue/centos-rdo-rabbitmq:latest
name: rabbitmq
restart: always
net: "host"

View File

@ -1,5 +1,5 @@
swiftproxyserver:
image: kollaglue/centos-rdo-swift-proxy-server:liberty2
image: kollaglue/centos-rdo-swift-proxy-server:latest
name: swiftproxyserver
restart: always
net: host

View File

@ -1,9 +1,9 @@
swiftdata:
image: kollaglue/centos-rdo-swift-data:liberty2
image: kollaglue/centos-rdo-swift-data:latest
name: swiftdata
swiftobjectserver:
image: kollaglue/centos-rdo-swift-object-server:liberty2
image: kollaglue/centos-rdo-swift-object-server:latest
name: swiftobjectserver
restart: always
net: host
@ -13,7 +13,7 @@ swiftobjectserver:
- swiftdata
swiftobjectauditor:
image: kollaglue/centos-rdo-swift-object-auditor:liberty2
image: kollaglue/centos-rdo-swift-object-auditor:latest
name: swiftobjectauditor
restart: always
net: host
@ -23,7 +23,7 @@ swiftobjectauditor:
- swiftdata
swiftobjectexpirer:
image: kollaglue/centos-rdo-swift-object-expirer:liberty2
image: kollaglue/centos-rdo-swift-object-expirer:latest
name: swiftobjectexpirer
restart: always
net: host
@ -33,7 +33,7 @@ swiftobjectexpirer:
- swiftdata
swiftobjectreplicator:
image: kollaglue/centos-rdo-swift-object-replicator:liberty2
image: kollaglue/centos-rdo-swift-object-replicator:latest
name: swiftobjectreplicator
restart: always
net: host
@ -43,7 +43,7 @@ swiftobjectreplicator:
- swiftdata
swiftobjectupdater:
image: kollaglue/centos-rdo-swift-object-updater:liberty2
image: kollaglue/centos-rdo-swift-object-updater:latest
name: swiftobjectupdater
restart: always
net: host
@ -53,7 +53,7 @@ swiftobjectupdater:
- swiftdata
swiftcontainerserver:
image: kollaglue/centos-rdo-swift-container-server:liberty2
image: kollaglue/centos-rdo-swift-container-server:latest
name: swiftcontainerserver
restart: always
net: host
@ -63,7 +63,7 @@ swiftcontainerserver:
- swiftdata
swiftaccountserver:
image: kollaglue/centos-rdo-swift-account-server:liberty2
image: kollaglue/centos-rdo-swift-account-server:latest
name: swiftaccountserver
restart: always
net: host