diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-07 09:33:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 09:33:19 -0500 |
| commit | 5a13532a2129b0226d24cdc88b5e73ff67d43f5e (patch) | |
| tree | 28ad0b76a95e1408f2341a8f6aa8f1b96ee4110d | |
| parent | 4bcb53654635de775c60d0176e3aeeed4856fc86 (diff) | |
| parent | bd2335ff8110f507b353fabc40b4a5e0316fc3cb (diff) | |
| download | openshift-5a13532a2129b0226d24cdc88b5e73ff67d43f5e.tar.gz openshift-5a13532a2129b0226d24cdc88b5e73ff67d43f5e.tar.bz2 openshift-5a13532a2129b0226d24cdc88b5e73ff67d43f5e.tar.xz openshift-5a13532a2129b0226d24cdc88b5e73ff67d43f5e.zip | |
Merge pull request #6310 from tomassedovic/openstack-rhel-subscription
Optionally subscribe OpenStack RHEL nodes
| -rw-r--r-- | playbooks/openstack/openshift-cluster/provision.yml | 10 | ||||
| -rw-r--r-- | playbooks/openstack/sample-inventory/group_vars/all.yml | 25 |
2 files changed, 14 insertions, 21 deletions
diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml index 9d75e515a..3e295b2c8 100644 --- a/playbooks/openstack/openshift-cluster/provision.yml +++ b/playbooks/openstack/openshift-cluster/provision.yml @@ -26,6 +26,9 @@ - name: Gather facts for the new nodes setup: +- name: set common facts + include: ../../init/facts.yml + # TODO(shadower): consider splitting this up so people can stop here # and configure their DNS if they have to. @@ -44,6 +47,13 @@ hosts: oo_all_hosts become: yes gather_facts: yes + roles: + - role: rhel_subscribe + when: + - ansible_distribution == "RedHat" + - rhsub_user | default(False) + - rhsub_pass | default(False) + tasks: - name: Install dependencies include_role: diff --git a/playbooks/openstack/sample-inventory/group_vars/all.yml b/playbooks/openstack/sample-inventory/group_vars/all.yml index ae1528123..c7afe9a24 100644 --- a/playbooks/openstack/sample-inventory/group_vars/all.yml +++ b/playbooks/openstack/sample-inventory/group_vars/all.yml @@ -82,27 +82,10 @@ openshift_openstack_docker_volume_size: "15" openshift_openstack_subnet_prefix: "192.168.99" -## Red Hat subscription defaults to false which means we will not attempt to -## subscribe the nodes -#rhsm_register: False - -# # Using Red Hat Satellite: -#rhsm_register: True -#rhsm_satellite: 'sat-6.example.com' -#rhsm_org: 'OPENSHIFT_ORG' -#rhsm_activationkey: '<activation-key>' - -# # Or using RHN username, password and optionally pool: -#rhsm_register: True -#rhsm_username: '<username>' -#rhsm_password: '<password>' -#rhsm_pool: '<pool id>' - -#rhsm_repos: -# - "rhel-7-server-rpms" -# - "rhel-7-server-ose-3.5-rpms" -# - "rhel-7-server-extras-rpms" -# - "rhel-7-fast-datapath-rpms" +## Red Hat subscription: +#rhsub_user: '<username>' +#rhsub_pass: '<password>' +#rhsub_pool: '<pool name>' # # Roll-your-own DNS |