4 files changed, 27 insertions, 102 deletions
diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml
index e83351272..44a2ef534 100644
--- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml
+++ b/playbooks/adhoc/openshift_hosted_logging_efk.yaml
@@ -8,7 +8,7 @@
   hosts: masters:!masters[0]
   pre_tasks:
   - set_fact:
-      logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
+      openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
   tasks:
   - include_role:
       name: openshift_logging
diff --git a/playbooks/adhoc/s3_registry/s3_registry.j2 b/playbooks/adhoc/s3_registry/s3_registry.j2
deleted file mode 100644
index 10454ad11..000000000
--- a/playbooks/adhoc/s3_registry/s3_registry.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-version: 0.1
-log:
-  level: debug
-http:
-  addr: :5000
-storage:
-  cache:
-    layerinfo: inmemory
-  s3:
-    accesskey: {{ aws_access_key }}
-    secretkey: {{ aws_secret_key }}
-    region: {{ aws_bucket_region }}
-    bucket: {{ aws_bucket_name }}
-    encrypt: true
-    secure: true
-    v4auth: true
-    rootdirectory: /registry
-auth:
-  openshift:
-    realm: openshift
-middleware:
-  repository:
-    - name: openshift
diff --git a/playbooks/adhoc/s3_registry/s3_registry.yml b/playbooks/adhoc/s3_registry/s3_registry.yml
deleted file mode 100644
index 2c79a1b4d..000000000
--- a/playbooks/adhoc/s3_registry/s3_registry.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-# This playbook creates an S3 bucket named after your cluster and configures the docker-registry service to use the bucket as its backend storage.
-# Usage:
-#  ansible-playbook s3_registry.yml -e clusterid="mycluster" -e aws_bucket="clusterid-docker" -e aws_region="us-east-1"
-#
-# The AWS access/secret keys should be the keys of a separate user (not your main user), containing only the necessary S3 access role.
-# The 'clusterid' is the short name of your cluster.
-
-- hosts: tag_clusterid_{{ clusterid }}:&tag_host-type_openshift-master
-  remote_user: root
-  gather_facts: False
-
-  vars:
-    aws_access_key: "{{ lookup('env', 'S3_ACCESS_KEY_ID') }}"
-    aws_secret_key: "{{ lookup('env', 'S3_SECRET_ACCESS_KEY') }}"
-    aws_bucket_name: "{{ aws_bucket | default(clusterid ~ '-docker') }}"
-    aws_bucket_region: "{{ aws_region | default(lookup('env', 'S3_REGION') | default('us-east-1', true)) }}"
-    aws_create_bucket: "{{ aws_create | default(True) }}"
-    aws_tmp_path: "{{ aws_tmp_pathfile | default('/root/config.yml')}}"
-    aws_delete_tmp_file: "{{ aws_delete_tmp | default(True) }}"
-
-  tasks:
-
-  - name: Check for AWS creds
-    fail:
-      msg: "Couldn't find {{ item }} creds in ENV"
-    when: "{{ item }} == ''"
-    with_items:
-    - aws_access_key
-    - aws_secret_key
-
-  - name: Scale down registry
-    command: oc scale --replicas=0 dc/docker-registry
-
-  - name: Create S3 bucket
-    when: aws_create_bucket | bool
-    local_action:
-      module: s3 bucket="{{ aws_bucket_name }}" mode=create
-
-  - name: Set up registry environment variable
-    command: oc env dc/docker-registry REGISTRY_CONFIGURATION_PATH=/etc/registryconfig/config.yml
-
-  - name: Generate docker registry config
-    template: src="s3_registry.j2" dest="/root/config.yml" owner=root mode=0600
-
-  - name: Determine if new secrets are needed
-    command: oc get secrets
-    register: secrets
-
-  - name: Create registry secrets
-    command: oc secrets new dockerregistry /root/config.yml
-    when: "'dockerregistry' not in secrets.stdout"
-
-  - name: Determine if service account contains secrets
-    command: oc describe serviceaccount/registry
-    register: serviceaccount
-
-  - name: Add secrets to registry service account
-    command: oc secrets add serviceaccount/registry secrets/dockerregistry
-    when: "'dockerregistry' not in serviceaccount.stdout"
-
-  - name: Determine if deployment config contains secrets
-    command: oc volume dc/docker-registry --list
-    register: dc
-
-  - name: Add secrets to registry deployment config
-    command: oc volume dc/docker-registry --add --name=dockersecrets -m /etc/registryconfig --type=secret --secret-name=dockerregistry
-    when: "'dockersecrets' not in dc.stdout"
-
-  - name: Wait for deployment config to take effect before scaling up
-    pause: seconds=30
-
-  - name: Scale up registry
-    command: oc scale --replicas=1 dc/docker-registry
-
-  - name: Delete temporary config file
-    file: path={{ aws_tmp_path }} state=absent
-    when: aws_delete_tmp_file | bool
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index f0cfa7f55..147e84131 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -148,6 +148,29 @@
       - vovsbr
     when: "{{ openshift_remove_all | default(true) | bool }}"
 
+  - shell: atomic uninstall "{{ item }}"-master
+    changed_when: False
+    failed_when: False
+    with_items:
+    - openshift-enterprise
+    - atomic-enterprise
+    - origin
+
+  - shell: atomic uninstall "{{ item }}"-node
+    changed_when: False
+    failed_when: False
+    with_items:
+    - openshift-enterprise
+    - atomic-enterprise
+    - origin
+
+  - shell: atomic uninstall "{{ item }}"
+    changed_when: False
+    failed_when: False
+    with_items:
+    - etcd
+    - openvswitch
+
   - shell: find /var/lib/origin/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
     changed_when: False
 
@@ -263,6 +286,9 @@
     - /var/lib/atomic-enterprise
     - /var/lib/openshift
 
+  - shell: systemctl daemon-reload
+    changed_when: False
+
   - name: restart docker
     service: name=docker state=restarted