HPC/hpc-cloud
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added variables for ceph and nova compute

Browse Source
This commit is contained in:
Egon Rijpkema 2018-06-20 15:48:31 +02:00
parent 06db21ef4c
commit 7cc4e17189
3 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
roles/nova-compute/tasks/main.yml
View File

@ -22,8 +22,8 @@
state: directory state: directory
mode: 0777 mode: 0777
with_items: with_items:
- /srv/nova-compute - /srv/nova-compute
- /srv/nova-compute/etc/ceph - /srv/nova-compute/etc/ceph
- name: copy ceph-client configurationfile - name: copy ceph-client configurationfile
copy: copy:
@ -46,16 +46,22 @@
group: root group: root
tags: systemd tags: systemd
- name: set ceph client keyring
copy:
content: "{{ceph_client_keyring}}"
dest: /srv/nova-compute/etc/ceph
when: use_ceph
- command: systemctl daemon-reload - command: systemctl daemon-reload
tags: systemd tags: systemd
- apt: - apt:
name: "{{ item }}" name: "{{ item }}"
with_items: with_items:
- kvm - kvm
- libvirt0 - libvirt0
- libvirt-bin - libvirt-bin
- qemu - qemu
- name: make sure service is started - name: make sure service is started
systemd: systemd:

4
roles/nova-compute/templates/nova-compute.service
View File

@ -32,6 +32,10 @@ ExecStart=/usr/bin/docker run --name %n \
-e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \ -e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \
-e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" \ -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" \
-e "RABBIT_USER=openstack" \ -e "RABBIT_USER=openstack" \
-e "$MON_INITIAL_MEMBERS={{ ceph_mon_initial_members }} \
-e "$MON_HOST={{ ceph_mon_host }}" \
-e "$PUBLIC_NETWORK={{ ceph_public_network }}" \
-e "$OSD_POOL_DEFAULT_SIZE={{ ceph_osd_pool_default_size }}" \
--add-host=keystone:{{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }} \ --add-host=keystone:{{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }} \
--add-host=mariadb:{{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }} \ --add-host=mariadb:{{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }} \
--privileged \ --privileged \

64
secrets.yml
View File

@ -1,32 +1,34 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
32313865346461323861313234623330633830663561353636396161643566353733393931303232 62326337613938653661303066636362626639393334643233386166383735653137643761653939
3134353364393034626564333866383065633162383561390a656463303464616434303435303037 6337383561386130346461373262626235353061393737650a336265653035656135643530393430
63313232373630616136626464373464646535353030396136656361343162666165366566383737 65623533323531393731323765333530386666636531363263393332356137333964653761616265
6133326539393432390a386162393639636137326532393939633665326637373461663766656565 3566623031616538630a353265333633643030663735626338646563663938363664313930313037
36636661653939373134313165383261353832373362613533366431626330313831643836363932 62356665316534353433656362303836613365643263343462646366623062656335333366373836
38623937663335646134323130636539333335636265313564323032623065393031343235633832 65363363633636633262663063346231333865316237646164373637396130383563666665333339
33336138653336633932383133366566656464356331306265663662356166613135663234326434 61313632663862626532333364643962383365633361326430353734393134373130666565383361
64343765366439303766613062363830346238376435366138323662366463353634623937376663 31303864343132306264356462613234396166613436646130303761396361613937653334373337
39313263613764623533323562333932656564346462333961663538353366313065343263383431 62393538366665386131646162316134393532396530653264323230633166656632346365323634
39643734353632336134663965343062373933656461393264323938303261316563313962343837 33383337613866333031376461396633336233363565316362386566643262333933643237636234
66623562333031646633643734383439386130653033343962633930613031313433633033383561 35616436383238373661313038343063383332303765316232376635346431336161373065656137
65366230663263346661343339636537336332323266623230646534323563373934356332663136 61313962383634396136616663383566663836613939373932323263616461646531633332386436
30626231623534616562323033333437353239306538653835623931363164383536336562336136 34633761666634363062313563646162346330316363323539343439346434306465626130376632
30666265366536313436646535383632626137613831633132666666653830383566323532306332 34336365656231623836643736653037636635613432333435623461613361653031643433326336
34353534336331653330663137323936303337306134333036633932363664643864333534316438 64646664366437393436623832623138306334353634313038656364353866643039663135363932
31623062303137376637353061643838383831663561663436663130663064323665316261316531 34663361373833626461363165646566666332336636653939616438316265393861326636653134
32616533333165636130623334373130316339326538343330646366383933353137623631323530 65373035396635613039333730363863383039323432623432656639346230366461663565613639
39653437343432383161323661643931346664663265326664336461373033646563666333353661 66653335326337306634626335636439343966376336633834356437323866616132316632333230
61633865373764346131623131346266373331626336663735303439376230333537386562303939 63663532396630666434353932363738666134656262363933633635626430373966646234366435
65363139346564653464663633326639323930333464376136353064393039373535613231623138 39353465333133653932303166346339343465383835353861306363386632353432353262333365
61373434323065646238356436373730333939613965666237616265653033333230353466316266 32316565663161326238613834613761316336326662643532353966616630656263666463386264
30383939376335656632626232663061623332636337646234653565363561353334643462376666 63353037373234663237366433623737356364363932353030646531343033643930343465383465
30326438303333336265306463313137656334313235643434616238333564373761333235633639 64343736386433326230383339666364666664323833626239333865373437393365623331303436
66346161316130633463623435646639366136386335386139613230653064663230366265633036 66313063616336303733306462346133623135386535313665623566326138333132353031333930
33613132633035393337653436613031383765616638323663363866393165613030306637393134 65323436653833393639633462343664346165346538613435323231303263303038326135613433
38333734373939626364343533306662393463646264666161346434363832623239643864303431 33666434303963346436643937653934666336396130356639326439306565613432323734383930
39383931333139633338663761646335613935636239636439383333313531633364653439323036 37616536303038343865343637316430343339616162373232653735373335343765333033663030
35373639363164386666366335313934336231333261623763633133393562656237313761356631 32623434376337623665386639396262326236353130313735336264383631333233383034623133
39663234653339313466326534333435306662316461333035623339353435383137383735373733 66376138336465313431346166346638306631333161373165396437653438323931626230633436
32373535303338646266346539386364356233616631316661633037346665353762353138376538 63313831636132386664353339653331333530633731383738616136316636616136383531303064
386535333439313233663464353534376535 39633232396131336535343263313338376334663337626539316263353038623565383062383639
64393130353462633865653734323637346436363336393734373263313332633562643732326663
3437