openstack/kolla-ansible
Code Issues Proposed changes

Merge "Set release tag to 'latest' for development branch"

Browse Source
This commit is contained in:
Jenkins 2015-05-18 21:45:03 +00:00 committed by Gerrit Code Review
commit ac97b74052
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/glance-api-registry.yml
View File

@ -1,12 +1,12 @@
glanceregistry:
image: kollaglue/centos-rdo-glance-registry:kilo
image: kollaglue/centos-rdo-glance-registry:latest
name: glance-registry
net: "host"
restart: always
env_file:
- openstack.env
glanceapi:
image: kollaglue/centos-rdo-glance-api:kilo
image: kollaglue/centos-rdo-glance-api:latest
name: glance-api
net: "host"
restart: always

2
compose/heat-api-cfn.yml
View File

@ -1,5 +1,5 @@
heatapicfn:
image: kollaglue/centos-rdo-heat-api-cfn:kilo
image: kollaglue/centos-rdo-heat-api-cfn:latest
name: heat-api-cfn
net: "host"
restart: always

6
compose/heat-api-engine.yml
View File

@ -1,19 +1,19 @@
heatapi:
image: kollaglue/centos-rdo-heat-api:kilo
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:kilo
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:kilo
image: kollaglue/centos-rdo-heat-api-cfn:latest
name: heat-api-cfn
net: "host"
restart: always

2
compose/horizon.yml
View File

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

2
compose/keystone.yml
View File

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

4
compose/magnum-api-conductor.yml
View File

@ -1,12 +1,12 @@
magnumapi:
image: kollaglue/centos-rdo-magnum-api:kilo
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:kilo
image: kollaglue/centos-rdo-magnum-conductor:latest
name: magnum-conductor
net: "host"
restart: always

4
compose/mariadb.yml
View File

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

2
compose/neutron-agents.yml
View File

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

2
compose/neutron-server.yml
View File

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

10
compose/nova-api-compute-network.yml
View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:kilo
image: kollaglue/centos-rdo-nova-compute-data:latest
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:kilo
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:kilo
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:kilo
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:kilo
image: kollaglue/centos-rdo-nova-compute:latest
name: nova-compute
net: host
privileged: true

10
compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
View File

@ -1,5 +1,5 @@
novaconductor:
image: kollaglue/centos-rdo-nova-conductor:kilo
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:kilo
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:kilo
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:kilo
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:kilo
image: kollaglue/centos-rdo-nova-novncproxy:latest
name: nova-novncproxy
net: "host"
restart: always

8
compose/nova-compute-network.yml
View File

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

6
compose/nova-compute.yml
View File

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

2
compose/rabbitmq.yml
View File

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

2
tools/build-docker-image
View File

@ -7,7 +7,7 @@ RELEASE_NAMESPACE=kollaglue
NAMESPACE=kollaglue
PREFIX=centos-rdo-
TAG=$(git rev-parse --short HEAD)
RELEASE_TAG=kilo
RELEASE_TAG=latest
usage () {
cat <<EOF