Merge "Add all and clean targets to makefile"

[apex-tripleo-heat-templates.git] / overcloud-source.yaml

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index c8aa046..ba05e28 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -31,6 +31,10 @@ Parameters:
     Description: The password for the Heat service account, used by the Heat services.
     Type: String
     NoEcho: true
+  ImageUpdatePolicy:
+    Default: 'REPLACE'
+    Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
+    Type: String
   KeyName:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -40,6 +44,21 @@ Parameters:
     Description: The password for the neutron service account, used by neutron agents.
     Type: String
     NoEcho: true
+  CeilometerComputeAgent:
+    Description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
+    Type: String
+    Default: ''
+    AllowedValues: ['', Present]
+  CeilometerMeteringSecret:
+    Default: unset
+    Description: Secret shared by the ceilometer services.
+    Type: String
+    NoEcho: true
+  CeilometerPassword:
+    Default: unset
+    Description: The password for the ceilometer service account.
+    Type: String
+    NoEcho: true
   NovaComputeDriver:
     Default: libvirt.LibvirtDriver
     Type: String
@@ -100,7 +119,7 @@ Resources:
     DependsOn: notcompute
     Properties:
       Handle: {Ref: CompletionHandle}
-      Count: '1'
+      Count: '2'
       Timeout: '1800'
   CompletionHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
@@ -125,6 +144,7 @@ Resources:
         NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
         GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
         NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/nova']]}
+        CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/ceilometer']]}
         NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/neutron']]}
         NeutronNetworkType: "gre"
         NeutronEnableTunnelling: "True"
@@ -147,7 +167,7 @@ Resources:
       InstanceType: '0'
     Metadata:
       OpenStack::Heat::Stack: {}
-      Openstack::ImageBuilder::Elements:
+      OpenStack::ImageBuilder::Elements:
       - boot-stack
       - heat-cfntools
       - heat-localip
@@ -176,6 +196,7 @@ Resources:
                - networks
       db-password: unset
       glance:
+        backend: swift
         db: mysql://glance:unset@localhost/glance
         host:
           Fn::Select:
@@ -187,6 +208,9 @@ Resources:
                  - networks
         service-password:
           Ref: GlancePassword
+        swift-store-user: service:glance
+        swift-store-key:
+          Ref: GlancePassword
       heat:
         admin_password:
           Ref: HeatPassword
@@ -194,7 +218,7 @@ Resources:
         admin_user: heat
         auth_encryption_key: unset___________
         db: mysql://heat:unset@localhost/heat
-        heat_watch_server_url:
+        watch_server_url:
           Fn::Join:
             - ''
             - - 'http://'
@@ -271,6 +295,11 @@ Resources:
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         service-password:
           Ref: NeutronPassword
+      ceilometer:
+        db: mysql://ceilometer:unset@localhost/ceilometer
+        metering_secret: {Ref: CeilometerMeteringSecret}
+        service-password:
+          Ref: CeilometerPassword
       nova:
         compute_driver: libvirt.LibvirtDriver
         db: mysql://nova:unset@localhost/nova
@@ -313,6 +342,8 @@ Resources:
     Properties:
       image:
         Ref: notcomputeImage
+      image_update_policy:
+        Ref: ImageUpdatePolicy
       flavor:
         Ref: Flavor
       key_name:
@@ -333,10 +364,14 @@ Outputs:
   KeystoneURL:
     Description: URL for the Overcloud Keystone service
     Value:
-      Fn::Select:
-        - 0
+      Fn::Join:
+      - ''
+      - - http://
         - Fn::Select:
-          - ctlplane
-          - Fn::GetAtt:
-            - notcompute
-            - networks
+          - 0
+          - Fn::Select:
+            - ctlplane
+            - Fn::GetAtt:
+              - notcompute
+              - networks
+        - :5000/v2.0/