HPC/openstack_dockers
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: HPC:73e26ea716f1e72f4dddedcb132820e78ea78d58
Branches Tags
HPC:master HPC:merlin HPC:feature/federated-login HPC:feature/federated-login-before-rebase HPC:feature/bagpipe
..
compare: HPC:merlin
Branches Tags
HPC:master HPC:merlin HPC:feature/federated-login HPC:feature/federated-login-before-rebase HPC:feature/bagpipe

13 Commits
73e26ea716 ... merlin

Author SHA1 Message Date
Egon Rijpkema
ce60b19fd2 Added a shibboleth attribute 2018-11-06 12:53:48 +01:00
Egon Rijpkema
e9e1778a30 Add a merlin heat 2018-10-08 16:50:13 +02:00
Egon Rijpkema
b502fb98e7 Filthy hack to make sure local settings are loaded. 2018-09-26 13:47:49 +02:00
Egon Rijpkema
3a1636bfee Added entry in /etc/hosts for merlin.hpc.rug.nl 2018-09-25 10:54:42 +02:00
Egon Rijpkema
4426aed663 Build cinder controller 2018-09-24 10:14:20 +02:00
Egon Rijpkema
984c48d2e6 Updated auth_url to https in config files, too 2018-09-24 09:55:01 +02:00
Egon Rijpkema
4b29b7b061 Separate nova service for merlin 2018-09-21 16:59:20 +02:00
Egon Rijpkema
4e46364508 OS_AUTH_URL is https now 2018-09-21 16:24:23 +02:00
Egon Rijpkema
d0cac71af4 Added ceph-common to cinder-storage. 2018-09-20 16:45:08 +02:00
Egon Rijpkema
17ee2aa487 Added ceph config for cinder controller. 2018-09-17 13:25:44 +02:00
Egon Rijpkema
d161a24200 Add apache2 log to container log. 2018-09-17 11:45:36 +02:00
Egon Rijpkema
71d2bc13ea make rbd secrets a variable secret to be set here. 2018-09-13 16:13:49 +02:00
Egon Rijpkema
5ae8a4cf1a Fixed typo 2018-09-13 11:52:18 +02:00
31 changed files with 127 additions and 60 deletions
Expand all files Collapse all files

30
.drone.yml
View File

@@ -104,6 +104,16 @@ pipeline:
tag: latest tag: latest
when: when:
branch: merlin branch: merlin
nova_service_merlin:
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-merlin
tag: latest
when:
branch: merlin
horizon_merlin: horizon_merlin:
image: plugins/docker image: plugins/docker
dockerfile: horizon/Dockerfile dockerfile: horizon/Dockerfile
@@ -124,6 +134,16 @@ pipeline:
tag: latest tag: latest
when: when:
branch: merlin 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: cinder_storage_merlin:
image: plugins/docker image: plugins/docker
dockerfile: cinder_storage/Dockerfile dockerfile: cinder_storage/Dockerfile
@@ -154,6 +174,16 @@ pipeline:
tag: latest tag: latest
when: when:
branch: merlin 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: notify:
image: drillster/drone-email image: drillster/drone-email
host: smtp.rug.nl host: smtp.rug.nl

2
cinder_controller/Dockerfile
View File

@@ -15,6 +15,8 @@ RUN set -x \
python-oslo.cache \ python-oslo.cache \
cinder-api \ cinder-api \
cinder-scheduler \ cinder-scheduler \
python-ceph \
python-rbd \
&& apt-get -y clean && apt-get -y clean
EXPOSE 8776 EXPOSE 8776

2
cinder_controller/admin-openrc.sh
View File

@@ -9,7 +9,7 @@ export OS_IDENTITY_API_VERSION=3
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=geheim export OS_PASSWORD=geheim
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default
export OS_USER_DOMAIN_NAME=default export OS_USER_DOMAIN_NAME=default

2
cinder_controller/bootstrap.sh
View File

@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default

1
cinder_controller/run.sh
View File

@@ -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.

15
cinder_controller/write_conf.sh
View File

@@ -11,11 +11,12 @@ connection = mysql+pymysql://$CINDER_USER:$CINDER_PASSWORD@$MYSQL_HOST/cinder
[DEFAULT] [DEFAULT]
auth_strategy = keystone auth_strategy = keystone
transport_url = rabbit://$RABBIT_USER:$RABBIT_PASSWORD@$MY_IP transport_url = rabbit://$RABBIT_USER:$RABBIT_PASSWORD@$MY_IP
enabled_backends = RBD-backend
my_ip = $MY_IP my_ip = $MY_IP
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -27,4 +28,14 @@ password = $CINDER_PASSWORD
[oslo_concurrency] [oslo_concurrency]
lock_path = /var/lib/cinder/tmp lock_path = /var/lib/cinder/tmp
[RBD-backend]
volume_backend_name = RBD-backend
rbd_pool = volumes
rbd_user = volumes
rbd_secret_uuid = $RBD_SECRET_UUID
volume_driver = cinder.volume.drivers.rbd.RBDDriver
rbd_ceph_conf = /etc/ceph/ceph.conf
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

3
cinder_storage/Dockerfile
View File

@@ -15,8 +15,9 @@ RUN set -x \
python-openstackclient \ python-openstackclient \
python-oslo.cache \ python-oslo.cache \
lvm2 \ lvm2 \
python-ceph \ python-ceph \
python-rbd \ python-rbd \
ceph-common \
&& apt-get -y clean && apt-get -y clean

2
cinder_storage/admin-openrc.sh
View File

@@ -9,7 +9,7 @@ export OS_IDENTITY_API_VERSION=3
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=geheim export OS_PASSWORD=geheim
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default
export OS_USER_DOMAIN_NAME=default export OS_USER_DOMAIN_NAME=default

2
cinder_storage/bootstrap.sh
View File

@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default

18
cinder_storage/write_conf.sh
View File

@@ -16,8 +16,8 @@ enabled_backends = RBD-backend
glance_api_servers = http://$GLANCE_HOST:9292 glance_api_servers = http://$GLANCE_HOST:9292
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -30,11 +30,13 @@ password = $CINDER_PASSWORD
lock_path = /var/lib/cinder/tmp lock_path = /var/lib/cinder/tmp
[RBD-backend] [RBD-backend]
volume_backend_name=RBD-backend volume_backend_name = RBD-backend
rbd_pool=volumes rbd_pool = volumes
rbd_user=volumes rbd_user = volumes
rbd_secret_uuid=d0db6ba7-a0c9-4da6-b0bc-aa7846325333 rbd_secret_uuid = $RBD_SECRET_UUID
volume_driver=cinder.volume.drivers.rbd.RBDDriver volume_driver = cinder.volume.drivers.rbd.RBDDriver
rbd_ceph_conf=/etc/ceph/ceph.conf rbd_ceph_conf = /etc/ceph/ceph.conf
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

2
glance/admin-openrc.sh
View File

@@ -8,7 +8,7 @@ export OS_IDENTITY_API_VERSION=3
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=geheim export OS_PASSWORD=geheim
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default
export OS_USER_DOMAIN_NAME=default export OS_USER_DOMAIN_NAME=default

2
glance/bootstrap.sh
View File

@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export GLANCE_USER_NAME=glance export GLANCE_USER_NAME=glance

11
glance/write_conf.sh
View File

@@ -9,8 +9,8 @@ cat << EOF > /etc/glance/glance-api.conf
connection = mysql+pymysql://$GLANCE_USER:$GLANCE_PASSWORD@$MYSQL_HOST/glance connection = mysql+pymysql://$GLANCE_USER:$GLANCE_PASSWORD@$MYSQL_HOST/glance
[image_format] [image_format]
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -57,8 +57,8 @@ rbd_store_user = images
rbd_store_ceph_conf = /etc/ceph/ceph.conf rbd_store_ceph_conf = /etc/ceph/ceph.conf
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -79,3 +79,6 @@ rabbit_password = $RABBIT_PASSWORD
flavor = keystone flavor = keystone
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

2
heat/admin-openrc.sh
View File

@@ -5,7 +5,7 @@ export OS_IDENTITY_API_VERSION=3
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=geheim export OS_PASSWORD=geheim
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default
export OS_USER_DOMAIN_NAME=default export OS_USER_DOMAIN_NAME=default

2
heat/bootstrap.sh
View File

@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export HEAT_USER=heat export HEAT_USER=heat

8
heat/write_conf.sh
View File

@@ -15,8 +15,8 @@ heat_waitcondition_server_url = http://$HEAT_HOST:8000/v1/waitcondition
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -27,9 +27,11 @@ password = $HEAT_PASSWORD
[trustee] [trustee]
auth_plugin = password auth_plugin = password
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
username = $HEAT_USER username = $HEAT_USER
password = $HEAT_PASSWORD password = $HEAT_PASSWORD
user_domain_name = Default user_domain_name = Default
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

2
horizon/admin-openrc.sh
View File

@@ -5,7 +5,7 @@ export OS_IDENTITY_API_VERSION=3
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=geheim export OS_PASSWORD=geheim
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default
export OS_USER_DOMAIN_NAME=default export OS_USER_DOMAIN_NAME=default

4
horizon/run.sh
View File

@@ -5,4 +5,8 @@ tail -f /var/log/horizon.log &
tail -f /var/log/apache2/* & tail -f /var/log/apache2/* &
cat /etc/openstack-dashboard/local_settings.py >> \
/usr/share/openstack-dashboard/openstack_dashboard/settings.py
apachectl -DFOREGROUND apachectl -DFOREGROUND

2
keystone/attribute-map.xml
View File

@@ -10,6 +10,8 @@
<!-- Added for nikhef --> <!-- Added for nikhef -->
<Attribute name="openstackGroupEntitlements" id="openstackGroupEntitlements" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/> <Attribute name="openstackGroupEntitlements" id="openstackGroupEntitlements" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
<!-- Added after mail 18-10-2018 -->
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-user"/> <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-user"/>
<Attribute name="urn:oid:2.5.4.4" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-surName"/> <Attribute name="urn:oid:2.5.4.4" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" id="Shib-surName"/>

4
keystone/bootstrap.sh
View File

@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://${KEYSTONE_HOST}:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
EOF EOF
@@ -16,7 +16,7 @@ cat << EOF > /root/demo-openrc.sh
export OS_TENANT_NAME=demo export OS_TENANT_NAME=demo
export OS_USERNAME=demo export OS_USERNAME=demo
export OS_PASSWORD=${OS_DEMO_PASSWORD} export OS_PASSWORD=${OS_DEMO_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://${KEYSTONE_HOST}:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
EOF EOF

3
keystone/keystone.conf
View File

@@ -1,6 +1,7 @@
[DEFAULT] [DEFAULT]
verbose = true verbose = true
# debug = true
log_file = /var/log/keystone/keystone.log log_file = /var/log/keystone/keystone.log
[database] [database]
@@ -13,7 +14,7 @@ provider = fernet
methods = password,token,mapped,openid,saml2 methods = password,token,mapped,openid,saml2
[federation] [federation]
trusted_dashboard = http://merlin.hpc.rug.nl/horizon/auth/websso/ trusted_dashboard = https://merlin.hpc.rug.nl/horizon/auth/websso/
sso_calback_template = /etc/keystone/sso_calback_template.html sso_calback_template = /etc/keystone/sso_calback_template.html
[mapped] [mapped]

2
keystone/run.sh
View File

@@ -15,7 +15,7 @@ chown _shibd: /etc/shibboleth/sp*.pem
shibd -f -F & shibd -f -F &
# If any process fails, kill the rest. # If any process fails, kill the rest.
# This insures the container stops and systemd will restart it. # This ensures the container stops and systemd will restart it.
wait -n wait -n
pkill -P $$ pkill -P $$

2
neutron_controller/bootstrap.sh
View File

@@ -11,7 +11,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default

8
neutron_controller/write_conf.sh
View File

@@ -22,8 +22,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
connection = mysql+pymysql://$NEUTRON_USER:$NEUTRON_PASSWORD@mariadb/neutron connection = mysql+pymysql://$NEUTRON_USER:$NEUTRON_PASSWORD@mariadb/neutron
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -33,7 +33,7 @@ username = $NEUTRON_USER
password = $NEUTRON_PASSWORD password = $NEUTRON_PASSWORD
[nova] [nova]
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
user_domain_name = Default user_domain_name = Default
@@ -98,3 +98,5 @@ interface_driver = linuxbridge
external_network_bridge = external_network_bridge =
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

2
neutron_controller_ovs/bootstrap.sh
View File

@@ -11,7 +11,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default

8
neutron_controller_ovs/write_conf.sh
View File

@@ -22,8 +22,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
connection = mysql+pymysql://$NEUTRON_USER:$NEUTRON_PASSWORD@mariadb/neutron connection = mysql+pymysql://$NEUTRON_USER:$NEUTRON_PASSWORD@mariadb/neutron
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -33,7 +33,7 @@ username = $NEUTRON_USER
password = $NEUTRON_PASSWORD password = $NEUTRON_PASSWORD
[nova] [nova]
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
user_domain_name = Default user_domain_name = Default
@@ -98,3 +98,5 @@ interface_driver = linuxbridge
external_network_bridge = external_network_bridge =
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

2
nova_compute/Dockerfile
View File

@@ -17,7 +17,7 @@ RUN set -x \
neutron-metadata-agent \ neutron-metadata-agent \
python-ceph \ python-ceph \
python-rbd \ python-rbd \
ceph-common \ ceph-common \
&& apt-get -y clean && apt-get -y clean
COPY write_conf.sh /etc/write_conf.sh COPY write_conf.sh /etc/write_conf.sh

28
nova_compute/write_conf.sh
View File

@@ -8,7 +8,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default
@@ -41,7 +41,7 @@ security_group_api=neutron
[neutron] [neutron]
url = http://$NEUTRON_CONTROLLER_HOST:9696 url = http://$NEUTRON_CONTROLLER_HOST:9696
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
user_domain_name = Default user_domain_name = Default
@@ -66,8 +66,8 @@ lock_path = /var/lib/nova/tmp
auth_strategy = keystone auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -91,7 +91,7 @@ project_domain_name = Default
project_name = service project_name = service
auth_type = password auth_type = password
user_domain_name = Default user_domain_name = Default
auth_url = http://$KEYSTONE_HOST:35357/v3 auth_url = https://$KEYSTONE_HOST:35357/v3
username = $NOVA_PLACEMENT_USER username = $NOVA_PLACEMENT_USER
password = $NOVA_PLACEMENT_PASSWORD password = $NOVA_PLACEMENT_PASSWORD
@@ -127,7 +127,7 @@ images_type = rbd
images_rbd_pool = volumes images_rbd_pool = volumes
images_rbd_ceph_conf = /etc/ceph/ceph.conf images_rbd_ceph_conf = /etc/ceph/ceph.conf
rbd_user = volumes rbd_user = volumes
rbd_secret_uuid = d0db6ba7-a0c9-4da6-b0bc-aa7846325333 rbd_secret_uuid = $RBD_SECRET_UUID
[vnc] [vnc]
@@ -146,8 +146,8 @@ lock_path = /var/lib/nova/tmp
auth_strategy = keystone auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -171,7 +171,7 @@ project_domain_name = Default
project_name = service project_name = service
auth_type = password auth_type = password
user_domain_name = Default user_domain_name = Default
auth_url = http://$KEYSTONE_HOST:35357/v3 auth_url = https://$KEYSTONE_HOST:35357/v3
username = $NOVA_PLACEMENT_USER username = $NOVA_PLACEMENT_USER
password = $NOVA_PLACEMENT_PASSWORD password = $NOVA_PLACEMENT_PASSWORD
@@ -180,7 +180,7 @@ api_paste_config=/etc/nova/api-paste.ini
[neutron] [neutron]
url = http://$NEUTRON_CONTROLLER_HOST:9696 url = http://$NEUTRON_CONTROLLER_HOST:9696
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
user_domain_name = Default user_domain_name = Default
@@ -204,8 +204,8 @@ core_plugin = ml2
global_physnet_mtu = $GLOBAL_PHYSNET_MTU global_physnet_mtu = $GLOBAL_PHYSNET_MTU
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -215,7 +215,7 @@ username = $NEUTRON_USER
password = $NEUTRON_PASSWORD password = $NEUTRON_PASSWORD
[nova] [nova]
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
user_domain_name = Default user_domain_name = Default
@@ -315,3 +315,5 @@ interface_driver = linuxbridge
external_network_bridge = external_network_bridge =
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

2
nova_service/bootstrap.sh
View File

@@ -13,7 +13,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
export OS_PROJECT_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default

10
nova_service/write_conf.sh
View File

@@ -24,7 +24,7 @@ security_group_api=neutron
[neutron] [neutron]
url = http://$NEUTRON_CONTROLLER_HOST:9696 url = http://$NEUTRON_CONTROLLER_HOST:9696
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
user_domain_name = Default user_domain_name = Default
@@ -39,8 +39,8 @@ metadata_proxy_shared_secret = $METADATA_SECRET
auth_strategy = keystone auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000 auth_uri = https://$KEYSTONE_HOST:5000
auth_url = http://$KEYSTONE_HOST:35357 auth_url = https://$KEYSTONE_HOST:35357
memcached_servers = $MEMCACHED_HOST:11211 memcached_servers = $MEMCACHED_HOST:11211
auth_type = password auth_type = password
project_domain_name = Default project_domain_name = Default
@@ -66,7 +66,7 @@ project_domain_name = Default
project_name = service project_name = service
auth_type = password auth_type = password
user_domain_name = Default user_domain_name = Default
auth_url = http://$KEYSTONE_HOST:35357/v3 auth_url = https://$KEYSTONE_HOST:35357/v3
username = $NOVA_PLACEMENT_USER username = $NOVA_PLACEMENT_USER
password = $NOVA_PLACEMENT_PASSWORD password = $NOVA_PLACEMENT_PASSWORD
@@ -74,3 +74,5 @@ password = $NOVA_PLACEMENT_PASSWORD
os_region_name = RegionOne os_region_name = RegionOne
EOF EOF
echo "172.23.59.101 merlin.hpc.rug.nl" >> /etc/hosts

4
openstack_client/bootstrap.sh
View File

@@ -6,7 +6,7 @@ cat << EOF > /root/admin-openrc.sh
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_PASSWORD=${OS_PASSWORD} export OS_PASSWORD=${OS_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
EOF EOF
@@ -16,6 +16,6 @@ cat << EOF > /root/demo-openrc.sh
export OS_TENANT_NAME=demo export OS_TENANT_NAME=demo
export OS_USERNAME=demo export OS_USERNAME=demo
export OS_PASSWORD=${OS_DEMO_PASSWORD} export OS_PASSWORD=${OS_DEMO_PASSWORD}
export OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3 export OS_AUTH_URL=https://merlin.hpc.rug.nl:35357/v3
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
EOF EOF