From 68594d873f7a1006fab5d360cb7c55bbb7ed421b Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 4 May 2015 19:10:22 -0700 Subject: Port to Juno This represents the Juno release of the images. Partially-implements: blueprint port-kilo Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf --- compose/glance-api-registry.yml | 4 ++-- compose/heat-api-cfn.yml | 2 +- compose/heat-api-engine.yml | 4 ++-- compose/horizon.yml | 2 +- compose/keystone.yml | 2 +- compose/mariadb.yml | 4 ++-- compose/neutron-agents.yml | 2 +- compose/neutron-server.yml | 2 +- compose/nova-api-compute-network.yml | 10 +++++----- compose/nova-api-conductor-scheduler.yml | 6 +++--- compose/nova-compute-network.yml | 8 ++++---- compose/nova-compute.yml | 6 +++--- compose/rabbitmq.yml | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) (limited to 'compose') diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml index c869ce293..0cd0753e3 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 fdc8762ab..3991ff06d 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 dd9afdeb5..d35b38aaa 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 a44c1d9b9..0218f222c 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 2806e7479..60156d23f 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 b07544a73..e3f970d43 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 1999b36fe..fdf0aa8d4 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 e5aef6a48..d06265b5f 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 28c624424..6cc7e6da2 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 ff17ec36a..4415f72f4 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 d6690f632..7b1009005 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 9200ac6db..5627b5eed 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 16ce7caa3..600b3cc8f 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" -- cgit v1.2.3