commit | d39936c2ffbf609ad0107981400dc89f911baec7 | [log] [tgz] |
---|---|---|
author | Andy Bavier <andy@onlab.us> | Tue Aug 02 17:31:07 2016 -0400 |
committer | Andy Bavier <andy@onlab.us> | Tue Aug 02 17:27:12 2016 -0700 |
tree | 465db2e76c1c65b3b9fcfdc40b07d07f55fca1bd | |
parent | 18a2a988fecb092b73187e1279f0eff30ef37d82 [diff] |
Use MaaS node key when on_maas Change-Id: Ie5708aac996647ee532d33a82ec5e9af468645a8 (cherry picked from commit 057a8833bb8f5627ed2c05a307ae4149f3131020)
diff --git a/roles/onos-vm-install/files/onos-docker-compose.yml b/roles/onos-vm-install/files/onos-docker-compose.yml index 09255fa..c57afcb 100644 --- a/roles/onos-vm-install/files/onos-docker-compose.yml +++ b/roles/onos-vm-install/files/onos-docker-compose.yml
@@ -15,5 +15,4 @@ - "9876" network_mode: host volumes: - - ./id_rsa:/root/node_key:ro - + - ./node_key:/root/node_key:ro
diff --git a/roles/onos-vm-install/files/onos-setup-playbook.yml b/roles/onos-vm-install/files/onos-setup-playbook.yml index 24f23d1..4ab44cb 100644 --- a/roles/onos-vm-install/files/onos-setup-playbook.yml +++ b/roles/onos-vm-install/files/onos-setup-playbook.yml
@@ -21,14 +21,11 @@ remote_user: ubuntu tasks: - - name: Copy over SSH keys + - name: Copy over SSH key copy: - src=~/.ssh/{{ item }} - dest={{ ansible_user_dir }}/cord/{{ item }} + src={{ node_private_key }} + dest={{ ansible_user_dir }}/cord/node_key owner={{ ansible_user_id }} mode=0600 - with_items: - - id_rsa - - id_rsa.pub - name: Copy over files to build XOS variant of ONOS copy: