From 89cc06ea08492444b04fba14b4f6ddf552ab5f3c Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sun, 20 Jan 2019 07:27:22 +0100 Subject: [PATCH] Rename caiapi_noggin -> accountsystem Signed-off-by: Patrick Uiterwijk --- .../{caiapi_noggin.yml => accountsystem.yml} | 20 +++++++++---------- .../files/deploymentconfig_caiapi.yml | 6 +++--- .../files/service_caiapi.yml | 4 ++-- .../templates/buildconfig_caiapi.yml | 0 .../templates/configmap_caiapi.yml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) rename playbooks/openshift-apps/{caiapi_noggin.yml => accountsystem.yml} (82%) rename roles/openshift-apps/{caiapi_noggin => accountsystem}/files/deploymentconfig_caiapi.yml (91%) rename roles/openshift-apps/{caiapi_noggin => accountsystem}/files/service_caiapi.yml (79%) rename roles/openshift-apps/{caiapi_noggin => accountsystem}/templates/buildconfig_caiapi.yml (100%) rename roles/openshift-apps/{caiapi_noggin => accountsystem}/templates/configmap_caiapi.yml (83%) diff --git a/playbooks/openshift-apps/caiapi_noggin.yml b/playbooks/openshift-apps/accountsystem.yml similarity index 82% rename from playbooks/openshift-apps/caiapi_noggin.yml rename to playbooks/openshift-apps/accountsystem.yml index b7b0346565..78e14cbadc 100644 --- a/playbooks/openshift-apps/caiapi_noggin.yml +++ b/playbooks/openshift-apps/accountsystem.yml @@ -10,40 +10,40 @@ roles: - role: openshift/project - app: caiapi-noggin + app: accountsystem description: CAIAPI and Noggin appowners: - puiterwijk - role: openshift/imagestream - app: caiapi-noggin + app: accountsystem imagename: caiapi - role: openshift/imagestream - app: caiapi-noggin + app: accountsystem imagename: noggin - role: openshift/object - app: caiapi-noggin + app: accountsystem objectname: buildconfig_caiapi.yml template: buildconfig_caiapi.yml - role: openshift/start-build - app: caiapi-noggin + app: accountsystem buildname: caiapi-build - role: openshift/object - app: caiapi-noggin + app: accountsystem template: configmap_caiapi.yml objectname: configmap_caiapi.yml - role: openshift/object - app: caiapi-noggin + app: accountsystem file: service_caiapi.yml objectname: service_caiapi.yml - role: openshift/route - app: caiapi-noggin + app: accountsystem routename: caiapi host: "caiapi{{ env_suffix }}.fedoraproject.org" servicename: caiapi - role: openshift/object - app: caiapi-noggin + app: accountsystem file: deploymentconfig_caiapi.yml objectname: deploymentconfig_caiapi.yml - role: openshift/rollout - app: caiapi-noggin + app: accountsystem dcname: caiapi diff --git a/roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml b/roles/openshift-apps/accountsystem/files/deploymentconfig_caiapi.yml similarity index 91% rename from roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml rename to roles/openshift-apps/accountsystem/files/deploymentconfig_caiapi.yml index 7c66fb4e18..c8e0ab5817 100644 --- a/roles/openshift-apps/caiapi_noggin/files/deploymentconfig_caiapi.yml +++ b/roles/openshift-apps/accountsystem/files/deploymentconfig_caiapi.yml @@ -2,7 +2,7 @@ apiVersion: v1 kind: DeploymentConfig metadata: labels: - app: caiapi-noggin + app: accountsystem service: caiapi name: caiapi spec: @@ -18,12 +18,12 @@ spec: template: metadata: labels: - app: caiapi-noggin + app: accountsystem deploymentconfig: caiapi spec: containers: - name: caiapi - image: caiapi-noggin/caiapi:latest + image: accountsystem/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/accountsystem/files/service_caiapi.yml similarity index 79% rename from roles/openshift-apps/caiapi_noggin/files/service_caiapi.yml rename to roles/openshift-apps/accountsystem/files/service_caiapi.yml index 3151dc80a0..2bc52e1e95 100644 --- a/roles/openshift-apps/caiapi_noggin/files/service_caiapi.yml +++ b/roles/openshift-apps/accountsystem/files/service_caiapi.yml @@ -3,9 +3,9 @@ kind: Service metadata: name: caiapi labels: - app: caiapi-noggin + app: accountsystem service: caiapi - namespace: caiapi-noggin + namespace: accountsystem spec: ports: - name: web diff --git a/roles/openshift-apps/caiapi_noggin/templates/buildconfig_caiapi.yml b/roles/openshift-apps/accountsystem/templates/buildconfig_caiapi.yml similarity index 100% rename from roles/openshift-apps/caiapi_noggin/templates/buildconfig_caiapi.yml rename to roles/openshift-apps/accountsystem/templates/buildconfig_caiapi.yml diff --git a/roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml b/roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml similarity index 83% rename from roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml rename to roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml index 65bdf2266f..d8adb5d6f1 100644 --- a/roles/openshift-apps/caiapi_noggin/templates/configmap_caiapi.yml +++ b/roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: caiapi-configmap labels: - app: caiapi-noggin + app: accountsystem data: caiapi.cfg: |- # TODO