瀏覽代碼

set repos after registration: convert to match task -> import_role model.

Mark Lamourine 7 年之前
父節點
當前提交
0c0cdae275
共有 1 個文件被更改,包括 11 次插入3 次删除
  1. 11 3
      playbooks/openstack/openshift-cluster/provision.yml

+ 11 - 3
playbooks/openstack/openshift-cluster/provision.yml

@@ -47,14 +47,22 @@
   hosts: oo_all_hosts
   become: yes
   gather_facts: yes
-  roles:
-  - role: rhel_subscribe
+  tasks:
+  - name: Subscribe RHEL instances
+    include_role:
+      name: rhel_subscribe
     when:
     - ansible_distribution == "RedHat"
     - rhsub_user is defined
     - rhsub_pass is defined
 
-  tasks:
+  - name: Enable required YUM repositories
+    include_role:
+      name: openshift_repos
+    when:
+    - ansible_distribution == "RedHat"
+    - rh_subscribed is defined
+
   - name: Install dependencies
     include_role:
       name: openshift_openstack