Fix etcd to working tag known to work with NGS

Fix etcd to working tag known to work with NGS

Edit to staging env Kolla passwords.yml is correct value for cinder_rbd_secret_uuid