Port to Kilo

Use kilo upstream RPM packages

Partially-implements: blueprint port-kilo

Change-Id: Ia0b4db5dc8e40c01184871e77458dc718c3c46cd

12 files changed, 28 insertions, 28 deletions

diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
index 0cd0753e3..c98eee01e 100644
--- a/compose/glance-api-registry.yml
+++ b/compose/glance-api-registry.yml
@@ -1,12 +1,12 @@
 glanceregistry:
-  image: kollaglue/centos-rdo-glance-registry:juno
+  image: kollaglue/centos-rdo-glance-registry:kilo
   name: glance-registry
   net: "host"
   restart: always
   env_file:
    - openstack.env
 glanceapi:
-  image: kollaglue/centos-rdo-glance-api:juno
+  image: kollaglue/centos-rdo-glance-api:kilo
   name: glance-api
   net: "host"
   restart: always
diff --git a/compose/heat-api-cfn.yml b/compose/heat-api-cfn.yml
index 3991ff06d..aab721e69 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:juno
+  image: kollaglue/centos-rdo-heat-api-cfn:kilo
   name: heat-api-cfn
   net: "host"
   restart: always
diff --git a/compose/heat-api-engine.yml b/compose/heat-api-engine.yml
index d35b38aaa..fe05e3812 100644
--- a/compose/heat-api-engine.yml
+++ b/compose/heat-api-engine.yml
@@ -1,12 +1,12 @@
 heatapi:
-  image: kollaglue/centos-rdo-heat-api:juno
+  image: kollaglue/centos-rdo-heat-api:kilo
   name: heat-api
   net: "host"
   restart: always
   env_file:
    - openstack.env
 heatengine:
-  image: kollaglue/centos-rdo-heat-engine:juno
+  image: kollaglue/centos-rdo-heat-engine:kilo
   name: heat-engine
   net: "host"
   restart: always
diff --git a/compose/horizon.yml b/compose/horizon.yml
index 0218f222c..822a88aa4 100644
--- a/compose/horizon.yml
+++ b/compose/horizon.yml
@@ -1,5 +1,5 @@
 horizon:
-  image: kollaglue/centos-rdo-horizon:juno
+  image: kollaglue/centos-rdo-horizon:kilo
   name: horizon
   net: "host"
   restart: always
diff --git a/compose/mariadb.yml b/compose/mariadb.yml
index e3f970d43..ba803d532 100644
--- a/compose/mariadb.yml
+++ b/compose/mariadb.yml
@@ -1,10 +1,10 @@
 mariadbdata:
-  image: kollaglue/centos-rdo-mariadb-data:juno
+  image: kollaglue/centos-rdo-mariadb-data:kilo
   name: mariadbdata
   restart: on-failure
 
 mariadbapp:
-  image: kollaglue/centos-rdo-mariadb-app:juno
+  image: kollaglue/centos-rdo-mariadb-app:kilo
   name: mariadbapp
   restart: always
   env_file:
diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml
index fdf0aa8d4..f474bd053 100644
--- a/compose/neutron-agents.yml
+++ b/compose/neutron-agents.yml
@@ -1,5 +1,5 @@
 neutronagents:
-  image: kollaglue/centos-rdo-neutron-agents:juno
+  image: kollaglue/centos-rdo-neutron-agents:kilo
   name: neutron-agents
   net: "host"
   privileged: true
diff --git a/compose/neutron-server.yml b/compose/neutron-server.yml
index d06265b5f..24aaa5d59 100644
--- a/compose/neutron-server.yml
+++ b/compose/neutron-server.yml
@@ -1,5 +1,5 @@
 neutronserver:
-  image: kollaglue/centos-rdo-neutron-server:juno
+  image: kollaglue/centos-rdo-neutron-server:kilo
   name: neutron-server
   net: "host"
   restart: always
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml
index 6cc7e6da2..0efe8208b 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:juno
+   image: kollaglue/centos-rdo-nova-compute-data:kilo
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:juno
+   image: kollaglue/centos-rdo-nova-libvirt:kilo
    name: libvirt
    net: host
    pid: host
@@ -19,7 +19,7 @@ libvirt:
     - computedata
 
 novanetwork:
-   image: kollaglue/centos-rdo-nova-network:juno
+   image: kollaglue/centos-rdo-nova-network:kilo
    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:juno
+  image: kollaglue/centos-rdo-nova-api:kilo
   name: nova-api
   privileged: True
   net: "host"
@@ -49,7 +49,7 @@ novaapi:
    - /lib/modules:/lib/modules:ro
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute:juno
+   image: kollaglue/centos-rdo-nova-compute:kilo
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
index 17b583d2e..ac89fd165 100644
--- a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
+++ b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
@@ -1,5 +1,5 @@
 novaconductor:
-  image: kollaglue/centos-rdo-nova-conductor:juno
+  image: kollaglue/centos-rdo-nova-conductor:kilo
   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:juno
+  image: kollaglue/centos-rdo-nova-api:kilo
   name: nova-api
   privileged: True
   net: "host"
@@ -18,7 +18,7 @@ novaapi:
    - openstack.env
 
 novascheduler:
-  image: kollaglue/centos-rdo-nova-scheduler:juno
+  image: kollaglue/centos-rdo-nova-scheduler:kilo
   name: nova-scheduler
   net: "host"
   restart: always
@@ -26,7 +26,7 @@ novascheduler:
    - openstack.env
 
 novaconsoleauth:
-   image: kollaglue/centos-rdo-nova-consoleauth:juno
+   image: kollaglue/centos-rdo-nova-consoleauth:kilo
    name: nova-consoleauth
    net: "host"
    restart: always
@@ -34,7 +34,7 @@ novaconsoleauth:
     - openstack.env
 
 novanovncproxy:
-   image: kollaglue/centos-rdo-nova-novncproxy:juno
+   image: kollaglue/centos-rdo-nova-novncproxy:kilo
    name: nova-novncproxy
    net: "host"
    restart: always
diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml
index 7b1009005..de851f4f4 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:juno
+   image: kollaglue/centos-rdo-nova-compute-data:kilo
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:juno
+   image: kollaglue/centos-rdo-nova-libvirt:kilo
    name: libvirt
    net: host
    pid: host
@@ -18,7 +18,7 @@ libvirt:
     - computedata
 
 novanetwork:
-   image: kollaglue/centos-rdo-nova-network:juno
+   image: kollaglue/centos-rdo-nova-network:kilo
    name: nova-network
    net: host
    privileged: true
@@ -33,7 +33,7 @@ novanetwork:
     - computedata
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute:juno
+   image: kollaglue/centos-rdo-nova-compute:kilo
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml
index 5627b5eed..5ccabb4c8 100644
--- a/compose/nova-compute.yml
+++ b/compose/nova-compute.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:juno
+   image: kollaglue/centos-rdo-nova-compute-data:kilo
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:juno
+   image: kollaglue/centos-rdo-nova-libvirt:kilo
    name: libvirt
    net: host
    pid: host
@@ -19,7 +19,7 @@ libvirt:
     - computedata
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute:juno
+   image: kollaglue/centos-rdo-nova-compute:kilo
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/rabbitmq.yml b/compose/rabbitmq.yml
index 600b3cc8f..f2cfc6fb5 100644
--- a/compose/rabbitmq.yml
+++ b/compose/rabbitmq.yml
@@ -1,5 +1,5 @@
 rabbitmq:
-  image: kollaglue/centos-rdo-rabbitmq:juno
+  image: kollaglue/centos-rdo-rabbitmq:kilo
   name: rabbitmq
   restart: always
   net: "host"