summaryrefslogtreecommitdiffstats
path: root/openstack-ansible/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'openstack-ansible/playbooks')
-rw-r--r--openstack-ansible/playbooks/inventory4
-rw-r--r--openstack-ansible/playbooks/jumphost_configuration.yml10
2 files changed, 9 insertions, 5 deletions
diff --git a/openstack-ansible/playbooks/inventory b/openstack-ansible/playbooks/inventory
index f53da530..d3768f51 100644
--- a/openstack-ansible/playbooks/inventory
+++ b/openstack-ansible/playbooks/inventory
@@ -1,5 +1,5 @@
-[jumphost]
-jumphost ansible_ssh_host=192.168.122.2
+[xcimaster]
+xcimaster ansible_ssh_host=192.168.122.2
[controller]
controller00 ansible_ssh_host=192.168.122.3
diff --git a/openstack-ansible/playbooks/jumphost_configuration.yml b/openstack-ansible/playbooks/jumphost_configuration.yml
index 74e97cdd..b6c79a41 100644
--- a/openstack-ansible/playbooks/jumphost_configuration.yml
+++ b/openstack-ansible/playbooks/jumphost_configuration.yml
@@ -1,5 +1,5 @@
---
-- hosts: jumphost
+- hosts: xcimaster
remote_user: root
vars_files:
- ../var/ubuntu.yml
@@ -13,7 +13,11 @@
- name: remove the directory
shell: "rm -rf {{OSA_PATH}} {{OSA_ETC_PATH}}"
- name: git openstack ansible
- shell: "git clone {{OSA_URL}} {{OSA_PATH}} -b {{OSA_BRANCH}}"
+ shell: "git clone {{OSA_URL}} {{OSA_PATH}} -b {{OPENSTACK_BRANCH}}"
+ - name: copy opnfv-setup-openstack.yml to /opt/openstack-ansible/playbooks
+ copy:
+ src: ../file/opnfv-setup-openstack.yml
+ dest: "{{OSA_PATH}}/playbooks/opnfv-setup-openstack.yml"
- name: copy /opt/openstack-ansible/etc/openstack_deploy to /etc/openstack_deploy
shell: "/bin/cp -rf {{OSA_PATH}}/etc/openstack_deploy {{OSA_ETC_PATH}}"
- name: bootstrap
@@ -50,4 +54,4 @@
remote_user: root
tasks:
- name: Generate authorized_keys
- shell: "/bin/cat /jumphost/root/.ssh/id_rsa.pub >> ../file/authorized_keys"
+ shell: "/bin/cat /xcimaster/root/.ssh/id_rsa.pub >> ../file/authorized_keys"