openstack: lint fixes


Hosts where compilation is identical:

    virt1001.eqiad.wmnet
    labnet1001.eqiad.wmnet
    virt1007.eqiad.wmnet
    virt1000.wikimedia.org

http://puppet-compiler.wmflabs.org/478/change/170499/html/

Change-Id: I897642c391f5e5b036a7a2defe4cbf1ea92ef965
Merge "openstack: lint fixes" into production