Uplift latest charts/images except ceph

Change-Id: I61e9221f362c99e32c2f3830358c541cc012a6d3

global/software/charts/ucp/drydock/drydock.yaml

@@ -102,7 +102,7 @@ metadata:
         name: ucp_service_accounts
         path: .ucp.drydock.keystone
       dest:
-        path: .values.endpoints.identity.auth.user
+        path: .values.endpoints.identity.drydock.user
 
     # Secrets
     - dest:
@@ -118,7 +118,7 @@ metadata:
         name: ucp_postgres_admin_password
         path: .
     - dest:
-        path: .values.endpoints.identity.auth.user.password
+        path: .values.endpoints.identity.auth.drydock.password
       src:
         schema: deckhand/Passphrase/v1
         name: ucp_drydock_keystone_password
@@ -152,8 +152,8 @@ data:
       node_selector_key: ucp-control-plane
       node_selector_value: enabled
     network:
-      drydock:
-        node_port:
+      api:
+        nodeport:
           enabled: true
     conf:
       drydock:

global/software/config/versions.yaml

@@ -4,256 +4,256 @@ data:
     kubernetes:
       apiserver:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/apiserver
         type: git
       apiserver-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+          reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
           subpath: calico
           type: git
         calico-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+          reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
           subpath: helm-toolkit
           type: git
         etcd:
           location: https://git.openstack.org/openstack/airship-promenade
-          reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+          reference: df19b615ca024a668ff517391141a9f29ed36731
           subpath: charts/etcd
           type: git
         etcd-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+          reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
           subpath: helm-toolkit
           type: git
       controller-manager:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/controller_manager
         type: git
       controller-manager-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       coredns:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/coredns
         type: git
       coredns-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       etcd:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/etcd
         type: git
       etcd-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       haproxy:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/haproxy
         type: git
       haproxy-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       proxy:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/proxy
         type: git
       proxy-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       scheduler:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/scheduler
         type: git
       scheduler-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
     osh:
       barbican:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: barbican
         type: git
       cinder:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: cinder
         type: git
       glance:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: glance
         type: git
       heat:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: heat
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       horizon:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: horizon
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: ingress
         type: git
       keystone:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: keystone
         type: git
       libvirt:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: libvirt
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: mariadb
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: memcached
         type: git
       neutron:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: neutron
         type: git
       nova:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: nova
         type: git
       openvswitch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: openvswitch
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: rabbitmq
         type: git
     osh_infra:
       elasticsearch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: elasticsearch
         type: git
       fluent_logging:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: fluent-logging
         type: git
       grafana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: kibana
         type: git
       nagios:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: nagios
         type: git
       prometheus:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: prometheus-openstack-exporter
         type: git
     ucp:
       armada:
         location: https://git.openstack.org/openstack/airship-armada
-        reference: 90618f549c1f6d7741b11dc5c4898f3c6d536895
+        reference: daa5863c07909dbf4337bb5c25df45efca5d6df3
         subpath: charts/armada
         type: git
       armada-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       barbican:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: barbican
         type: git
       barbican-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       ceph-client:
@@ -288,132 +288,132 @@ data:
         type: git
       deckhand:
         location: https://git.openstack.org/openstack/airship-deckhand
-        reference: 0b5aa2e98a1ab5ab8a58c9dec3c1f88ef00d17a9
+        reference: 243c2741bda763b5b7f76e0f2ee563c96b964e3b
         subpath: charts/deckhand
         type: git
       deckhand-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       divingbell:
         location: https://git.openstack.org/openstack/airship-divingbell
-        reference: 73880a9973a3e6608287e5fc290529ce0ca76c84
+        reference: d734925bb6d80bb0fd3970641d7be08a70f1a453
         subpath: divingbell
         type: git
       divingbell-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       drydock:
         location: https://git.openstack.org/openstack/airship-drydock
-        reference: 5344ed1957042680dbc415d6deebd46dcbae7f9a
+        reference: b52282db38f24c9d3035974d6d124ca6c82ffb29
         subpath: charts/drydock
         type: git
       drydock-htk:
-        location: https://git.openstack.org/openstack/openstack-helm
-        reference: 3aeba707e36f36909e51e1cb0a81565ee28e0afa
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       keystone:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: add7a9bc1175f6fafa8ea2918bc1d62209aaf243
+        reference: f97e644aa6701933041118b1a3fa6da6356c1667
         subpath: keystone
         type: git
       keystone-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       maas:
         location: https://git.openstack.org/openstack/airship-maas
-        reference: 9c2686bea7e5cb4907c929913af7d7fee8136bcb
+        reference: 8cbbc1015abf8a688e85c1314982a9cade35bd61
         subpath: charts/maas
         type: git
       maas-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: memcached
         type: git
       memcached-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       promenade:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 13d6831aa5853333e57278a6485dab9d46905e9e
+        reference: df19b615ca024a668ff517391141a9f29ed36731
         subpath: charts/promenade
         type: git
       promenade-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       shipyard:
         location: https://git.openstack.org/openstack/airship-shipyard
-        reference: 38a12fc4fcab839657fe80f6d00aa65ee40a4a22
+        reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
         subpath: charts/shipyard
         type: git
       shipyard-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
       tiller:
         location: https://git.openstack.org/openstack/airship-armada
-        reference: 90618f549c1f6d7741b11dc5c4898f3c6d536895
+        reference: daa5863c07909dbf4337bb5c25df45efca5d6df3
         subpath: charts/tiller
         type: git
       tiller-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 4f4e9c5838e9cdf25c453c6a5b85bfc1ce12ad91
+        reference: 7d228ef280ad4a9a7ee8757e816c81f5fb963994
         subpath: helm-toolkit
         type: git
   files:
@@ -660,7 +660,7 @@ data:
         apache_proxy: docker.io/httpd:2.4
         curator: docker.io/bobrik/curator:5.2.0
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-        elasticsearch: docker.io/elasticsearch:5.6.4
+        elasticsearch: docker.io/srwilkers/elasticsearch-s3:v0.1.0
         helm_tests: docker.io/openstackhelm/heat:ocata
         image_repo_sync: docker.io/docker:17.07.0
         memory_init: docker.io/openstackhelm/heat:ocata
@@ -689,7 +689,7 @@ data:
         apache_proxy: docker.io/httpd:2.4
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         image_repo_sync: docker.io/docker:17.07.0
-        nagios: quay.io/attcomdev/nagios:389472c05ea4bc9f9b9e407e05e17527bfdce3cc
+        nagios: quay.io/attcomdev/nagios:46d4812f74a7cfc1f57fa9fffbc808facfc1bec1
       prometheus:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         helm_tests: docker.io/openstackhelm/heat:ocata
@@ -713,10 +713,10 @@ data:
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
-        prometheus_openstack_exporter: quay.io/attcomdev/prometheus-openstack-exporter:3231f14419f0c47547ce2551b7d884cd222104e6
+        prometheus_openstack_exporter: quay.io/attcomdev/prometheus-openstack-exporter:bcce8711f24137d6b9018aa5f780c111784e6d65
     ucp:
       armada:
-        api: quay.io/airshipit/armada:90618f549c1f6d7741b11dc5c4898f3c6d536895
+        api: quay.io/airshipit/armada:daa5863c07909dbf4337bb5c25df45efca5d6df3
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
         image_repo_sync: docker.io/docker:17.07.0
@@ -738,8 +738,8 @@ data:
         scripted_test: docker.io/openstackhelm/heat:ocata
       deckhand:
         db_init: docker.io/postgres:9.5
-        db_sync: quay.io/airshipit/deckhand:eaf866d44e6f43119dcb4bc0bbd76cf3892954a6
-        deckhand: quay.io/airshipit/deckhand:eaf866d44e6f43119dcb4bc0bbd76cf3892954a6
+        db_sync: quay.io/airshipit/deckhand:243c2741bda763b5b7f76e0f2ee563c96b964e3b
+        deckhand: quay.io/airshipit/deckhand:243c2741bda763b5b7f76e0f2ee563c96b964e3b
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
@@ -748,9 +748,9 @@ data:
         divingbell: docker.io/ubuntu:16.04
       drydock:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-        drydock: quay.io/airshipit/drydock:5344ed1957042680dbc415d6deebd46dcbae7f9a
+        drydock: quay.io/airshipit/drydock:b52282db38f24c9d3035974d6d124ca6c82ffb29
         drydock_db_init: docker.io/postgres:9.5
-        drydock_db_sync: quay.io/airshipit/drydock:5344ed1957042680dbc415d6deebd46dcbae7f9a
+        drydock_db_sync: quay.io/airshipit/drydock:b52282db38f24c9d3035974d6d124ca6c82ffb29
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
@@ -809,7 +809,7 @@ data:
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
-        promenade: quay.io/airshipit/promenade:24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
+        promenade: quay.io/airshipit/promenade:df19b615ca024a668ff517391141a9f29ed36731
       rabbitmq:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         image_repo_sync: docker.io/docker:17.07.0
@@ -818,17 +818,17 @@ data:
         rabbitmq: docker.io/rabbitmq:3.7.4
         scripted_test: docker.io/rabbitmq:3.7-management
       shipyard:
-        airflow: quay.io/airshipit/airflow:d937a165e2032903bdbaa19b8f119547ee770229
+        airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
         airflow_db_init: docker.io/postgres:9.5
-        airflow_db_sync: quay.io/airshipit/airflow:d937a165e2032903bdbaa19b8f119547ee770229
+        airflow_db_sync: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         image_repo_sync: docker.io/docker:17.07.0
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
-        shipyard: quay.io/airshipit/shipyard:d937a165e2032903bdbaa19b8f119547ee770229
+        shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
         shipyard_db_init: docker.io/postgres:9.5
-        shipyard_db_sync: quay.io/airshipit/shipyard:d937a165e2032903bdbaa19b8f119547ee770229
+        shipyard_db_sync: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
       tiller:
         tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
   images_refs: