X-ray diffraction measurements show that the high-temperature superconductor YBa2Cu3O6.54, with ortho-II oxygen order, has charge-density-wave order in the absence of an applied magnetic field. The dominant wave vector of the charge density wave is qCDW=(0,0.328(2),0.5), with the in-plane component parallel to the b axis (chain direction). It has a similar incommensurability to that observed in ortho-VIII and ortho-III samples, which have different dopings and oxygen orderings. Our results for ortho-II contrast with recent high-field NMR measurements, which suggest a commensurate wave vector along the a axis. We discuss the relationship between spin and charge correlations in YBa2Cu3Oy and recent high-field quantum oscillation, NMR, and ultrasound experiments.