Переглянути джерело

Update specfile requirements

openshift-ansible package
* Add openshift-clients
* Remove unnecessary dependencies

openshift-ansible-test package
- Move python2-openshift to -test (not required by main package)
- Remove unnecessary dependencies

Updated images/installer/Dockerfile to remove openshift-clients
installation.
Russell Teague 5 роки тому
батько
коміт
886d967e61
2 змінених файлів з 3 додано та 9 видалено
  1. 1 1
      images/installer/Dockerfile
  2. 2 8
      openshift-ansible.spec

+ 1 - 1
images/installer/Dockerfile

@@ -27,7 +27,7 @@ COPY images/installer/origin-extra-root /
 RUN yum install -y epel-release && \
     yum-config-manager --enable built > /dev/null && \
     yum install --setopt=tsflags=nodocs -y \
-      openshift-ansible-test openshift-clients && \
+      openshift-ansible-test && \
     yum clean all
 
 RUN /usr/local/bin/user_setup \

+ 2 - 8
openshift-ansible.spec

@@ -18,13 +18,7 @@ Source0:        https://github.com/openshift/openshift-ansible/archive/%{commit}
 BuildArch:      noarch
 
 Requires:      ansible >= 2.7.8
-Requires:      python2
-Requires:      python-six
-Requires:      tar
-Obsoletes:     %{name}-docs <= 4.0
-Obsoletes:     %{name}-playbooks <= 4.0
-Obsoletes:     %{name}-roles <= 4.0
-Requires:      python2-openshift
+Requires:      openshift-clients
 
 %description
 OpenShift RHEL Worker Management Ansible Playbooks
@@ -67,7 +61,7 @@ cp -rp test %{buildroot}%{_datadir}/ansible/%{name}/
 Summary:       Openshift and Atomic Enterprise Ansible Test Playbooks
 Requires:      %{name} = %{version}-%{release}
 Requires:      ansible = 2.7.10
-Requires:      python-boto3
+Requires:      python2-openshift
 Requires:      openssh-clients
 BuildArch:     noarch