diff options
author | Andrew Butcher <abutcher@redhat.com> | 2016-05-30 14:34:19 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2016-05-30 14:34:19 -0400 |
commit | 098d0c24bb2d08e2107b6c4a55d350ae751458f7 (patch) | |
tree | d3196af96ba721172b820f9a217bd89924454378 /roles/openshift_ca | |
parent | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (diff) | |
download | openshift-098d0c24bb2d08e2107b6c4a55d350ae751458f7.tar.gz openshift-098d0c24bb2d08e2107b6c4a55d350ae751458f7.tar.bz2 openshift-098d0c24bb2d08e2107b6c4a55d350ae751458f7.tar.xz openshift-098d0c24bb2d08e2107b6c4a55d350ae751458f7.zip |
Revert openshift-certificates changes.
Diffstat (limited to 'roles/openshift_ca')
-rw-r--r-- | roles/openshift_ca/README.md | 48 | ||||
-rw-r--r-- | roles/openshift_ca/meta/main.yml | 17 | ||||
-rw-r--r-- | roles/openshift_ca/tasks/main.yml | 56 | ||||
-rw-r--r-- | roles/openshift_ca/vars/main.yml | 6 |
4 files changed, 0 insertions, 127 deletions
diff --git a/roles/openshift_ca/README.md b/roles/openshift_ca/README.md deleted file mode 100644 index 96c9cd5f2..000000000 --- a/roles/openshift_ca/README.md +++ /dev/null @@ -1,48 +0,0 @@ -OpenShift CA -============ - -This role delegates all tasks to the `openshift_ca_host` such that this role can be depended on by other OpenShift certificate roles. - -Requirements ------------- - -Role Variables --------------- - -From this role: - -| Name | Default value | Description | -|-------------------------|-----------------------------------------------|-----------------------------------------------------------------------------| -| openshift_ca_host | None (Required) | The hostname of the system where the OpenShift CA will be created. | -| openshift_ca_config_dir | `{{ openshift.common.config_base }}/master` | CA certificate directory. | -| openshift_ca_cert | `{{ openshift_ca_config_dir }}/ca.crt` | CA certificate path including CA certificate filename. | -| openshift_ca_key | `{{ openshift_ca_config_dir }}/ca.key` | CA key path including CA key filename. | -| openshift_ca_serial | `{{ openshift_ca_config_dir }}/ca.serial.txt` | CA serial path including CA serial filename. | -| openshift_version | `{{ openshift_pkg_version }}` | OpenShift package version. | - -Dependencies ------------- - -* openshift_repos -* openshift_cli - -Example Playbook ----------------- - -``` -- name: Create OpenShift CA - hosts: localhost - roles: - - role: openshift_ca - openshift_ca_host: master1.example.com -``` - -License -------- - -Apache License Version 2.0 - -Author Information ------------------- - -Jason DeTiberus (jdetiber@redhat.com) diff --git a/roles/openshift_ca/meta/main.yml b/roles/openshift_ca/meta/main.yml deleted file mode 100644 index 0089f4209..000000000 --- a/roles/openshift_ca/meta/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -galaxy_info: - author: Jason DeTiberus - description: OpenShift CA - company: Red Hat, Inc. - license: Apache License, Version 2.0 - min_ansible_version: 1.9.4 - platforms: - - name: EL - versions: - - 7 - categories: - - cloud - - system -dependencies: -- role: openshift_repos -- role: openshift_cli diff --git a/roles/openshift_ca/tasks/main.yml b/roles/openshift_ca/tasks/main.yml deleted file mode 100644 index 497473f22..000000000 --- a/roles/openshift_ca/tasks/main.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- fail: - msg: "openshift_ca_host variable must be defined for this role" - when: openshift_ca_host is not defined - -- name: Install the base package for admin tooling - action: > - {{ ansible_pkg_mgr }} - name={{ openshift.common.service_type }}{{ openshift_version }} - state=present - when: not openshift.common.is_containerized | bool - register: install_result - delegate_to: "{{ openshift_ca_host }}" - run_once: true - -- name: Reload generated facts - openshift_facts: - when: install_result | changed - delegate_to: "{{ openshift_ca_host }}" - run_once: true - -- name: Create openshift_ca_config_dir if it does not exist - file: - path: "{{ openshift_ca_config_dir }}" - state: directory - delegate_to: "{{ openshift_ca_host }}" - run_once: true - -- name: Determine if CA must be created - stat: - path: "{{ openshift_ca_config_dir }}/{{ item }}" - register: g_master_ca_stat_result - with_items: - - ca.crt - - ca.key - delegate_to: "{{ openshift_ca_host }}" - run_once: true - -- set_fact: - master_ca_missing: "{{ False in (g_master_ca_stat_result.results - | oo_collect(attribute='stat.exists') - | list) }}" - delegate_to: "{{ openshift_ca_host }}" - run_once: true - -- name: Create the master certificates if they do not already exist - command: > - {{ openshift.common.admin_binary }} create-master-certs - --hostnames={{ openshift_master_hostnames | join(',') }} - --master={{ openshift.master.api_url }} - --public-master={{ openshift.master.public_api_url }} - --cert-dir={{ openshift_ca_config_dir }} - --overwrite=false - when: hostvars[openshift_ca_host].master_ca_missing | bool - delegate_to: "{{ openshift_ca_host }}" - run_once: true diff --git a/roles/openshift_ca/vars/main.yml b/roles/openshift_ca/vars/main.yml deleted file mode 100644 index a32e385ec..000000000 --- a/roles/openshift_ca/vars/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -openshift_ca_config_dir: "{{ openshift.common.config_base }}/master" -openshift_ca_cert: "{{ openshift_ca_config_dir }}/ca.crt" -openshift_ca_key: "{{ openshift_ca_config_dir }}/ca.key" -openshift_ca_serial: "{{ openshift_ca_config_dir }}/ca.serial.txt" -openshift_version: "{{ openshift_pkg_version | default('') }}" |