Merge "Enable glance to use the SSL middleware"

diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 3fc0756..60b831b 100644 (file)
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -42,6 +42,9 @@ parameters:
     type: string
     description: Config manifests that will be used to step through the deployment.
     default: ''
+  RoleData:
+    type: json
+    default: {}
 
 
 resources:

diff --git a/docker/firstboot/install_docker_agents.yaml b/docker/firstboot/install_docker_agents.yaml
index 2858552..f6d61e2 100644 (file)
--- a/docker/firstboot/install_docker_agents.yaml
+++ b/docker/firstboot/install_docker_agents.yaml
@@ -6,7 +6,7 @@ parameters:
     default: heat-docker-agents
   DockerNamespace:
     type: string
-    default: kollaglue
+    default: tripleoupstream
   DockerNamespaceIsRegistry:
     type: boolean
     default: false

diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index cb8b2a5..65c4e6d 100644 (file)
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -1,14 +1,38 @@
 #!/bin/bash
 set -eux
 
-# firstboot isn't split out by role yet so we handle it this way
-if ! hostname | grep compute &>/dev/null; then
- echo "Exiting. This script is only for the compute role."
- exit 0
+/sbin/setenforce 0
+/sbin/modprobe ebtables
+
+# CentOS sets ptmx to 000. Withoutit being 666, we can't use Cinder volumes
+chmod 666 /dev/pts/ptmx
+
+# We need hostname -f to return in a centos container for the puppet hook
+HOSTNAME=$(hostname)
+echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts
+
+# update docker for local insecure registry(optional)
+# Note: This is different for different docker versions
+# For older docker versions < 1.4.x use commented line
+#echo "OPTIONS='--insecure-registry $docker_registry'" >> /etc/sysconfig/docker
+#echo "ADD_REGISTRY='--registry-mirror $docker_registry'" >> /etc/sysconfig/docker
+
+# Local docker registry 1.8
+if [ $docker_namespace_is_registry ]; then
+    /usr/bin/systemctl stop docker.service
+    # if namespace is used with local registry, trim all namespacing
+    trim_var=$docker_registry
+    registry_host="${trim_var%%/*}"
+    /bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry[ ]'/INSECURE_REGISTRY='--insecure-registry $registry_host'/g" /etc/sysconfig/docker
+    /usr/bin/systemctl start --no-block docker.service
 fi
 
+/usr/bin/docker pull $agent_image &
+DOCKER_PULL_PID=$!
+
 mkdir -p /var/lib/etc-data/json-config #FIXME: this should be a docker data container
 
+
 # heat-docker-agents service
 cat <<EOF > /etc/systemd/system/heat-docker-agents.service
 
@@ -22,7 +46,6 @@ User=root
 Restart=on-failure
 ExecStartPre=-/usr/bin/docker kill heat-agents
 ExecStartPre=-/usr/bin/docker rm heat-agents
-ExecStartPre=/usr/bin/docker pull $agent_image
 ExecStart=/usr/bin/docker run --name heat-agents --privileged --net=host -v /var/lib/etc-data:/var/lib/etc-data -v /run:/run -v /etc:/host/etc -v /usr/bin/atomic:/usr/bin/atomic -v /var/lib/dhclient:/var/lib/dhclient -v /var/lib/cloud:/var/lib/cloud -v /var/lib/heat-cfntools:/var/lib/heat-cfntools -v /usr/bin/docker:/usr/bin/docker --entrypoint=/usr/bin/os-collect-config $agent_image
 ExecStop=/usr/bin/docker stop heat-agents
 
@@ -31,30 +54,6 @@ WantedBy=multi-user.target
 
 EOF
 
-# update docker for local insecure registry(optional)
-# Note: This is different for different docker versions
-# For older docker versions < 1.4.x use commented line
-#echo "OPTIONS='--insecure-registry $docker_registry'" >> /etc/sysconfig/docker
-#echo "ADD_REGISTRY='--registry-mirror $docker_registry'" >> /etc/sysconfig/docker
-
-# Local docker registry 1.8
-if [ $docker_namespace_is_registry ]; then
-    # if namespace is used with local registry, trim all namespacing
-    trim_var=$docker_registry
-    registry_host="${trim_var%%/*}"
-    /bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry'/INSECURE_REGISTRY='--insecure-registry $registry_host'/g" /etc/sysconfig/docker
-fi
-
-/sbin/setenforce 0
-/sbin/modprobe ebtables
-
-# CentOS sets ptmx to 000. Withoutit being 666, we can't use Cinder volumes
-chmod 666 /dev/pts/ptmx
-
-# We need hostname -f to return in a centos container for the puppet hook
-HOSTNAME=$(hostname)
-echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts
-
 # enable and start heat-docker-agents
 chmod 0640 /etc/systemd/system/heat-docker-agents.service
 /usr/bin/systemctl enable heat-docker-agents.service
@@ -82,3 +81,5 @@ AUTO_EXTEND_POOL=yes
 POOL_AUTOEXTEND_PERCENT=30
 POOL_AUTOEXTEND_THRESHOLD=70
 EOF
+
+wait $DOCKER_PULL_PID

diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index ccb41cc..c8c5804 100644 (file)
--- a/puppet/hieradata/ceph.yaml
+++ b/puppet/hieradata/ceph.yaml
@@ -1,9 +1,2 @@
-ceph::profile::params::osd_pool_default_pg_num: 32
-ceph::profile::params::osd_pool_default_pgp_num: 32
-ceph::profile::params::osd_pool_default_size: 3
-ceph::profile::params::osd_pool_default_min_size: 1
-ceph::profile::params::osds: {/srv/data: {}}
-ceph::profile::params::manage_repo: false
-ceph::profile::params::authentication_type: cephx
-
+# Do not add hieradata in this file, and use composable services.
 ceph_classes: []

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3bda874..e7ae521 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -1,3 +1,5 @@
+# Do not add hieradata in this file, and use composable services.
+
 # TODO(emilien) move it to composable aodh roles later
 aodh::auth::auth_region: 'regionOne'
 aodh::auth::auth_tenant_name: 'service'

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 219f0d0..54b3d41 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -1,3 +1,3 @@
-# Hiera data here applies to all compute nodes
+# Do not add hieradata in this file, and use composable services.
 
 compute_classes: []

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 71c53b4..905ea30 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -1,4 +1,4 @@
-# Hiera data here applies to all controller nodes
+# Do not add hieradata in this file, and use composable services.
 
 # TODO(emilien) move it to composable aodh roles later
 aodh::api::keystone_tenant: 'service'

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index d93817e..05d4b69 100644 (file)
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -1,3 +1,5 @@
+# Do not add hieradata in this file, and use composable services.
+
 # Aodh
 # TODO(emilien) move it to composable aodh roles later
 aodh::db::mysql::user: aodh

diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml
index da526e3..5aa0cfb 100644 (file)
--- a/puppet/hieradata/object.yaml
+++ b/puppet/hieradata/object.yaml
@@ -1,2 +1,3 @@
-# Hiera data for swift storage nodes
+# Do not add hieradata in this file, and use composable services.
+
 object_classes: []

diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml
index dd0582f..42b85e1 100644 (file)
--- a/puppet/hieradata/volume.yaml
+++ b/puppet/hieradata/volume.yaml
@@ -1,3 +1,3 @@
-# Hiera data here applies to all volume storage nodes
+# Do not add hieradata in this file, and use composable services.
 
 volume_classes: []

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 3778271..067207f 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -24,19 +24,6 @@ if hiera('step') >= 2 {
 } #END STEP 2
 
 if hiera('step') >= 4 {
-
-  $nova_ipv6 = hiera('nova::use_ipv6', false)
-  if $nova_ipv6 {
-    $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
-  } else {
-    $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211')
-  }
-
-  class { '::nova' :
-    memcached_servers => $memcached_servers
-  }
-  include ::nova::config
-
   # Aodh
   class { '::aodh' :
     database_connection => hiera('aodh_mysql_conn_string'),

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 6df1de2..709d996 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -43,19 +43,6 @@ if hiera('step') >= 2 {
 } #END STEP 2
 
 if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
-  $nova_ipv6 = hiera('nova::use_ipv6', false)
-  if $nova_ipv6 {
-    $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
-  } else {
-    $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211')
-  }
-
-  class { '::nova' :
-    memcached_servers => $memcached_servers
-  }
-
-  include ::nova::config
-
   # Aodh
   class { '::aodh' :
     database_connection => hiera('aodh_mysql_conn_string'),

diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index bec4340..bce52f3 100644 (file)
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -58,6 +58,13 @@ outputs:
       config_settings:
         tripleo::profile::base::ceph::ceph_ipv6: {get_param: CephIPv6}
         tripleo::profile::base::ceph::enable_ceph_storage: {get_param: ControllerEnableCephStorage}
+        ceph::profile::params::osd_pool_default_pg_num: 32
+        ceph::profile::params::osd_pool_default_pgp_num: 32
+        ceph::profile::params::osd_pool_default_size: 3
+        ceph::profile::params::osd_pool_default_min_size: 1
+        ceph::profile::params::osds: {/srv/data: {}}
+        ceph::profile::params::manage_repo: false
+        ceph::profile::params::authentication_type: cephx
         ceph::profile::params::fsid: {get_param: CephClusterFSID}
         ceph::profile::params::client_keys:
           str_replace: