diff options
| -rw-r--r-- | openshift-ansible.spec | 12 | ||||
| -rw-r--r-- | roles/docker/tasks/main.yml | 2 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec index f808faeeb..047cfb26e 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -70,6 +70,16 @@ cp -rp filter_plugins %{buildroot}%{_datadir}/ansible_plugins/ # openshift-ansible-lookup-plugins install cp -rp lookup_plugins %{buildroot}%{_datadir}/ansible_plugins/ +# create symlinks from /usr/share/ansible/plugins/lookup -> +# /usr/share/ansible_plugins/lookup_plugins +pushd %{buildroot}%{_datadir} +mkdir -p ansible/plugins +pushd ansible/plugins +ln -s ../../ansible_plugins/lookup_plugins lookup +ln -s ../../ansible_plugins/filter_plugins filter +popd +popd + # atomic-openshift-utils install pushd utils %{__python} setup.py install --skip-build --root %{buildroot} @@ -168,6 +178,7 @@ Requires: pyOpenSSL %files filter-plugins %{_datadir}/ansible_plugins/filter_plugins +%{_datadir}/ansible/plugins/filter # ---------------------------------------------------------------------------------- @@ -183,6 +194,7 @@ BuildArch: noarch %files lookup-plugins %{_datadir}/ansible_plugins/lookup_plugins +%{_datadir}/ansible/plugins/lookup # ---------------------------------------------------------------------------------- # atomic-openshift-utils subpackage diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 89a248d9e..87a4e7af0 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -37,7 +37,7 @@ # Docker 1.10 upgrade playbook to accomplish this. - name: Error out if attempting to upgrade Docker across the 1.10 boundary fail: - msg: "Cannot upgrade Docker to >= 1.10, please use the Docker upgrade playbook for this." + msg: "Cannot upgrade Docker to >= 1.10, please upgrade or remove Docker manually, or use the Docker upgrade playbook if OpenShift is already installed." when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and curr_docker_version.stdout | version_compare('1.10', '<') and docker_version is defined and docker_version | version_compare('1.10', '>=') and not docker_protect_installed_version | bool # Make sure Docker is installed, but does not update a running version. diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 5a66c3592..d6f2540bc 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -830,11 +830,11 @@ def upgrade(ctx, latest_minor, next_major): # upgrade for what you're currently running. upgrade_mappings = { '3.1':{ - 'major_playbook':'v3_1_to_v3_2/upgrade.yml', + 'major_playbook':'v3_2/upgrade.yml', 'major_version' :'3.2', }, '3.2':{ - 'minor_playbook':'v3_1_to_v3_2/upgrade.yml', + 'minor_playbook':'v3_2/upgrade.yml', # Uncomment these when we're ready to support 3.3. # 'major_version' :'3.3', # 'major_playbook':'v3_1_to_v3_2/upgrade.yml', |