From 52d22a61276749c1424450027dc00997db0506df Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sun, 20 Jan 2019 06:23:07 +0000 Subject: [PATCH] Rename caiapi_noggin -> caiapi-noggin Signed-off-by: Patrick Uiterwijk --- playbooks/openshift-apps/caiapi_noggin.yml | 20 +++++++++---------- .../files/deploymentconfig_caiapi.yml | 6 +++--- .../caiapi_noggin/files/service_caiapi.yml | 4 ++-- .../templates/configmap_caiapi.yml | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/playbooks/openshift-apps/caiapi_noggin.yml b/playbooks/openshift-apps/caiapi_noggin.yml index b9e7220083..b7b0346565 100644 --- a/playbooks/openshift-apps/caiapi_noggin.yml +++ b/playbooks/openshift-apps/caiapi_noggin.yml @@ -10,40 +10,40 @@ roles: - role: openshift/project - app: caiapi_noggin + app: caiapi-noggin description: CAIAPI and Noggin appowners: - puiterwijk - role: openshift/imagestream - app: caiapi_noggin + app: caiapi-noggin imagename: caiapi - role: openshift/imagestream - app: caiapi_noggin + app: caiapi-noggin imagename: noggin - role: openshift/object - app: caiapi_noggin + app: caiapi-noggin objectname: buildconfig_caiapi.yml template: buildconfig_caiapi.yml - role: openshift/start-build - app: caiapi_noggin + app: caiapi-noggin buildname: caiapi-build - role: openshift/object - app: caiapi_noggin + app: caiapi-noggin template: configmap_caiapi.yml objectname: configmap_caiapi.yml - role: openshift/object - app: caiapi_noggin + app: caiapi-noggin file: service_caiapi.yml objectname: service_caiapi.yml - role: openshift/route - app: caiapi_noggin + app: caiapi-noggin routename: caiapi host: "caiapi{{ env_suffix }}.fedoraproject.org" servicename: caiapi - role: openshift/object - app: caiapi_noggin + app: caiapi-noggin file: deploymentconfig_caiapi.yml objectname: deploymentconfig_caiapi.yml - role: openshift/rollout - app: caiapi_noggin + app: caiapi-noggin dcname: caiapi diff --git a/roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml b/roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml index cac049080f..7c66fb4e18 100644 --- a/roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml +++ b/roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DeploymentConfig metadata: labels: - app: caiapi_noggin + app: caiapi-noggin service: caiapi name: caiapi spec: @@ -18,12 +18,12 @@ spec: template: metadata: labels: - app: caiapi_noggin + app: caiapi-noggin deploymentconfig: caiapi spec: containers: - name: caiapi - image: caiapi_noggin/caiapi:latest + image: caiapi-noggin/caiapi:latest env: - name: CAIAPI_SETTINGS value: /etc/caiapi/caiapi.cfg diff --git a/roles/openshift-apps/caiapi_noggin/files/service_caiapi.yml b/roles/openshift-apps/caiapi_noggin/files/service_caiapi.yml index 6d49e45245..3151dc80a0 100644 --- a/roles/openshift-apps/caiapi_noggin/files/service_caiapi.yml +++ b/roles/openshift-apps/caiapi_noggin/files/service_caiapi.yml @@ -3,9 +3,9 @@ kind: Service metadata: name: caiapi labels: - app: caiapi_noggin + app: caiapi-noggin service: caiapi - namespace: caiapi_noggin + namespace: caiapi-noggin spec: ports: - name: web diff --git a/roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml b/roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml index 627ca4c79d..65bdf2266f 100644 --- a/roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml +++ b/roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: caiapi-configmap labels: - app: caiapi_noggin + app: caiapi-noggin data: caiapi.cfg: |- # TODO