diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml index c869ce293f..0cd0753e39 100644 --- a/compose/glance-api-registry.yml +++ b/compose/glance-api-registry.yml @@ -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 diff --git a/compose/heat-api-cfn.yml b/compose/heat-api-cfn.yml index fdc8762ab8..3991ff06dd 100644 --- a/compose/heat-api-cfn.yml +++ b/compose/heat-api-cfn.yml @@ -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 diff --git a/compose/heat-api-engine.yml b/compose/heat-api-engine.yml index dd9afdeb51..d35b38aaa0 100644 --- a/compose/heat-api-engine.yml +++ b/compose/heat-api-engine.yml @@ -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 diff --git a/compose/horizon.yml b/compose/horizon.yml index a44c1d9b9e..0218f222c8 100644 --- a/compose/horizon.yml +++ b/compose/horizon.yml @@ -1,5 +1,5 @@ horizon: - image: kollaglue/centos-rdo-horizon:icehouse + image: kollaglue/centos-rdo-horizon:juno name: horizon net: "host" restart: always diff --git a/compose/keystone.yml b/compose/keystone.yml index 2806e7479d..60156d23f5 100644 --- a/compose/keystone.yml +++ b/compose/keystone.yml @@ -1,5 +1,5 @@ keystone: - image: kollaglue/centos-rdo-keystone:icehouse + image: kollaglue/centos-rdo-keystone:juno name: keystone restart: always net: "host" diff --git a/compose/mariadb.yml b/compose/mariadb.yml index b07544a73b..e3f970d43a 100644 --- a/compose/mariadb.yml +++ b/compose/mariadb.yml @@ -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: diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml index 1999b36fe8..fdf0aa8d4a 100644 --- a/compose/neutron-agents.yml +++ b/compose/neutron-agents.yml @@ -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 diff --git a/compose/neutron-server.yml b/compose/neutron-server.yml index e5aef6a481..d06265b5fc 100644 --- a/compose/neutron-server.yml +++ b/compose/neutron-server.yml @@ -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 diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml index 28c6244249..6cc7e6da24 100644 --- a/compose/nova-api-compute-network.yml +++ b/compose/nova-api-compute-network.yml @@ -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 diff --git a/compose/nova-api-conductor-scheduler.yml b/compose/nova-api-conductor-scheduler.yml index ff17ec36aa..4415f72f41 100644 --- a/compose/nova-api-conductor-scheduler.yml +++ b/compose/nova-api-conductor-scheduler.yml @@ -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 diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml index d6690f632a..7b1009005a 100644 --- a/compose/nova-compute-network.yml +++ b/compose/nova-compute-network.yml @@ -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 diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml index 9200ac6dbf..5627b5eedb 100644 --- a/compose/nova-compute.yml +++ b/compose/nova-compute.yml @@ -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 diff --git a/compose/rabbitmq.yml b/compose/rabbitmq.yml index 16ce7caa3f..600b3cc8f5 100644 --- a/compose/rabbitmq.yml +++ b/compose/rabbitmq.yml @@ -1,5 +1,5 @@ rabbitmq: - image: kollaglue/centos-rdo-rabbitmq:icehouse + image: kollaglue/centos-rdo-rabbitmq:juno name: rabbitmq restart: always net: "host" diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 963aadcf99..4db4c7cdb1 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -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 diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile index 96f2e49510..f41cac97ed 100644 --- a/docker/fedora-rdo-base/Dockerfile +++ b/docker/fedora-rdo-base/Dockerfile @@ -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 diff --git a/tools/build-docker-image b/tools/build-docker-image index 974c5a5eb9..44c3d838f8 100755 --- a/tools/build-docker-image +++ b/tools/build-docker-image @@ -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 <