From ceb30e8cc77bb0558badf83691eabc6294d5c1cb Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 28 Aug 2017 20:28:55 -0500 Subject: [PATCH] Jobs: Consoloate on heat-engine for admin jobs where possible. This ps moves to use a container sultaible for use as the heat engine for all possible admin jobs - it is lighter than the kolla-toolbox image and makes it easy to swap out to other image sets. This is as the heat engine container should contain the openstack client (with all required libs for the cloud) and the oslo_db supporting libs required by the db management jobs, as well as the oslo_messaging libs required for future rabbitmq management expansion. Change-Id: I5451c15c8fb49c85b4f254cc60156420bee2efea --- barbican/values.yaml | 12 ++++++------ cinder/values.yaml | 10 +++++----- glance/values.yaml | 11 ++++++----- heat/values.yaml | 10 +++++----- horizon/values.yaml | 2 +- keystone/values.yaml | 4 ++-- magnum/values.yaml | 10 +++++----- mistral/values.yaml | 10 +++++----- neutron/values.yaml | 10 +++++----- nova/values.yaml | 10 +++++----- senlin/values.yaml | 10 +++++----- 11 files changed, 50 insertions(+), 49 deletions(-) diff --git a/barbican/values.yaml b/barbican/values.yaml index acd6789c31..74433dac03 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -17,14 +17,14 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 - test: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 - db_init: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 + test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 pull_policy: "IfNotPresent" diff --git a/cinder/values.yaml b/cinder/values.yaml index a6f445a262..f1c78849c8 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -27,13 +27,13 @@ release_group: null images: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3 volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3 diff --git a/glance/values.yaml b/glance/values.yaml index c74d32c029..e51eb23be8 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -28,14 +28,15 @@ release_group: null images: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-glance-api:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-glance-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-glance-api:3.0.3 registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + # Bootstrap image requires curl + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 pull_policy: "IfNotPresent" diff --git a/heat/values.yaml b/heat/values.yaml index 26396e9f34..d808f735b2 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -24,12 +24,12 @@ labels: node_selector_value: enabled images: - bootstrap: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-heat-api:3.0.3 cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3 cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3 diff --git a/horizon/values.yaml b/horizon/values.yaml index de8df569d8..649dfb5b23 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -18,7 +18,7 @@ # name: value images: - db_init: docker.io/kolla/ubuntu-source-horizon:4.0.0 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-horizon:4.0.0 horizon: docker.io/kolla/ubuntu-source-horizon:4.0.0 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 diff --git a/keystone/values.yaml b/keystone/values.yaml index 2b3601b284..2d8ccb4bcd 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -24,9 +24,9 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-keystone:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-keystone:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3 fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 diff --git a/magnum/values.yaml b/magnum/values.yaml index 5bc293957b..aa4cf7732d 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -24,12 +24,12 @@ labels: node_selector_value: enabled images: - bootstrap: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 - db_init: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 conductor: docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 diff --git a/mistral/values.yaml b/mistral/values.yaml index 03ee733d5e..c5327f04ef 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -24,13 +24,13 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 - db_init: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 event_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 diff --git a/neutron/values.yaml b/neutron/values.yaml index 335c5d5d00..96a956560d 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -20,13 +20,13 @@ release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 server: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 dhcp: docker.io/kolla/ubuntu-source-neutron-dhcp-agent:3.0.3 metadata: docker.io/kolla/ubuntu-source-neutron-metadata-agent:3.0.3 diff --git a/nova/values.yaml b/nova/values.yaml index 274cd57990..6e74193c23 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -51,11 +51,11 @@ labels: images: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-nova-api:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-nova-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-nova-api:3.0.3 conductor: docker.io/kolla/ubuntu-source-nova-conductor:3.0.3 scheduler: docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3 @@ -64,7 +64,7 @@ images: consoleauth: docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3 compute: docker.io/kolla/ubuntu-source-nova-compute:3.0.3 libvirt: docker.io/kolla/ubuntu-source-nova-libvirt:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-nova-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 pull_policy: "IfNotPresent" diff --git a/senlin/values.yaml b/senlin/values.yaml index ab49e4b3e5..38edb1cdd5 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -24,12 +24,12 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 - db_init: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 db_sync: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0