Merge pull request ManageIQ#219 from carbonin/remove_extra_miq_names

Remove names with miq or manageiq related to the ansible deployment
carbonin · Sep 14, 2017 · 0034b2c · 0034b2c
2 parents 3a4e140 + d078ffb
commit 0034b2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/templates/miq-template-ext-db.yaml b/templates/miq-template-ext-db.yaml
@@ -358,7 +358,7 @@ objects:
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
-    name: "${NAME}-${ANSIBLE_SERVICE_NAME}"
+    name: "${ANSIBLE_SERVICE_NAME}"
     annotations:
       description: Defines how to deploy the Ansible appliance
   spec:
@@ -373,7 +373,7 @@ objects:
         name: "${ANSIBLE_SERVICE_NAME}"
       spec:
         containers:
-        - name: miq-ansible
+        - name: ansible
           image: "${ANSIBLE_IMG_NAME}:${ANSIBLE_IMG_TAG}"
           livenessProbe:
             tcpSocket:

diff --git a/templates/miq-template.yaml b/templates/miq-template.yaml
@@ -535,7 +535,7 @@ objects:
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
-    name: "${NAME}-${ANSIBLE_SERVICE_NAME}"
+    name: "${ANSIBLE_SERVICE_NAME}"
     annotations:
       description: Defines how to deploy the Ansible appliance
   spec:
@@ -550,7 +550,7 @@ objects:
         name: "${ANSIBLE_SERVICE_NAME}"
       spec:
         containers:
-        - name: miq-ansible
+        - name: ansible
           image: "${ANSIBLE_IMG_NAME}:${ANSIBLE_IMG_TAG}"
           livenessProbe:
             tcpSocket: