Skip to content
Snippets Groups Projects
Commit d30f69bc authored by Steven Dake's avatar Steven Dake
Browse files

Port to icehouse

This represents making build-docker-images --release build
with the icehouse tag and causes docker-compsoe to pull from
the icehouse tag.

Partially-implements: blueprint port-kilo

Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
parent d8a7af93
No related branches found
No related tags found
No related merge requests found
Showing
with 35 additions and 35 deletions
glanceregistry:
image: kollaglue/centos-rdo-glance-registry
image: kollaglue/centos-rdo-glance-registry:icehouse
name: glance-registry
net: "host"
restart: always
env_file:
- openstack.env
glanceapi:
image: kollaglue/centos-rdo-glance-api
image: kollaglue/centos-rdo-glance-api:icehouse
name: glance-api
net: "host"
restart: always
......
heatapicfn:
image: kollaglue/centos-rdo-heat-api-cfn
image: kollaglue/centos-rdo-heat-api-cfn:icehouse
name: heat-api-cfn
net: "host"
restart: always
......
heatapi:
image: kollaglue/centos-rdo-heat-api
image: kollaglue/centos-rdo-heat-api:icehouse
name: heat-api
net: "host"
restart: always
env_file:
- openstack.env
heatengine:
image: kollaglue/centos-rdo-heat-engine
image: kollaglue/centos-rdo-heat-engine:icehouse
name: heat-engine
net: "host"
restart: always
env_file:
- openstack.env
\ No newline at end of file
- openstack.env
horizon:
image: kollaglue/centos-rdo-horizon
image: kollaglue/centos-rdo-horizon:icehouse
name: horizon
net: "host"
restart: always
......
keystone:
image: kollaglue/centos-rdo-keystone
image: kollaglue/centos-rdo-keystone:icehouse
name: keystone
restart: always
net: "host"
......
mariadbdata:
image: kollaglue/centos-rdo-mariadb-data
image: kollaglue/centos-rdo-mariadb-data:icehouse
name: mariadbdata
restart: on-failure
mariadbapp:
image: kollaglue/centos-rdo-mariadb-app
image: kollaglue/centos-rdo-mariadb-app:icehouse
name: mariadbapp
restart: always
env_file:
......
neutronagents:
image: kollaglue/centos-rdo-neutron-agents:latest
image: kollaglue/centos-rdo-neutron-agents:icehouse
name: neutron-agents
net: "host"
privileged: true
......
neutronserver:
image: kollaglue/centos-rdo-neutron-server:latest
image: kollaglue/centos-rdo-neutron-server:icehouse
name: neutron-server
net: "host"
restart: always
......
computedata:
image: kollaglue/centos-rdo-nova-compute-data
image: kollaglue/centos-rdo-nova-compute-data:icehouse
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt
image: kollaglue/centos-rdo-nova-libvirt:icehouse
name: libvirt
net: host
pid: host
......@@ -19,7 +19,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network
image: kollaglue/centos-rdo-nova-network:icehouse
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:latest
image: kollaglue/centos-rdo-nova-api:icehouse
name: nova-api
privileged: True
net: "host"
......@@ -49,7 +49,7 @@ novaapi:
- /lib/modules:/lib/modules:ro
novacompute:
image: kollaglue/centos-rdo-nova-compute
image: kollaglue/centos-rdo-nova-compute:icehouse
name: nova-compute
net: host
privileged: true
......
novaconductor:
image: kollaglue/centos-rdo-nova-conductor:latest
image: kollaglue/centos-rdo-nova-conductor:icehouse
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:latest
image: kollaglue/centos-rdo-nova-api:icehouse
name: nova-api
privileged: True
net: "host"
......@@ -18,7 +18,7 @@ novaapi:
- openstack.env
novascheduler:
image: kollaglue/centos-rdo-nova-scheduler:latest
image: kollaglue/centos-rdo-nova-scheduler:icehouse
name: nova-scheduler
net: "host"
restart: always
......
computedata:
image: kollaglue/centos-rdo-nova-compute-data
image: kollaglue/centos-rdo-nova-compute-data:icehouse
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt
image: kollaglue/centos-rdo-nova-libvirt:icehouse
name: libvirt
net: host
pid: host
......@@ -18,7 +18,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network
image: kollaglue/centos-rdo-nova-network:icehouse
name: nova-network
net: host
privileged: true
......@@ -33,7 +33,7 @@ novanetwork:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute
image: kollaglue/centos-rdo-nova-compute:icehouse
name: nova-compute
net: host
privileged: true
......
computedata:
image: kollaglue/centos-rdo-nova-compute-data
image: kollaglue/centos-rdo-nova-compute-data:icehouse
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt
image: kollaglue/centos-rdo-nova-libvirt:icehouse
name: libvirt
net: host
pid: host
......@@ -19,7 +19,7 @@ libvirt:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute
image: kollaglue/centos-rdo-nova-compute:icehouse
name: nova-compute
net: host
privileged: true
......
rabbitmq:
image: kollaglue/centos-rdo-rabbitmq
image: kollaglue/centos-rdo-rabbitmq:icehouse
name: rabbitmq
restart: always
net: "host"
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all
......
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment