From bf4864dd72f754f1c3566def1058e7107cb5fd03 Mon Sep 17 00:00:00 2001 From: Jim Curtis Date: Sun, 21 Feb 2016 11:04:43 -0800 Subject: [PATCH] review feedback --- README.md | 49 ++++++++++--------- roles/ceph-mds/tasks/docker/pre_requisite.yml | 1 - 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index a4831a17c..809221244 100644 --- a/README.md +++ b/README.md @@ -200,34 +200,39 @@ then run `vagrant up --provider=virtualbox` again. ## Setup for Vagrant using OpenStack provider -Install the Vagrant plugin for the openstack provider: vagrant plugin install vagrant-openstack-provider. +Install the Vagrant plugin for the openstack provider: `vagrant plugin install vagrant-openstack-provider`. -cp site.yml.sample site.yml -cp group_vars/all.docker.sample group_vars/all -cp vagrant_variables.yml.openstack vagrant_variables.yml -Edit vagrant_variables.yml: - Set mon_vms and osd_vms to the numbers you want. - If you are using an Atomic image, un-comment out the skip_tags line. - Un-comment the os_ lines. - Set os_ssh_username to 'centos' for Centos and 'cloud-user' for RHEL images. - Set os_ssh_private_key_path to '~/.ssh/id_rsa' - Set os_openstack_auth_url to the auth url of your Open Stack cloud - Set os_username and os_password to what you provided for Open Stack +```bash +$ cp site.yml.sample site.yml +$ cp group_vars/all.docker.sample group_vars/all +$ cp vagrant_variables.yml.openstack vagrant_variables.yml +``` +* Edit `vagrant_variables.yml`: + Set `mon_vms` and `osd_vms` to the numbers you want. + If you are using an Atomic image, un-comment out the `skip_tags` line. + Un-comment the `os_` lines. + Set `os_ssh_username` to 'centos' for Centos and 'cloud-user' for + RHEL images. + Set `os_ssh_private_key_path` to '~/.ssh/id_rsa' + Set `os_openstack_auth_url` to the auth url of your Open Stack cloud + Set `os_username` and `os_password` to what you provided for Open Stack registration or leave them as ENV vars if you have set the corresponding env vars for your user. - Set os_tenant_name to your Open Stack cloud project name. - Set os_region to your Open Stack cloud region name. - Set os_flavor to 'm3.medium'. This size has ephemeral storage with will + Set `os_tenant_name` to your Open Stack cloud project name. + Set `os_region` to your Open Stack cloud region name. + Set `os_flavor` to 'm3.medium'. This size has ephemeral storage that will be used by the OSD for the /dev/vdb disk - Set the os_image to an image found in the Images list in the Open Stack + Set the `os_image` to an image found in the Images list in the Open Stack cloud Dashboard (i.e. 'centos-atomic-host'). - Set the os_keypair_name to the keypair name you used when you did the + Set the `os_keypair_name` to the keypair name you used when you did the Open Stack registration. -vagrant up --provider=openstack -Once the playbook is finished, you should be able to do vagrant ssh mon0 or -vagrant ssh osd0 to get to the VMs. -sudo docker ps should show the running containers -When you are done, use vagrant destroy to get rid of the VMs. You should +``` +$ vagrant up --provider=openstack +``` +Once the playbook is finished, you should be able to do `vagrant ssh mon0` or +`vagrant ssh osd0` to get to the VMs. +`sudo docker ps` should show the running containers +When you are done, use `vagrant destroy` to get rid of the VMs. You should also remove the associated entries in .ssh/known_hosts so that if the IP addresses get reused by future Open Stack Cloud instances there will not be old known_hosts entries. diff --git a/roles/ceph-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml index 4b47e3cdf..69801ef77 100644 --- a/roles/ceph-mds/tasks/docker/pre_requisite.yml +++ b/roles/ceph-mds/tasks/docker/pre_requisite.yml @@ -52,7 +52,6 @@ # NOTE (jimcurtis): need at least version 1.9.0 of six or we get: # re:NameError: global name 'DEFAULT_DOCKER_API_VERSION' is not defined - - name: install six pip: name: six