-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
install ceph-common in control plane so rbd provisioner can find rbd cli to create rbd images #19870
install ceph-common in control plane so rbd provisioner can find rbd cli to create rbd images #19870
Conversation
/approve |
/retest Please review the full test history for this PR and help us cut down flakes. |
images/node/Dockerfile
Outdated
@@ -16,14 +16,12 @@ COPY system-container/manifest.json system-container/config.json.template system | |||
RUN INSTALL_PKGS=" \ | |||
origin-hyperkube origin-node origin-sdn-ovs \ | |||
socat ethtool device-mapper iptables nmap-ncat e2fsprogs \ | |||
xfsprogs device-mapper-persistent-data ceph-common \ | |||
xfsprogs device-mapper-persistent-data\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you remove this here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because node is FROM openshift/origin-control-plane
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has to remain here. Node image won’t depend on control plane next release
@@ -6,7 +6,9 @@ | |||
# | |||
FROM openshift/origin-cli | |||
|
|||
RUN INSTALL_PKGS="origin" && \ | |||
RUN INSTALL_PKGS="origin ceph-common" && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this only used by the controllers?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's used by controller-manager for dynamic provisioning and resize and by kubelet to map/unmap (local "attach"/"detach") volumes.
@smarterclayton @childsb yes we need ceph-common to pick up rbd command for controller to provision and resize rbd images. |
images/node/Dockerfile
Outdated
@@ -16,14 +16,12 @@ COPY system-container/manifest.json system-container/config.json.template system | |||
RUN INSTALL_PKGS=" \ | |||
origin-hyperkube origin-node origin-sdn-ovs \ | |||
socat ethtool device-mapper iptables nmap-ncat e2fsprogs \ | |||
xfsprogs device-mapper-persistent-data ceph-common \ | |||
xfsprogs device-mapper-persistent-data\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has to remain here. Node image won’t depend on control plane next release
@sdodson @smarterclayton thanks, review addressed. cc @bertinatto |
images/node/Dockerfile
Outdated
libmnl libnetfilter_conntrack conntrack-tools \ | ||
libnfnetlink iproute bridge-utils procps-ng openssl \ | ||
binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \ | ||
iscsi-initiator-utils \ | ||
" && \ | ||
yum install -y centos-release-ceph-luminous && \ | ||
rpm -V centos-release-ceph-luminous && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to still install this here if it isn’t already. You should remove all changes to this file.
73e84ce
to
77a396c
Compare
77a396c
to
4d2a0a1
Compare
@smarterclayton thanks, updated, PTAL |
/lgtm |
@rootfs, can you please squash the commits? |
…cli to create rbd images Signed-off-by: Huamin Chen <[email protected]>
4d2a0a1
to
f65605a
Compare
@jsafrane squashed |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jsafrane, rootfs, sdodson, smarterclayton The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/retest |
1 similar comment
/retest |
/cherrypick release-3.10 |
fix https://bugzilla.redhat.com/show_bug.cgi?id=1582059