fixes

playbooks/deploy_cluster_40.yml

@@ -5,7 +5,7 @@
     l_init_fact_hosts: "nodes"
     l_openshift_version_set_hosts: "nodes"
     l_install_base_packages: True
-    l_repo_hosts: "all:!all"
+    l_repo_hosts: "nodes"
 
 - name: Read in openshift-install
   hosts: masters[0]
@@ -60,7 +60,7 @@
 - name: Start masters
   hosts: masters
   vars:
-    openshift_bootstrap_endpoint: "{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:49500/config/master"
+    openshift_bootstrap_endpoint: "https://{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:49500/config/master"
   tasks:
   - name: Wait for bootstrap endpoint to show up
     uri:
@@ -85,7 +85,7 @@
 - name: Start workers
   hosts: workers
   vars:
-    openshift_bootstrap_endpoint: "{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:49500/config/worker"
+    openshift_bootstrap_endpoint: "https://{{ openshift_install_config['metadata']['name'] }}-api.{{ openshift_install_config['baseDomain'] }}:49500/config/worker"
   tasks:
   - name: Wait for bootstrap endpoint to show up
     uri:

roles/openshift_node40/tasks/install.yml

@@ -10,6 +10,9 @@
   delay: 1
   vars:
     l_node_packages:
-    - "atomic-openshift-node{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
-    - "atomic-openshift-clients{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
-    - "atomic-openshift-hyperkube{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
+    #- "atomic-openshift-node{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
+    #- "atomic-openshift-clients{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
+    #- "atomic-openshift-hyperkube{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
+    - "origin-node{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
+    - "origin-clients{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"
+    - "origin-hyperkube{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}"

test/libvirt/README.md

@@ -7,9 +7,20 @@ for supported installation methods.
 ## How to use
 Don't use it.
 
+clone https://github.com/openshift/aos-ansible/pull/74 to ~/git/aos-ansible
+(Red Hat use only)
+
+Ensure openshift-install and terraform are in your path.
+
 cd to this directory.
-source installrc; export variables you want to override.
+
+source installrc; export variables you want to override.  You'll need to at least
+update what image you want to use unless you have that exact image in that exact
+place.
+
 ./deploy.sh
 This will generate install assets (inventory, install-config.yml, tfvars),
 provision instances via terraform and start installation of
 openshift-ansible.
+
+Afterwards, you can cleanup with ./cleanup.sh

test/libvirt/group_vars/nodes.yml

@@ -0,0 +1,9 @@
+openshift_additional_repos:
+  - name: "origin-pr"
+    baseurl: "https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/"
+    enabled: 1
+    gpgcheck: 0
+  - name: "origin-pr-dependencies"
+    baseurl: "https://cbs.centos.org/repos/paas7-openshift-origin311-testing/x86_64/os/"
+    enabled: 1
+    gpgcheck: 0

test/libvirt/inv.txt.template

@@ -8,7 +8,7 @@ ansible_ssh_user=cloud-user
 ansible_become=True
 
 openshift_install_config_path="${OCP_INSTALL_CONFIG_PATH}"
-openshift_deployment_type=openshift-enterprise
+openshift_deployment_type=origin
 openshift_release=v4.0
 
 [bootstrap]