Compare commits
20 Commits
feature/fe
...
master
Author | SHA1 | Date |
---|---|---|
Egon Rijpkema | 0dbcabb4a2 | |
Egon Rijpkema | 1920804c3c | |
Egon Rijpkema | 4481b09bbc | |
Egon Rijpkema | 52db295b69 | |
Egon Rijpkema | 07def88ceb | |
Egon Rijpkema | 77c512977f | |
Egon Rijpkema | 455e10c7ab | |
Egon Rijpkema | d51c52d35c | |
Egon Rijpkema | 510b68d156 | |
Egon Rijpkema | 7f49c6d706 | |
Egon Rijpkema | 75434ae097 | |
Egon Rijpkema | 90b394e456 | |
Egon Rijpkema | 53bfd40ea6 | |
Egon Rijpkema | 00bb496ec5 | |
Egon Rijpkema | 7e7ab04df0 | |
Egon Rijpkema | f4f9b95d09 | |
Egon Rijpkema | 6a048fc437 | |
Egon Rijpkema | d54af88505 | |
Egon Rijpkema | d8073d485b | |
Egon Rijpkema | 830e940fa2 |
|
@ -0,0 +1,194 @@
|
||||||
|
---
|
||||||
|
# When the issue below is resolved, we can build the
|
||||||
|
# image that was actually changed.
|
||||||
|
# https://github.com/drone/drone/issues/1021
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
cinder_controller:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: cinder_controller/Dockerfile
|
||||||
|
context: cinder_controller
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-cinder-controller
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
cinder_storage:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: cinder_storage/Dockerfile
|
||||||
|
context: cinder_storage
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-cinder-storage
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
glance:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: glance/Dockerfile
|
||||||
|
context: glance
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-glance
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
heat:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: heat/Dockerfile
|
||||||
|
context: heat
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-heat
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
horizon:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: horizon/Dockerfile
|
||||||
|
context: horizon
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-horizon
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
keystone:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: keystone/Dockerfile
|
||||||
|
context: keystone
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-keystone
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
neutron_controller:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: neutron_controller/Dockerfile
|
||||||
|
context: neutron_controller
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-neutron-controller
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
nova_service:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: nova_service/Dockerfile
|
||||||
|
context: nova_service
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-nova-service
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
nova_compute:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: nova_compute/Dockerfile
|
||||||
|
context: nova_compute
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-nova-compute
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
keystone_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: keystone/Dockerfile
|
||||||
|
context: keystone
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-keystone-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
horizon_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: horizon/Dockerfile
|
||||||
|
context: horizon
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-horizon-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
neutron_controller_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: neutron_controller/Dockerfile
|
||||||
|
context: neutron_controller
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
cinder_controller_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: cinder_controller/Dockerfile
|
||||||
|
context: cinder_controller
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-cinder-controller-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: mwelin
|
||||||
|
cinder_storage_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: cinder_storage/Dockerfile
|
||||||
|
context: cinder_storage
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-cinder-storage-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
nova_compute_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: nova_compute/Dockerfile
|
||||||
|
context: nova_compute
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-nova-compute-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
glance_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: glance/Dockerfile
|
||||||
|
context: glance
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-glance-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
heat_merlin:
|
||||||
|
image: plugins/docker
|
||||||
|
dockerfile: heat/Dockerfile
|
||||||
|
context: heat
|
||||||
|
secrets: [docker_username, docker_password]
|
||||||
|
registry: registry.webhosting.rug.nl
|
||||||
|
repo: registry.webhosting.rug.nl/hpc/openstack-heat-merlin
|
||||||
|
tag: latest
|
||||||
|
when:
|
||||||
|
branch: merlin
|
||||||
|
notify:
|
||||||
|
image: drillster/drone-email
|
||||||
|
host: smtp.rug.nl
|
||||||
|
port: 25
|
||||||
|
skip_verify: true
|
||||||
|
from: drone@webhosting.rug.nl
|
||||||
|
# recipients: [e.m.a.rijpkema@rug.nl, w.k.nap@rug.nl]
|
||||||
|
recipients: [e.m.a.rijpkema@rug.nl]
|
||||||
|
recipients_only: true
|
||||||
|
when:
|
||||||
|
status: [success, changed, failure]
|
||||||
|
# slack:
|
||||||
|
# image: plugins/slack
|
||||||
|
# webhook:
|
||||||
|
# channel: docker
|
||||||
|
# when:
|
||||||
|
# branch: [master, merlin]
|
||||||
|
# status: [success, failure]
|
|
@ -7,6 +7,7 @@ cinder-scheduler -d &
|
||||||
sleep 5
|
sleep 5
|
||||||
apachectl -DFOREGROUND &
|
apachectl -DFOREGROUND &
|
||||||
|
|
||||||
|
tail -f /var/log/apache2/* &
|
||||||
# If any process fails, kill the rest.
|
# If any process fails, kill the rest.
|
||||||
# This ensures the container stops and systemd will restart it.
|
# This ensures the container stops and systemd will restart it.
|
||||||
|
|
|
@ -22,6 +22,6 @@ source /root/admin-openrc.sh
|
||||||
|
|
||||||
# create a LVM physical volume and volume group.
|
# create a LVM physical volume and volume group.
|
||||||
# This device should be available tpo the container
|
# This device should be available tpo the container
|
||||||
pvcreate /dev/cinder_storage_volume
|
pvcreate $CINDER_STORAGE_VOLUME
|
||||||
vgcreate cinder-volumes /dev/cinder_storage_volume
|
vgcreate cinder-volumes $CINDER_STORAGE_VOLUME
|
||||||
|
|
|
@ -9,6 +9,7 @@ cat << EOF > /etc/cinder/cinder.conf
|
||||||
connection = mysql+pymysql://$CINDER_USER:$CINDER_PASSWORD@$MYSQL_HOST/cinder
|
connection = mysql+pymysql://$CINDER_USER:$CINDER_PASSWORD@$MYSQL_HOST/cinder
|
||||||
|
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
storage_availability_zone="$AVAILABILITY_ZONE"
|
||||||
auth_strategy = keystone
|
auth_strategy = keystone
|
||||||
transport_url = rabbit://$RABBIT_USER:$RABBIT_PASSWORD@$RABBIT_HOST
|
transport_url = rabbit://$RABBIT_USER:$RABBIT_PASSWORD@$RABBIT_HOST
|
||||||
my_ip = $MY_IP
|
my_ip = $MY_IP
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
build.sh
|
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
---
|
|
||||||
pipeline:
|
|
||||||
docker:
|
|
||||||
image: plugins/docker
|
|
||||||
secrets: [docker_username, docker_password]
|
|
||||||
registry: registry.webhosting.rug.nl
|
|
||||||
repo: registry.webhosting.rug.nl/hpc/openstack-nova-compute
|
|
||||||
tag: latest
|
|
||||||
notify:
|
|
||||||
image: drillster/drone-email
|
|
||||||
host: smtp.rug.nl
|
|
||||||
port: 25
|
|
||||||
skip_verify: true
|
|
||||||
from: drone@webhosting.rug.nl
|
|
||||||
recipients: [e.m.a.rijpkema@rug.nl]
|
|
||||||
recipients: [e.m.a.rijpkema@rug.nl, w.k.nap@rug.nl]
|
|
||||||
recipients_only: true
|
|
||||||
when:
|
|
||||||
status: [success, changed, failure]
|
|
||||||
# slack:
|
|
||||||
# image: plugins/slack
|
|
||||||
# webhook:
|
|
||||||
# channel: docker
|
|
||||||
# when:
|
|
||||||
# branch: [master, merlin]
|
|
||||||
# status: [success, failure]
|
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
# ---> Vim
|
|
||||||
[._]*.s[a-w][a-z]
|
|
||||||
[._]s[a-w][a-z]
|
|
||||||
*.un~
|
|
||||||
Session.vim
|
|
||||||
.netrwhist
|
|
||||||
*~
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ OPENSTACK_CINDER_FEATURES = {
|
||||||
# services provided by neutron. Options currently available are load
|
# services provided by neutron. Options currently available are load
|
||||||
# balancer service, security groups, quotas, VPN service.
|
# balancer service, security groups, quotas, VPN service.
|
||||||
OPENSTACK_NEUTRON_NETWORK = {
|
OPENSTACK_NEUTRON_NETWORK = {
|
||||||
'enable_router': False,
|
'enable_router': True,
|
||||||
'enable_quotas': False,
|
'enable_quotas': False,
|
||||||
'enable_ipv6': False,
|
'enable_ipv6': False,
|
||||||
'enable_distributed_router': False,
|
'enable_distributed_router': False,
|
|
@ -20,6 +20,7 @@ allow_migrate_to_same_host = True
|
||||||
allow_resize_to_same_host = True
|
allow_resize_to_same_host = True
|
||||||
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
||||||
enabled_apis=osapi_compute,metadata
|
enabled_apis=osapi_compute,metadata
|
||||||
|
cpu_allocation_ratio = 4
|
||||||
|
|
||||||
[neutron]
|
[neutron]
|
||||||
url = http://$NEUTRON_CONTROLLER_HOST:9696
|
url = http://$NEUTRON_CONTROLLER_HOST:9696
|
Loading…
Reference in New Issue