Remove OpenShift containers

See I6a73f7f22dda69bef324ffdaecdcd6be693c1257 for the whole context but we are removing OpenShift from TripleO. Note: the scripts/tripleo-deploy-openshift script hasn't been removed yet because we need to update the packaging first in https://review.rdoproject.org/r/#/c/21749 but first it requires the unit tests to be removed. Change-Id: Ia64ceb1f05d96d2358509392bb3cbc3b9cb61030
2019-08-06 17:20:42 -04:00 · 2019-08-06 17:20:42 -04:00 · 220c6dec7f
parent a3dc7aa00c
commit 220c6dec7f
5 changed files with 0 additions and 475 deletions
--- a/container-images/container_image_prepare_defaults.yaml
+++ b/container-images/container_image_prepare_defaults.yaml
@ -44,48 +44,3 @@ parameter_defaults:
      ceph_grafana_namespace: docker.io/grafana
      ceph_grafana_image: grafana
      ceph_grafana_tag: latest
-
-      # Container image name components for OpenShift images.
-      # Only used if OpenShift is deployed.
-      openshift_namespace: docker.io/openshift
-      openshift_tag: v3.11.0
-      openshift_prefix: origin
-      openshift_cockpit_namespace: docker.io/cockpit
-      openshift_cockpit_image: kubernetes
-      openshift_cockpit_tag: latest
-      openshift_etcd_namespace: registry.fedoraproject.org/latest
-      openshift_etcd_image: etcd
-      openshift_etcd_tag: latest
-      openshift_gluster_namespace: docker.io/gluster
-      openshift_gluster_image: gluster-centos
-      openshift_gluster_block_image: glusterblock-provisioner
-      openshift_gluster_tag: latest
-      openshift_heketi_namespace: docker.io/heketi
-      openshift_heketi_image: heketi
-      openshift_heketi_tag: latest
-      openshift_asb_namespace: docker.io/ansibleplaybookbundle
-      openshift_asb_tag: latest
-      openshift_cluster_monitoring_namespace: quay.io/coreos
-      openshift_cluster_monitoring_image: cluster-monitoring-operator
-      openshift_cluster_monitoring_tag: v0.1.1
-      openshift_configmap_reload_namespace: quay.io/coreos
-      openshift_configmap_reload_image: configmap-reload
-      openshift_configmap_reload_tag: v0.0.1
-      openshift_prometheus_operator_namespace: quay.io/coreos
-      openshift_prometheus_operator_image: prometheus-operator
-      openshift_prometheus_operator_tag: v0.23.2
-      openshift_prometheus_config_reload_namespace: quay.io/coreos
-      openshift_prometheus_config_reload_image: prometheus-config-reloader
-      openshift_prometheus_config_reload_tag: v0.23.2
-      openshift_prometheus_tag: v2.3.2
-      openshift_prometheus_alertmanager_tag: v0.15.2
-      openshift_prometheus_node_exporter_tag: v0.16.0
-      openshift_oauth_proxy_tag: v1.1.0
-      openshift_kube_rbac_proxy_namespace: quay.io/coreos
-      openshift_kube_rbac_proxy_image: kube-rbac-proxy
-      openshift_kube_rbac_proxy_tag: v0.3.1
-      openshift_kube_state_metrics_namespace: quay.io/coreos
-      openshift_kube_state_metrics_image: kube-state-metrics
-      openshift_kube_state_metrics_tag: v1.3.1
-      openshift_grafana_namespace: docker.io/grafana
-      openshift_grafana_tag: 5.2.1
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@ -211,61 +211,3 @@ container_images:
  image_source: kolla
 - imagename: docker.io/tripleomaster/centos-binary-rsyslog:current-tripleo
  image_source: kolla
- imagename: docker.io/openshift/origin-ansible:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-console:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-control-plane:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-deployer:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-docker-builder:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-docker-registry:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-haproxy-router:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-node:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-pod:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-service-catalog:v3.11.0
-  image_source: openshift
- imagename: docker.io/openshift/origin-template-service-broker:v3.11.0
-  image_source: openshift
- imagename: docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest
-  image_source: openshift
- imagename: docker.io/openshift/origin-web-console:v3.11.0
-  image_source: openshift
- imagename: docker.io/cockpit/kubernetes:latest
-  image_source: openshift
- imagename: registry.fedoraproject.org/latest/etcd:latest
-  image_source: openshift
- imagename: docker.io/gluster/gluster-centos:latest
-  image_source: openshift
- imagename: docker.io/gluster/glusterblock-provisioner:latest
-  image_source: openshift
- imagename: docker.io/heketi/heketi:latest
-  image_source: openshift
- imagename: quay.io/coreos/cluster-monitoring-operator:v0.1.1
-  image_source: openshift
- imagename: quay.io/coreos/configmap-reload:v0.0.1
-  image_source: openshift
- imagename: quay.io/coreos/prometheus-operator:v0.23.2
-  image_source: openshift
- imagename: quay.io/coreos/prometheus-config-reloader:v0.23.2
-  image_source: openshift
- imagename: docker.io/openshift/prometheus:v2.3.2
-  image_source: openshift
- imagename: docker.io/openshift/prometheus-alertmanager:v0.15.2
-  image_source: openshift
- imagename: docker.io/openshift/prometheus-node-exporter:v0.16.0
-  image_source: openshift
- imagename: docker.io/openshift/oauth-proxy:v1.1.0
-  image_source: openshift
- imagename: quay.io/coreos/kube-rbac-proxy:v0.3.1
-  image_source: openshift
- imagename: quay.io/coreos/kube-state-metrics:v1.3.1
-  image_source: openshift
- imagename: docker.io/grafana/grafana:5.2.1
-  image_source: openshift
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@ -917,215 +917,3 @@ container_images_template:
  - OS::TripleO::Services::Rsyslog
  - OS::TripleO::Services::SwiftProxy
  - OS::TripleO::Services::SwiftStorage
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-ansible:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftAnsibleImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-console:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftConsoleImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-control-plane:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftControlPlaneImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-deployer:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftDeployerImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-  - OS::TripleO::Services::OpenShift::Master
-  - OS::TripleO::Services::OpenShift::Worker
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-builder:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftDockerBuilderImage
-  services:
-  - OS::TripleO::Services::OpenShift::Worker
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-registry:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftDockerRegistryImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-haproxy-router:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftHAProxyRouterImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-node:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftNodeImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-  - OS::TripleO::Services::OpenShift::Master
-  - OS::TripleO::Services::OpenShift::Worker
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-pod:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftPodImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-  - OS::TripleO::Services::OpenShift::Master
-  - OS::TripleO::Services::OpenShift::Worker
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-service-catalog:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftServiceCatalogImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-template-service-broker:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftTemplateServiceBrokerImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_asb_namespace}}/{{openshift_prefix}}-ansible-service-broker:{{openshift_asb_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftAnsibleServiceBrokerImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftWebConsoleImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_cockpit_namespace}}/{{openshift_cockpit_image}}:{{openshift_cockpit_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftCockpitImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_etcd_namespace}}/{{openshift_etcd_image}}:{{openshift_etcd_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftEtcdImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_image}}:{{openshift_gluster_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftGlusterFSImage
-  services:
-  - OS::TripleO::Services::OpenShift::GlusterFS
-
- imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_block_image}}:{{openshift_gluster_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftGlusterFSBlockImage
-  services:
-  - OS::TripleO::Services::OpenShift::GlusterFS
-
- imagename: "{{openshift_heketi_namespace}}/{{openshift_heketi_image}}:{{openshift_heketi_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftGlusterFSHeketiImage
-  services:
-  - OS::TripleO::Services::OpenShift::GlusterFS
-
- imagename: "{{openshift_cluster_monitoring_namespace}}/{{openshift_cluster_monitoring_image}}:{{openshift_cluster_monitoring_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftClusterMonitorOperatorImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_configmap_reload_namespace}}/{{openshift_configmap_reload_image}}:{{openshift_configmap_reload_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftConfigmapReloaderImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_prometheus_operator_namespace}}/{{openshift_prometheus_operator_image}}:{{openshift_prometheus_operator_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftPrometheusOperatorImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_prometheus_config_reload_namespace}}/{{openshift_prometheus_config_reload_image}}:{{openshift_prometheus_config_reload_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftPrometheusConfigReloaderImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/prometheus:{{openshift_prometheus_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftPrometheusImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/prometheus-alertmanager:{{openshift_prometheus_alertmanager_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftPrometheusAlertmanagerImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/prometheus-node-exporter:{{openshift_prometheus_node_exporter_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftPrometheusNodeExporterImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-  - OS::TripleO::Services::OpenShift::Worker
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_namespace}}/oauth-proxy:{{openshift_oauth_proxy_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftOauthProxyImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_kube_rbac_proxy_namespace}}/{{openshift_kube_rbac_proxy_image}}:{{openshift_kube_rbac_proxy_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftKubeRbacProxyImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-  - OS::TripleO::Services::OpenShift::Worker
-
- imagename: "{{openshift_kube_state_metrics_namespace}}/{{openshift_kube_state_metrics_image}}:{{openshift_kube_state_metrics_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftKubeStateMetricsImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-
- imagename: "{{openshift_grafana_namespace}}/grafana:{{openshift_grafana_tag}}"
-  image_source: openshift
-  params:
-  - ContainerOpenShiftGrafanaImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@ -253,52 +253,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                'name_suffix': '',
                'tag': 'current-tripleo',
                'neutron_driver': 'ovn',
-                'openshift_namespace': 'docker.io/openshift',
-                'openshift_tag': 'v3.11.0',
-                'openshift_prefix': 'origin',
-                'openshift_cockpit_namespace': 'docker.io/cockpit',
-                'openshift_cockpit_image': 'kubernetes',
-                'openshift_cockpit_tag': 'latest',
-                'openshift_etcd_namespace': 'registry.fedoraproject.org'
-                '/latest',
-                'openshift_etcd_image': 'etcd',
-                'openshift_etcd_tag': 'latest',
-                'openshift_gluster_namespace': 'docker.io/gluster',
-                'openshift_gluster_image': 'gluster-centos',
-                'openshift_gluster_block_image': 'glusterblock-provisioner',
-                'openshift_gluster_tag': 'latest',
-                'openshift_heketi_namespace': 'docker.io/heketi',
-                'openshift_heketi_image': 'heketi',
-                'openshift_heketi_tag': 'latest',
-                'openshift_asb_namespace': 'docker.io/ansibleplaybookbundle',
-                'openshift_asb_tag': 'latest',
-                'openshift_cluster_monitoring_namespace': 'quay.io/coreos',
-                'openshift_cluster_monitoring_image':
-                    'cluster-monitoring-operator',
-                'openshift_cluster_monitoring_tag': 'v0.1.1',
-                'openshift_configmap_reload_namespace': 'quay.io/coreos',
-                'openshift_configmap_reload_image': 'configmap-reload',
-                'openshift_configmap_reload_tag': 'v0.0.1',
-                'openshift_prometheus_operator_namespace': 'quay.io/coreos',
-                'openshift_prometheus_operator_image': 'prometheus-operator',
-                'openshift_prometheus_operator_tag': 'v0.23.2',
-                'openshift_prometheus_config_reload_namespace':
-                    'quay.io/coreos',
-                'openshift_prometheus_config_reload_image':
-                    'prometheus-config-reloader',
-                'openshift_prometheus_config_reload_tag': 'v0.23.2',
-                'openshift_prometheus_tag': 'v2.3.2',
-                'openshift_prometheus_alertmanager_tag': 'v0.15.2',
-                'openshift_prometheus_node_exporter_tag': 'v0.16.0',
-                'openshift_oauth_proxy_tag': 'v1.1.0',
-                'openshift_kube_rbac_proxy_namespace': 'quay.io/coreos',
-                'openshift_kube_rbac_proxy_image': 'kube-rbac-proxy',
-                'openshift_kube_rbac_proxy_tag': 'v0.3.1',
-                'openshift_kube_state_metrics_namespace': 'quay.io/coreos',
-                'openshift_kube_state_metrics_image': 'kube-state-metrics',
-                'openshift_kube_state_metrics_tag': 'v1.3.1',
-                'openshift_grafana_namespace': 'docker.io/grafana',
-                'openshift_grafana_tag': '5.2.1',
            },
            builder.container_images_template_inputs()
        )
@ -325,62 +279,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                'name_suffix': '-suffix',
                'tag': 'master',
                'neutron_driver': 'ovn',
-                'openshift_namespace': 'docker.io/openshift3',
-                'openshift_tag': 'v3.11.0',
-                'openshift_prefix': 'ose',
-                'openshift_cockpit_namespace': 'docker.io/openshift-cockpit',
-                'openshift_cockpit_image': 'cockpit',
-                'openshift_cockpit_tag': 'cockpit-tag',
-                'openshift_etcd_namespace': 'registry.access.redhat.com/rhel7',
-                'openshift_etcd_image': 'openshift-etcd',
-                'openshift_etcd_tag': 'etcd-tag',
-                'openshift_gluster_namespace':
-                    'registry.access.redhat.com/rhgs3',
-                'openshift_gluster_image': 'rhgs-server-rhel7',
-                'openshift_gluster_block_image':
-                    'rhgs-gluster-block-prov-rhel7',
-                'openshift_gluster_tag': 'gluster-tag',
-                'openshift_heketi_namespace':
-                    'registry.access.redhat.com/rhgs3',
-                'openshift_heketi_image': 'rhgs-volmanager-rhel7',
-                'openshift_heketi_tag': 'heketi-tag',
-                'openshift_asb_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_asb_tag': 'v3.11',
-                'openshift_cluster_monitoring_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_cluster_monitoring_image':
-                    'ose-cluster-monitoring-operator',
-                'openshift_cluster_monitoring_tag': 'v3.11',
-                'openshift_configmap_reload_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_configmap_reload_image': 'ose-configmap-reloader',
-                'openshift_configmap_reload_tag': 'v3.11',
-                'openshift_prometheus_operator_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_prometheus_operator_image':
-                    'ose-prometheus-operator',
-                'openshift_prometheus_operator_tag': 'v3.11',
-                'openshift_prometheus_config_reload_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_prometheus_config_reload_image':
-                    'ose-prometheus-config-reloader',
-                'openshift_prometheus_config_reload_tag': 'v3.11',
-                'openshift_prometheus_tag': 'v3.11',
-                'openshift_prometheus_alertmanager_tag': 'v3.11',
-                'openshift_prometheus_node_exporter_tag': 'v3.11',
-                'openshift_oauth_proxy_tag': 'v3.11',
-                'openshift_kube_rbac_proxy_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_kube_rbac_proxy_image': 'ose-kube-rbac-proxy',
-                'openshift_kube_rbac_proxy_tag': 'v3.11',
-                'openshift_kube_state_metrics_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_kube_state_metrics_image': 'ose-kube-state-metrics',
-                'openshift_kube_state_metrics_tag': 'v3.11',
-                'openshift_grafana_namespace':
-                    'registry.access.redhat.com/openshift3',
-                'openshift_grafana_tag': 'v3.11',
            },
            builder.container_images_template_inputs(
                namespace='192.0.2.0:5000/tripleomaster',
@ -391,59 +289,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                name_suffix='suffix',
                tag='master',
                neutron_driver='ovn',
-                openshift_namespace='docker.io/openshift3',
-                openshift_tag='v3.11.0',
-                openshift_prefix='ose',
-                openshift_cockpit_namespace='docker.io/openshift-cockpit',
-                openshift_cockpit_image='cockpit',
-                openshift_cockpit_tag='cockpit-tag',
-                openshift_etcd_namespace='registry.access.redhat.com/rhel7',
-                openshift_etcd_image='openshift-etcd',
-                openshift_etcd_tag='etcd-tag',
-                openshift_gluster_namespace='registry.access.redhat.com/rhgs3',
-                openshift_gluster_image='rhgs-server-rhel7',
-                openshift_gluster_block_image='rhgs-gluster-block-prov-rhel7',
-                openshift_gluster_tag='gluster-tag',
-                openshift_heketi_namespace='registry.access.redhat.com/rhgs3',
-                openshift_heketi_image='rhgs-volmanager-rhel7',
-                openshift_heketi_tag='heketi-tag',
-                openshift_asb_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_asb_tag='v3.11',
-                openshift_cluster_monitoring_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_cluster_monitoring_image='ose-'
-                    'cluster-monitoring-operator',
-                openshift_cluster_monitoring_tag='v3.11',
-                openshift_configmap_reload_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_configmap_reload_image='ose-configmap-reloader',
-                openshift_configmap_reload_tag='v3.11',
-                openshift_prometheus_operator_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_prometheus_operator_image='ose-'
-                    'prometheus-operator',
-                openshift_prometheus_operator_tag='v3.11',
-                openshift_prometheus_config_reload_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_prometheus_config_reload_image='ose-'
-                    'prometheus-config-reloader',
-                openshift_prometheus_config_reload_tag='v3.11',
-                openshift_prometheus_tag='v3.11',
-                openshift_prometheus_alertmanager_tag='v3.11',
-                openshift_prometheus_node_exporter_tag='v3.11',
-                openshift_oauth_proxy_tag='v3.11',
-                openshift_kube_rbac_proxy_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_kube_rbac_proxy_image='ose-kube-rbac-proxy',
-                openshift_kube_rbac_proxy_tag='v3.11',
-                openshift_kube_state_metrics_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_kube_state_metrics_image='ose-kube-state-metrics',
-                openshift_kube_state_metrics_tag='v3.11',
-                openshift_grafana_namespace='registry.'
-                    'access.redhat.com/openshift3',
-                openshift_grafana_tag='v3.11',
            )
        )

@ -1001,7 +846,6 @@ class TestPrepare(base.TestCase):
                'OS::TripleO::Services::HeatApi',
                'OS::TripleO::Services::NovaApi',
                'OS::TripleO::Services::NovaCompute',
-                'OS::TripleO::Services::OpenShift::Master',
                'OS::TripleO::Services::Kubernetes::Worker',
                'OS::TripleO::Services::SkydiveAgent',
            ]),
@ -1013,8 +857,6 @@ class TestPrepare(base.TestCase):
                    '/tht/docker/services/foo.yaml',
                    'OS::TripleO::Services::NovaCompute':
                    '/tht/docker/services/foo.yaml',
-                    'OS::TripleO::Services::OpenShift::Master': 'deployment' +
-                    '/openshift/openshift-master-baremetal-ansible.yaml',
                    'OS::TripleO::Services::Kubernetes::Worker':
                    'deployment' +
                    'kubernetes/kubernetes-worker-baremetal-ansible.yaml',
@ -1031,7 +873,6 @@ class TestPrepare(base.TestCase):
                        'OS::TripleO::Services::HeatApi',
                        'OS::TripleO::Services::NeutronApi',
                        'OS::TripleO::Services::NovaApi',
-                        'OS::TripleO::Services::OpenShift::Master',
                        'OS::TripleO::Services::SkydiveAgent',
                        'OS::TripleO::Services::Noop'
                    ]
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@ -53,7 +53,6 @@
            files:
              - ^container-images/.*$
              - tripleo_common/image/kolla_builder.py
-              - scripts/tripleo-deploy-openshift
        - tripleo-ci-centos-7-standalone-upgrade:
            dependencies: *deps_unit_lint
        - tripleo-ci-centos-7-scenario001-standalone: