openstack
/
kolla
Code Issues Proposed changes

Port to Juno 

This represents the Juno release of the images.

Partially-implements: blueprint port-kilo

Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf
This commit is contained in:
Steven Dake 2015-05-04 19:10:22 -07:00
parent 6e11af5985
commit 68594d873f
16 changed files with 30 additions and 30 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:icehouse
image: kollaglue/centos-rdo-glance-registry:juno
name: glance-registry
net: "host"
restart: always
env_file:
- openstack.env
glanceapi:
image: kollaglue/centos-rdo-glance-api:icehouse
image: kollaglue/centos-rdo-glance-api:juno
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:icehouse
image: kollaglue/centos-rdo-heat-api-cfn:juno
name: heat-api-cfn
net: "host"
restart: always

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

@ -1,12 +1,12 @@
heatapi:
image: kollaglue/centos-rdo-heat-api:icehouse
image: kollaglue/centos-rdo-heat-api:juno
name: heat-api
net: "host"
restart: always
env_file:
- openstack.env
heatengine:
image: kollaglue/centos-rdo-heat-engine:icehouse
image: kollaglue/centos-rdo-heat-engine:juno
name: heat-engine
net: "host"
restart: always

2
compose/horizon.yml
View File

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

2
compose/keystone.yml
View File

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

4
compose/mariadb.yml
View File

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

2
compose/neutron-agents.yml
View File

@ -1,5 +1,5 @@
neutronagents:
image: kollaglue/centos-rdo-neutron-agents:icehouse
image: kollaglue/centos-rdo-neutron-agents:juno
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:icehouse
image: kollaglue/centos-rdo-neutron-server:juno
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:icehouse
image: kollaglue/centos-rdo-nova-compute-data:juno
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:icehouse
image: kollaglue/centos-rdo-nova-libvirt:juno
name: libvirt
net: host
pid: host
@ -19,7 +19,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network:icehouse
image: kollaglue/centos-rdo-nova-network:juno
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:icehouse
image: kollaglue/centos-rdo-nova-api:juno
name: nova-api
privileged: True
net: "host"
@ -49,7 +49,7 @@ novaapi:
- /lib/modules:/lib/modules:ro
novacompute:
image: kollaglue/centos-rdo-nova-compute:icehouse
image: kollaglue/centos-rdo-nova-compute:juno
name: nova-compute
net: host
privileged: true

6
compose/nova-api-conductor-scheduler.yml
View File

@ -1,5 +1,5 @@
novaconductor:
image: kollaglue/centos-rdo-nova-conductor:icehouse
image: kollaglue/centos-rdo-nova-conductor:juno
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:icehouse
image: kollaglue/centos-rdo-nova-api:juno
name: nova-api
privileged: True
net: "host"
@ -18,7 +18,7 @@ novaapi:
- openstack.env
novascheduler:
image: kollaglue/centos-rdo-nova-scheduler:icehouse
image: kollaglue/centos-rdo-nova-scheduler:juno
name: nova-scheduler
net: "host"
restart: always

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

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:icehouse
image: kollaglue/centos-rdo-nova-compute-data:juno
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:icehouse
image: kollaglue/centos-rdo-nova-libvirt:juno
name: libvirt
net: host
pid: host
@ -18,7 +18,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network:icehouse
image: kollaglue/centos-rdo-nova-network:juno
name: nova-network
net: host
privileged: true
@ -33,7 +33,7 @@ novanetwork:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute:icehouse
image: kollaglue/centos-rdo-nova-compute:juno
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:icehouse
image: kollaglue/centos-rdo-nova-compute-data:juno
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt:icehouse
image: kollaglue/centos-rdo-nova-libvirt:juno
name: libvirt
net: host
pid: host
@ -19,7 +19,7 @@ libvirt:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute:icehouse
image: kollaglue/centos-rdo-nova-compute:juno
name: nova-compute
net: host
privileged: true

2
compose/rabbitmq.yml
View File

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

2
docker/centos-rdo-base/Dockerfile
View File

@ -2,7 +2,7 @@ FROM centos
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
RUN yum -y install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm && yum clean all
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo
RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo

2
docker/fedora-rdo-base/Dockerfile
View File

@ -2,7 +2,7 @@ FROM fedora:20
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
RUN yum -y install https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
RUN yum -y install dnf dnf-plugins-core && yum clean all
RUN dnf copr enable -y larsks/crux
run dnf copr enable -y sdake/pam.noaudit

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=icehouse
RELEASE_TAG=juno
usage () {
cat <<EOF