From bd885521ec64d87ebed4a438b13513858214e94e Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Thu, 16 Oct 2014 13:44:27 -0400 Subject: renamed nova-controller -> nova-ctr-base there is a 31 character limit on image names in docker hub. Change-Id: I9624668fc2f09c397084eadf792d4d0cc8486ae1 --- docker/nova-controller/nova-api/Dockerfile | 2 +- docker/nova-controller/nova-conductor/Dockerfile | 2 +- docker/nova-controller/nova-controller/Dockerfile | 10 --- docker/nova-controller/nova-controller/build | 1 - .../nova-controller/config-nova-controller.sh | 87 ---------------------- docker/nova-controller/nova-controller/nova.conf | 73 ------------------ docker/nova-controller/nova-ctr-base/Dockerfile | 10 +++ docker/nova-controller/nova-ctr-base/build | 1 + .../nova-ctr-base/config-nova-controller.sh | 87 ++++++++++++++++++++++ docker/nova-controller/nova-ctr-base/nova.conf | 73 ++++++++++++++++++ docker/nova-controller/nova-scheduler/Dockerfile | 2 +- 11 files changed, 174 insertions(+), 174 deletions(-) delete mode 100644 docker/nova-controller/nova-controller/Dockerfile delete mode 120000 docker/nova-controller/nova-controller/build delete mode 100644 docker/nova-controller/nova-controller/config-nova-controller.sh delete mode 100644 docker/nova-controller/nova-controller/nova.conf create mode 100644 docker/nova-controller/nova-ctr-base/Dockerfile create mode 120000 docker/nova-controller/nova-ctr-base/build create mode 100644 docker/nova-controller/nova-ctr-base/config-nova-controller.sh create mode 100644 docker/nova-controller/nova-ctr-base/nova.conf diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile index d20a9ad36..23e4c076f 100644 --- a/docker/nova-controller/nova-api/Dockerfile +++ b/docker/nova-controller/nova-api/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-controller +FROM kollaglue/fedora-rdo-nova-ctr-base MAINTAINER Ryan Hallisey RUN yum -y install \ diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile index 32d1e71ee..881081690 100644 --- a/docker/nova-controller/nova-conductor/Dockerfile +++ b/docker/nova-controller/nova-conductor/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-controller +FROM kollaglue/fedora-rdo-nova-ctr-base MAINTAINER Ryan Hallisey RUN yum -y install \ diff --git a/docker/nova-controller/nova-controller/Dockerfile b/docker/nova-controller/nova-controller/Dockerfile deleted file mode 100644 index bad079994..000000000 --- a/docker/nova-controller/nova-controller/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM kollaglue/fedora-rdo-base -MAINTAINER Ryan Hallisey - -RUN yum -y install openstack-nova-common \ - python-keystoneclient \ - python-cinderclient \ - python-nova && yum clean all - -ADD config-nova-controller.sh /opt/kolla/config-nova-controller.sh - diff --git a/docker/nova-controller/nova-controller/build b/docker/nova-controller/nova-controller/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker/nova-controller/nova-controller/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-controller/config-nova-controller.sh b/docker/nova-controller/nova-controller/config-nova-controller.sh deleted file mode 100644 index efd55d64e..000000000 --- a/docker/nova-controller/nova-controller/config-nova-controller.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -. /opt/kolla/kolla-common.sh - -: ${NOVA_DB_USER:=nova} -: ${NOVA_DB_NAME:=nova} -: ${NOVA_KEYSTONE_USER:=admin} -: ${NOVA_KEYSTONE_PASSWORD:=kolla} -: ${ADMIN_TENANT_NAME:=admin} -: ${RABBIT_USERID:=guest} -: ${RABBIT_PASSWORD:=guest} - -check_required_vars KEYSTONE_ADMIN_TOKEN - NOVA_DB_PASSWORD NEUTRON_SHARED_SECRET - -cfg=/etc/nova/nova.conf - -crudini --set $cfg DEFAULT amqp_durable_queues False -crudini --set $cfg DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST} -crudini --set $cfg DEFAULT rabbit_port 5672 -crudini --set $cfg DEFAULT rabbit_hosts ${RABBITMQ_SERVICE_HOST}:5672 -crudini --set $cfg DEFAULT rabbit_use_ssl False -crudini --set $cfg DEFAULT rabbit_userid ${RABBIT_USERID} -crudini --set $cfg DEFAULT rabbit_password "${RABBIT_PASSWORD}" -crudini --set $cfg DEFAULT rabbit_virtual_host / -crudini --set $cfg DEFAULT rabbit_ha_queues False -crudini --set $cfg DEFAULT rpc_backend nova.openstack.common.rpc.impl_kombu - -crudini --set $cfg DEFAULT enabled_apis ec2,osapi_compute,metadata -crudini --set $cfg DEFAULT ec2_listen 0.0.0.0 -crudini --set $cfg DEFAULT osapi_compute_listen 0.0.0.0 -crudini --set $cfg DEFAULT osapi_compute_workers 8 -crudini --set $cfg DEFAULT metadata_listen 0.0.0.0 -crudini --set $cfg DEFAULT metadata_workers 8 -crudini --set $cfg DEFAULT service_down_time 60 -crudini --set $cfg DEFAULT rootwrap_config /etc/nova/rootwrap.conf -crudini --set $cfg DEFAULT auth_strategy keystone -crudini --set $cfg DEFAULT use_forwarded_for False -crudini --set $cfg DEFAULT service_neutron_metadata_proxy True -crudini --set $cfg DEFAULT neutron_metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET} -crudini --set $cfg DEFAULT neutron_default_tenant_id default -crudini --set $cfg DEFAULT novncproxy_host 0.0.0.0 -crudini --set $cfg DEFAULT novncproxy_port 6080 -crudini --set $cfg DEFAULT glance_api_servers ${GLANCE_API_SERVICE_HOST}:9292 -crudini --set $cfg DEFAULT network_api_class nova.network.neutronv2.api.API -crudini --set $cfg DEFAULT metadata_host ${MY_IP} -crudini --set $cfg DEFAULT cpu_allocation_ratio 16.0 -crudini --set $cfg DEFAULT ram_allocation_ratio 1.5 -crudini --set $cfg DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter -crudini --set $cfg DEFAULT compute_driver nova.virt.libvirt.LibvirtDriver -crudini --set $cfg DEFAULT vif_plugging_is_fatal True -crudini --set $cfg DEFAULT vif_plugging_timeout 300 -crudini --set $cfg DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver -crudini --set $cfg DEFAULT novncproxy_base_url http://${PUBLIC_IP}:6080/vnc_auto.html -crudini --set $cfg DEFAULT vncserver_listen 0.0.0.0 -crudini --set $cfg DEFAULT vncserver_proxyclient_address ${MY_IP} -crudini --set $cfg DEFAULT vnc_enabled True -crudini --set $cfg DEFAULT volume_api_class nova.volume.cinder.API -crudini --set $cfg DEFAULT image_service nova.image.glance.GlanceImageService -crudini --set $cfg DEFAULT osapi_volume_listen 0.0.0.0 - -# configure logging to stderr -crudini --del $cfg DEFAULT log_dir -crudini --sel $cfg DEFAULT log_file "" -crudini --set $cfg DEFAULT use_stderr True -crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}" - -crudini --set $cfg conductor workers 8 - -for option in auth_protocol auth_host auth_port; do - crudini --del $cfg \ - keystone_authtoken \ - $option -done - -crudini --set $cfg keystone_authtoken auth_uri "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/" -crudini --set $cfg keystone_authtoken admin_user ${NOVA_KEYSTONE_USER} -crudini --set $cfg keystone_authtoken admin_password "${NOVA_KEYSTONE_PASSWORD}" -crudini --set $cfg keystone_authtoken admin_tenant_name ${ADMIN_TENANT_NAME} - -cat > /openrc < + +RUN yum -y install openstack-nova-common \ + python-keystoneclient \ + python-cinderclient \ + python-nova && yum clean all + +ADD config-nova-controller.sh /opt/kolla/config-nova-controller.sh + diff --git a/docker/nova-controller/nova-ctr-base/build b/docker/nova-controller/nova-ctr-base/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/nova-controller/nova-ctr-base/build @@ -0,0 +1 @@ +../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-ctr-base/config-nova-controller.sh b/docker/nova-controller/nova-ctr-base/config-nova-controller.sh new file mode 100644 index 000000000..efd55d64e --- /dev/null +++ b/docker/nova-controller/nova-ctr-base/config-nova-controller.sh @@ -0,0 +1,87 @@ +#!/bin/sh + +. /opt/kolla/kolla-common.sh + +: ${NOVA_DB_USER:=nova} +: ${NOVA_DB_NAME:=nova} +: ${NOVA_KEYSTONE_USER:=admin} +: ${NOVA_KEYSTONE_PASSWORD:=kolla} +: ${ADMIN_TENANT_NAME:=admin} +: ${RABBIT_USERID:=guest} +: ${RABBIT_PASSWORD:=guest} + +check_required_vars KEYSTONE_ADMIN_TOKEN + NOVA_DB_PASSWORD NEUTRON_SHARED_SECRET + +cfg=/etc/nova/nova.conf + +crudini --set $cfg DEFAULT amqp_durable_queues False +crudini --set $cfg DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST} +crudini --set $cfg DEFAULT rabbit_port 5672 +crudini --set $cfg DEFAULT rabbit_hosts ${RABBITMQ_SERVICE_HOST}:5672 +crudini --set $cfg DEFAULT rabbit_use_ssl False +crudini --set $cfg DEFAULT rabbit_userid ${RABBIT_USERID} +crudini --set $cfg DEFAULT rabbit_password "${RABBIT_PASSWORD}" +crudini --set $cfg DEFAULT rabbit_virtual_host / +crudini --set $cfg DEFAULT rabbit_ha_queues False +crudini --set $cfg DEFAULT rpc_backend nova.openstack.common.rpc.impl_kombu + +crudini --set $cfg DEFAULT enabled_apis ec2,osapi_compute,metadata +crudini --set $cfg DEFAULT ec2_listen 0.0.0.0 +crudini --set $cfg DEFAULT osapi_compute_listen 0.0.0.0 +crudini --set $cfg DEFAULT osapi_compute_workers 8 +crudini --set $cfg DEFAULT metadata_listen 0.0.0.0 +crudini --set $cfg DEFAULT metadata_workers 8 +crudini --set $cfg DEFAULT service_down_time 60 +crudini --set $cfg DEFAULT rootwrap_config /etc/nova/rootwrap.conf +crudini --set $cfg DEFAULT auth_strategy keystone +crudini --set $cfg DEFAULT use_forwarded_for False +crudini --set $cfg DEFAULT service_neutron_metadata_proxy True +crudini --set $cfg DEFAULT neutron_metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET} +crudini --set $cfg DEFAULT neutron_default_tenant_id default +crudini --set $cfg DEFAULT novncproxy_host 0.0.0.0 +crudini --set $cfg DEFAULT novncproxy_port 6080 +crudini --set $cfg DEFAULT glance_api_servers ${GLANCE_API_SERVICE_HOST}:9292 +crudini --set $cfg DEFAULT network_api_class nova.network.neutronv2.api.API +crudini --set $cfg DEFAULT metadata_host ${MY_IP} +crudini --set $cfg DEFAULT cpu_allocation_ratio 16.0 +crudini --set $cfg DEFAULT ram_allocation_ratio 1.5 +crudini --set $cfg DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter +crudini --set $cfg DEFAULT compute_driver nova.virt.libvirt.LibvirtDriver +crudini --set $cfg DEFAULT vif_plugging_is_fatal True +crudini --set $cfg DEFAULT vif_plugging_timeout 300 +crudini --set $cfg DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver +crudini --set $cfg DEFAULT novncproxy_base_url http://${PUBLIC_IP}:6080/vnc_auto.html +crudini --set $cfg DEFAULT vncserver_listen 0.0.0.0 +crudini --set $cfg DEFAULT vncserver_proxyclient_address ${MY_IP} +crudini --set $cfg DEFAULT vnc_enabled True +crudini --set $cfg DEFAULT volume_api_class nova.volume.cinder.API +crudini --set $cfg DEFAULT image_service nova.image.glance.GlanceImageService +crudini --set $cfg DEFAULT osapi_volume_listen 0.0.0.0 + +# configure logging to stderr +crudini --del $cfg DEFAULT log_dir +crudini --sel $cfg DEFAULT log_file "" +crudini --set $cfg DEFAULT use_stderr True +crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}" + +crudini --set $cfg conductor workers 8 + +for option in auth_protocol auth_host auth_port; do + crudini --del $cfg \ + keystone_authtoken \ + $option +done + +crudini --set $cfg keystone_authtoken auth_uri "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/" +crudini --set $cfg keystone_authtoken admin_user ${NOVA_KEYSTONE_USER} +crudini --set $cfg keystone_authtoken admin_password "${NOVA_KEYSTONE_PASSWORD}" +crudini --set $cfg keystone_authtoken admin_tenant_name ${ADMIN_TENANT_NAME} + +cat > /openrc < RUN yum -y install \ -- cgit v1.2.3